统一商城账户信息

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/dal/dataobject/user/MemberUserDO.java

@@ -1,5 +1,6 @@
 package com.citu.module.member.dal.dataobject.user;
 
+import com.baomidou.mybatisplus.annotation.*;
 import com.citu.framework.common.enums.CommonStatusEnum;
 import com.citu.framework.common.enums.TerminalEnum;
 import com.citu.framework.ip.core.Area;
@@ -8,10 +9,6 @@ import com.citu.framework.tenant.core.db.TenantBaseDO;
 import com.citu.module.member.dal.dataobject.group.MemberGroupDO;
 import com.citu.module.member.dal.dataobject.level.MemberLevelDO;
 import com.citu.module.system.enums.common.SexEnum;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
@@ -39,7 +36,8 @@ public class MemberUserDO extends TenantBaseDO {
     /**
      * 用户ID
      */
-    @TableId
+//    @TableId(type = IdType.INPUT)
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
     /**
      * 手机

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/service/user/MemberUserServiceImpl.java

@@ -8,6 +8,9 @@ import com.citu.framework.common.enums.CommonStatusEnum;
 import com.citu.framework.common.enums.UserTypeEnum;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
+import com.citu.framework.security.core.LoginUser;
+import com.citu.framework.security.core.util.SecurityFrameworkUtils;
+import com.citu.framework.web.core.util.WebFrameworkUtils;
 import com.citu.module.member.controller.admin.user.vo.MemberUserPageReqVO;
 import com.citu.module.member.controller.admin.user.vo.MemberUserUpdateReqVO;
 import com.citu.module.member.controller.app.user.vo.*;
@@ -16,6 +19,7 @@ import com.citu.module.member.convert.user.MemberUserConvert;
 import com.citu.module.member.dal.dataobject.user.MemberUserDO;
 import com.citu.module.member.dal.mysql.user.MemberUserMapper;
 import com.citu.module.member.mq.producer.user.MemberUserProducer;
+import com.citu.module.member.service.auth.MemberAuthService;
 import com.citu.module.system.api.sms.SmsCodeApi;
 import com.citu.module.system.api.sms.dto.code.SmsCodeUseReqDTO;
 import com.citu.module.system.api.social.SocialClientApi;
@@ -64,6 +68,10 @@ public class MemberUserServiceImpl implements MemberUserService {
     @Resource
     private MemberUserProducer memberUserProducer;
 
+
+    @Resource
+    private MemberAuthService memberAuthService;
+
     @Override
     public MemberUserDO getUserByMobile(String mobile) {
         return memberUserMapper.selectByMobile(mobile);
@@ -83,22 +91,23 @@ public class MemberUserServiceImpl implements MemberUserService {
             return user;
         }
         // 用户不存在，则进行创建
-        return createUser(mobile, null, null, registerIp, terminal);
+        return createUser(mobile, null, null, registerIp, terminal,null);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public MemberUserDO createUser(String nickname, String avtar, String registerIp, Integer terminal) {
-        return createUser(null, nickname, avtar, registerIp, terminal);
+        return createUser(null, nickname, avtar, registerIp, terminal,null);
     }
 
     private MemberUserDO createUser(String mobile, String nickname, String avtar,
-                                    String registerIp, Integer terminal) {
+                                    String registerIp, Integer terminal,Long id) {
         // 生成密码
         String password = IdUtil.fastSimpleUUID();
         // 插入用户
         MemberUserDO user = new MemberUserDO();
         user.setMobile(mobile);
+        user.setId(id);
         user.setStatus(CommonStatusEnum.ENABLE.getStatus()); // 默认开启
         user.setPassword(encodePassword(password)); // 加密密码
         user.setRegisterIp(registerIp).setRegisterTerminal(terminal);
@@ -129,7 +138,13 @@ public class MemberUserServiceImpl implements MemberUserService {
 
     @Override
     public MemberUserDO getUser(Long id) {
-        return memberUserMapper.selectById(id);
+        MemberUserDO memberUserDO = memberUserMapper.selectById(id);
+        String clientIP = getClientIP();
+        if(null == memberUserDO){
+            String mobile = "";
+            memberUserDO = createUser(mobile,null,null,clientIP, WebFrameworkUtils.getTerminal(),SecurityFrameworkUtils.getLoginUserId());
+        }
+        return memberUserDO;
     }
 
     @Override