Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/UserLogic.java

@@ -287,8 +287,12 @@ public class UserLogic {
     public void userTypeInit(User user) {
         String mobile = user.getMobile();
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
+
+        List<WebsitUser> websitUsers = websitUserService.lambdaQuery().eq(WebsitUser::getUserId, user.getUserId()).select(WebsitUser::getWebsitId).list();
+
         List<UserWait> list = userWaitService.lambdaQuery()
                 .eq(UserWait::getMobile, mobile)
+                .notIn(!CollectionUtils.isEmpty(websitUsers),UserWait::getWebsitId, websitUsers.stream().map(WebsitUser::getWebsitId).collect(Collectors.toList()))
                 .eq(UserWait::getCompanyWechatId, currentCompanyWechat.getCurrentCompanyWechatId())
                 .list();
         if (CollectionUtils.isEmpty(list)) {
@@ -305,12 +309,18 @@ public class UserLogic {
             user.setWorkerNumber(userWait.getWorkerNumber());
             user.setBankAccount(userWait.getBrank());
             user.setIdCard(userWait.getIdcard());
-            user.setIdCardStartTime(userWait.getIdCardStartTime());
-            user.setIdCardEndTime(userWait.getIdCardEndTime());
-            user.setNumber(userWait.getNumber());
-            user.setStartTime(userWait.getStartTime());
-            user.setEndTime(userWait.getEndTime());
-            user.setHightExamineTime(userWait.getHightExamineTime());
+            if (userWait.getIdCardStartTime() != null) {
+                user.setIdCardStartTime(userWait.getIdCardStartTime());
+                user.setIdCardEndTime(userWait.getIdCardEndTime());
+            }
+
+            if (userWait.getStartTime() != null) {
+                user.setNumber(userWait.getNumber());
+                user.setStartTime(userWait.getStartTime());
+                user.setEndTime(userWait.getEndTime());
+                user.setHightExamineTime(userWait.getHightExamineTime());
+            }
+
 
             if (StringUtils.isBlank(user.getIdCard())) {
                 user.setIdCard(userWait.getIdcard());
@@ -949,10 +959,7 @@ public class UserLogic {
         if (user == null) {
             throw new RemoteServiceException(ResponseHelper.ResponseCode_AUTH_ERROR, "请求不合法");
         }
-        //授权手机号后检查是否有预设置的师傅身份信息
-        if (StringUtils.isNotBlank(user.getMobile())) {
-            userTypeInit(user);
-        }
+
         UserWxBean userWxBean = new UserWxBean();
         BeanUtils.copyProperties(user, userWxBean);
         userWxBean.setShoppingCartNums(shoppingCartLogic.total(userWxBean.getUserId()));
@@ -973,7 +980,10 @@ public class UserLogic {
         List<WorkerImg> workerImgs = workerImgService.lambdaQuery().eq(WorkerImg::getUserId, userId).list();
         userWxBean.setWorkerImgs(workerImgs);
 
-
+        //授权手机号后检查是否有预设置的师傅身份信息
+        if (StringUtils.isNotBlank(user.getMobile())) {
+            userTypeInit(user);
+        }
         return userWxBean;
     }