bugfix

src/main/java/com/caimei365/user/components/WeChatService.java

@@ -188,7 +188,6 @@ public class WeChatService {
         Map<String, Object> returnMap = new HashMap<>(4);
         // 获取当前微信小程序的环境
         String referer = headers.getFirst("Referer");
-        log.info("referer-is----:" + referer);
         returnMap.put("referer", referer);
         String requestUrl = "https://api.weixin.qq.com/sns/jscode2session";
         Map<String, String> requestUrlParam = new HashMap<String, String>(4);

src/main/java/com/caimei365/user/controller/LoginApi.java

@@ -256,7 +256,7 @@ public class LoginApi {
         String code = authAppletsDto.getCode();
         String encryptedData = authAppletsDto.getEncryptedData();
         String iv = authAppletsDto.getIv();
-        Integer organizeId = authAppletsDto.getOrganizeId();
+        Integer organizeId = null == authAppletsDto.getOrganizeId() ? 0 : authAppletsDto.getOrganizeId();
         return loginService.appletsAuthorization(organizeId, code, encryptedData, iv, headers);
     }
 

src/main/java/com/caimei365/user/service/impl/LoginServiceImpl.java

@@ -418,6 +418,7 @@ public class LoginServiceImpl implements LoginService {
      */
     @Override
     public ResponseJson<UserLoginVo> appletsAuthorization(Integer organizeId, String code, String encryptedData, String iv, HttpHeaders headers) {
+        log.info("orgId------->" + organizeId);
         if (StringUtils.isBlank(code)) {
             return ResponseJson.error("没有获取到微信授权code", null);
         }
@@ -1451,7 +1452,7 @@ public class LoginServiceImpl implements LoginService {
         String nickName = authBindDto.getNickName();
         String avatarUrl = authBindDto.getAvatarUrl();
         String isCheckSmsCode = authBindDto.getIsCheckSmsCode();
-        Integer organizeId = authBindDto.getOrganizeId();
+        Integer organizeId = null == authBindDto.getOrganizeId() ? 0 : authBindDto.getOrganizeId();
         // 参数校验
         if (null == userId) {
             return ResponseJson.error("参数异常：用户Id不能为空！", null);

src/main/resources/mapper/RegisterMapper.xml

@@ -54,7 +54,7 @@
                                            `headimgurl`, `userType`, `mobile`, `status`, `unionId`, `openid`,
                                            `pcOpenid`, `addTime`, `updateTime`, `bindTime`, `delFlag`)
         values (#{userId}, #{clubId}, #{shopId}, #{organizeId},
-                ifnull(#{linkName}, (select linkname from user where userId = #{userId})), #{nickName}, #{avatarUrl},
+                ifnull(#{linkName}, (select userName from user where userId = #{userId})), #{nickName}, #{avatarUrl},
                 #{userType},
                 #{mobile}, #{status}, #{unionId}, #{openId}, #{pcOpenId}, #{addTime}, #{updateTime}, #{bindTime},
                 #{delFlag})