feat: update something

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -7,7 +7,6 @@ import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.IdcardUtil;
@@ -121,7 +120,6 @@ import com.qunzhixinxi.hnqz.admin.service.WmUserSignService;
 import com.qunzhixinxi.hnqz.admin.service.WmWkAlbumService;
 import com.qunzhixinxi.hnqz.admin.service.WmWkArticleService;
 import com.qunzhixinxi.hnqz.admin.service.WmWkArticleShareService;
-import com.qunzhixinxi.hnqz.admin.util.GetOpenIDUtil;
 import com.qunzhixinxi.hnqz.admin.util.Html2ImageByJsWrapper;
 import com.qunzhixinxi.hnqz.admin.util.OsEnvUtils;
 import com.qunzhixinxi.hnqz.admin.util.QRCodeGenerator;
@@ -799,30 +797,23 @@ public class ApiController {
      * 更新用户信息（openId 和头像)
      *
      * @param uId      用户ID
-     * @param authCode 授权码
+     * @param openId openId
      * @param avatar   头像
      */
-    private void updateUserOpenIdAndAvatar(Integer uId, String authCode, String avatar) {
+    private void updateUserOpenIdAndAvatar(Integer uId, String openId, String avatar) {
         SysUser u = sysUserService.getById(uId);
-        if (StrUtil.isBlank(u.getWxOpenid()) || StrUtil.isBlank(u.getAvatar())) {
-            SysUser updateU = new SysUser();
-            // 获取小程序openid
-            updateU.setUserId(uId);
-            if (StrUtil.isBlank(u.getWxOpenid())) {
-                Map<String, Object> openMap = GetOpenIDUtil.oauth2GetOpenid(authCode, upmsConfig.getWechatEnv());
-                log.info("openMap: {}", openMap);
-                if (MapUtil.isNotEmpty(openMap)) {
-                    String openid = (String) openMap.get("openid");
-                    updateU.setWxOpenid(openid);
-                }
-            }
-            // avatar头像
-            if (StrUtil.isBlank(u.getAvatar())) {
-                updateU.setAvatar(avatar);
-            }
-            updateU.setUpdateTime(LocalDateTime.now());
-            sysUserService.updateById(updateU);
+
+        SysUser updateU = new SysUser();
+        if (StrUtil.isBlank(u.getWxOpenid())){
+            updateU.setWxOpenid(openId);
         }
+
+        if (StrUtil.isBlank(u.getAvatar())){
+            updateU.setAvatar(avatar);
+        }
+
+        updateU.setUpdateTime(LocalDateTime.now());
+        sysUserService.updateById(updateU);
     }
 
     /**
@@ -846,26 +837,7 @@ public class ApiController {
             return R.failed("账号信息异常，请联系管理员");
         }
 
-        SysUser u = sysUserService.getById(hnqzUser.getId());
-        if (StrUtil.isBlank(u.getWxOpenid()) || StrUtil.isBlank(u.getAvatar())) {
-            SysUser updateU = new SysUser();
-            // 获取小程序openid
-            updateU.setUserId(u.getUserId());
-            if (StrUtil.isBlank(u.getWxOpenid())) {
-                Map<String, Object> opemMap = GetOpenIDUtil.oauth2GetOpenid(code, upmsConfig.getWechatEnv());
-                log.info("opemMap: {}", opemMap);
-                if (MapUtil.isNotEmpty(opemMap)) {
-                    String openid = (String) opemMap.get("openid");
-                    updateU.setWxOpenid(openid);
-                }
-            }
-            // avatar头像
-            if (StrUtil.isBlank(u.getAvatar())) {
-                updateU.setAvatar(avatar);
-            }
-            updateU.setUpdateTime(LocalDateTime.now());
-            sysUserService.updateById(updateU);
-        }
+        updateUserOpenIdAndAvatar(hnqzUser.getId(), code, avatar);
 
         List<Integer> roleList = new ArrayList<>();
 
@@ -3230,19 +3202,19 @@ public class ApiController {
         return R.ok(listMap);
     }
 
-    /**
-     * 获取阅读人openid
-     *
-     * @param authCode 授权code
-     * @return 获取结果
-     */
-    private String getReaderOpenId(String authCode) {
-        //获取小程序openid
-        log.info("小程序登录AUTH_CODE:{}", authCode);
-        Map<String, Object> resultMap = GetOpenIDUtil.oauth2GetOpenid(authCode.trim(), upmsConfig.getWechatEnv());
-        log.warn("小程序登录结果信息:{}", resultMap);
-        return (String) resultMap.get("openid");
-    }
+    ///**
+    // * 获取阅读人openid
+    // *
+    // * @param authCode 授权code
+    // * @return 获取结果
+    // */
+    //private String getReaderOpenId(String authCode) {
+    //    //获取小程序openid
+    //    log.info("小程序登录AUTH_CODE:{}", authCode);
+    //    Map<String, Object> resultMap = GetOpenIDUtil.oauth2GetOpenid(authCode.trim(), upmsConfig.getWechatEnv());
+    //    log.warn("小程序登录结果信息:{}", resultMap);
+    //    return (String) resultMap.get("openid");
+    //}
 
     /**
      * 分享阅读任务方法
@@ -3449,7 +3421,7 @@ public class ApiController {
                         log.info("openUserId为null，任务积分为0。");
                         wmTask.setScore(0);
                     } else {
-                        String readerOpenId = getReaderOpenId(openUserId.trim());
+                        String readerOpenId = openUserId.trim();
                         if (readerOpenId.contains("null")) {
                             log.info("获取阅读者openid失败，积分值为0");
                             wmTask.setScore(0);