fix bug

yshop-module-member/yshop-module-member-biz/src/main/java/co/yixiang/yshop/module/member/controller/app/auth/vo/AppAuthSmsLoginReqVO.java

@@ -61,4 +61,7 @@ public class AppAuthSmsLoginReqVO {
         return socialType == null || StrUtil.isNotEmpty(socialState);
     }
 
+    @Schema(description = "登录 code,小程序通过 wx.login 方法获得", requiredMode = Schema.RequiredMode.REQUIRED, example = "word")
+    private String loginCode;
+
 }

yshop-module-member/yshop-module-member-biz/src/main/java/co/yixiang/yshop/module/member/service/auth/MemberAuthServiceImpl.java

@@ -106,7 +106,8 @@ public class MemberAuthServiceImpl implements MemberAuthService {
         }
 
         // 获得获得注册用户
-        MemberUserDO user = userService.createUserIfAbsent(reqVO.getMobile(), userIp, reqVO.getFrom(), reqVO.getInvitationCode());
+        MemberUserDO user = userService.createUserIfAbsent(reqVO.getMobile(), userIp, reqVO.getFrom(),
+                reqVO.getInvitationCode(), reqVO.getLoginCode());
         Assert.notNull(user, "获取用户失败，结果为空");
 
         // 如果 socialType 非空，说明需要绑定社交用户
@@ -166,7 +167,7 @@ public class MemberAuthServiceImpl implements MemberAuthService {
         if (memberUserDO == null) {
             // 获得获得注册用户
             memberUserDO = userService.createUserIfAbsent(phoneNumberInfo.getPhoneNumber(), getClientIP(),
-                    LoginTypeEnum.WXAPP.getValue(), reqVO.getInvitationCode());
+                    LoginTypeEnum.WXAPP.getValue(), reqVO.getInvitationCode(), null);
             memberUserDO.setNickname("用户_" + memberUserDO.getId());
         }
         memberUserDO.setRoutineOpenId(session.getOpenid());

yshop-module-member/yshop-module-member-biz/src/main/java/co/yixiang/yshop/module/member/service/user/MemberUserService.java

@@ -43,9 +43,10 @@ public interface MemberUserService extends IService<MemberUserDO> {
      * @param mobile         手机号
      * @param registerIp     注册 IP
      * @param invitationCode 邀请码
+     * @param loginCode      登录 code
      * @return 用户对象
      */
-    MemberUserDO createUserIfAbsent(@Mobile String mobile, String registerIp, String from, String invitationCode);
+    MemberUserDO createUserIfAbsent(@Mobile String mobile, String registerIp, String from, String invitationCode, String loginCode);
 
     /**
      * 更新用户的最后登陆信息

yshop-module-member/yshop-module-member-biz/src/main/java/co/yixiang/yshop/module/member/service/user/MemberUserServiceImpl.java

@@ -1,5 +1,7 @@
 package co.yixiang.yshop.module.member.service.user;
 
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.NumberUtil;
@@ -29,6 +31,8 @@ import co.yixiang.yshop.module.system.service.dict.DictDataService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.annotations.VisibleForTesting;
 import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxErrorException;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -46,8 +50,7 @@ import java.util.Objects;
 
 import static co.yixiang.yshop.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static co.yixiang.yshop.framework.common.util.servlet.ServletUtils.getClientIP;
-import static co.yixiang.yshop.module.member.enums.ErrorCodeConstants.NOT_ENOUGH_INTEGRAL;
-import static co.yixiang.yshop.module.member.enums.ErrorCodeConstants.USER_NOT_EXISTS;
+import static co.yixiang.yshop.module.member.enums.ErrorCodeConstants.*;
 
 /**
  * 会员 User Service 实现类
@@ -82,6 +85,8 @@ public class MemberUserServiceImpl extends ServiceImpl<MemberUserMapper, MemberU
     private UserInviteLogService userInviteLogService;
     @Resource
     private UserBillService userBillService;
+    @Resource
+    private WxMaService wxMaService;
 
 
     @Override
@@ -95,19 +100,42 @@ public class MemberUserServiceImpl extends ServiceImpl<MemberUserMapper, MemberU
     }
 
     @Override
-    public MemberUserDO createUserIfAbsent(String mobile, String registerIp, String from, String invitationCode) {
+    public MemberUserDO createUserIfAbsent(String mobile, String registerIp, String from, String invitationCode, String loginCode) {
         // 用户已经存在
         MemberUserDO user = memberUserMapper.selectByMobile(mobile);
+        if (!StringUtils.isNotBlank(user.getRoutineOpenId()) && StringUtils.isNotBlank(loginCode)) {
+            this.updateOpenId(user.getId(), loginCode);
+        }
         if (user != null) {
             return user;
         }
         // 用户不存在，则进行创建
         user = this.createUser(mobile, registerIp, from);
+        if (StringUtils.isNotBlank(loginCode)) {
+            this.updateOpenId(user.getId(), loginCode);
+        }
         // 处理其他逻辑
         handlerAfterRegister(user, invitationCode);
         return user;
     }
 
+    /**
+     * 更新小程序openId
+     *
+     * @param id        用户id
+     * @param loginCode 登录code
+     */
+    private void updateOpenId(Long id, String loginCode) {
+        WxMaJscode2SessionResult session;
+        try {
+            session = wxMaService.getUserService().getSessionInfo(loginCode);
+        } catch (WxErrorException e) {
+            log.error(e.getMessage());
+            throw exception(MINI_AUTH_LOGIN_BAD);
+        }
+        this.updateById(new MemberUserDO().setId(id).setRoutineOpenId(session.getOpenid()));
+    }
+
     /**
      * 处理注册完成之后其他墨迹
      *