修改 微信登录注册

src/main/java/org/rcisoft/app/login/service/impl/WxMiniServiceImpl.java

@@ -15,6 +15,9 @@ import org.apache.http.util.EntityUtils;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.codehaus.xfire.util.Base64;
 import org.rcisoft.app.login.service.WxMiniService;
+import org.rcisoft.business.memInfo.dao.MemInfoRepository;
+import org.rcisoft.business.memInfo.entity.MemInfo;
+import org.rcisoft.business.memInfo.service.impl.MemInfoServiceImpl;
 import org.rcisoft.core.jwt.bean.CyJwtBean;
 import org.rcisoft.core.jwt.model.CyJwtUser;
 import org.rcisoft.core.jwt.util.CyJwtUtil;
@@ -81,6 +84,10 @@ public class WxMiniServiceImpl implements WxMiniService {
 
     @Autowired
     private SysUserRbacRepository sysUserRbacRepository;
+    @Autowired
+    private MemInfoRepository memInfoRepository;
+    @Autowired
+    private MemInfoServiceImpl memInfoService;
 
     @Autowired(required = false)
     private SysMenuRbacRepository sysMenuRbacRepository;
@@ -320,6 +327,18 @@ public class WxMiniServiceImpl implements WxMiniService {
             sysUserRbac.setNotDeleted();
             sysUserRbac.setStart();
             sysUserRbacRepository.insert(sysUserRbac);
+            MemInfo memInfo = new MemInfo();
+            //生成会员号
+            String maxCode = memInfoRepository.selectMaxCode();
+            String memCode = memInfoService.generateMemCode(maxCode);
+            memInfo.setMemCode(memCode);
+            //增加操作
+            memInfo.setUserId(sysUserRbac.getBusinessId());
+            memInfo.setMemPhone(phone);
+            memInfo.setWxOpenid(openId);
+            memInfo.setSort(0);
+            memInfo.setIsRecommended(0);
+            int line = memInfoRepository.insert(memInfo);
             //将会员信息存入redis
             SysUser user = new SysUser();
             BeanUtil.copyProperties(sysUserRbac, user);
@@ -370,6 +389,8 @@ public class WxMiniServiceImpl implements WxMiniService {
         resultMap.put(CyWxMiniCons.TOKEN, CyJwtUtil.generateToken(userDetails));
         sysUserRbac.setPassword(null);
         resultMap.put(CyWxMiniCons.DATA, sysUserRbac);
+        MemInfo memberInfo = memInfoRepository.getInfoByUserId(String.valueOf(sysUserRbac.getBusinessId()));
+        resultMap.put("memberId", memberInfo.getBusinessId());
         return resultMap;
     }
 
@@ -397,6 +418,8 @@ public class WxMiniServiceImpl implements WxMiniService {
         }
         //resultMap.put(WxMiniCons.DATA, CyUserUtil.getUserInfoStrProp(token, CyUserUtil.USER_PHONE));
         resultMap.put(CyWxMiniCons.DATA, sysUserRbac);
+        MemInfo memberInfo = memInfoRepository.getInfoByUserId(String.valueOf(sysUserRbac.getBusinessId()));
+        resultMap.put("memberId", memberInfo.getBusinessId());
         return resultMap;
     }
 }

src/main/java/org/rcisoft/business/memInfo/service/impl/MemInfoServiceImpl.java

@@ -331,7 +331,7 @@ public class MemInfoServiceImpl extends ServiceImpl<MemInfoRepository,MemInfo>
      * @param code
      * @return
      */
-    private String generateMemCode(String code) {  //将会员号段排序
+    public String generateMemCode(String code) {  //将会员号段排序
         List<String> codeList = Arrays.stream(memberGenerateBean.getCodes()).sorted().collect(Collectors.toList());
         if (StringUtils.isNotBlank(code)) {
             int currentNumber = Integer.parseInt(code);