Merge branch 'quanku_v2.3' into quanku_v2.4

ch-dao/src/main/java/com/wwdz/ch/db/impl/UserDaoImpl.java

@@ -40,8 +40,6 @@ public class UserDaoImpl implements UserDao {
     }
 
 
-
-
     @Override
     public User queryByOid(String openId) {
         CloudServerResponse<com.wwdz.user.api.model.user.User> cloudServerResponse = userReadService.getUserByOpenIdOrUnionId(null, openId);

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/UserServiceImpl.java

@@ -169,14 +169,19 @@ public class UserServiceImpl implements UserService {
         result.put("token", dto.getToken());
         result.put("tokenExpire", userToken.getExpireTime().toString());
         result.put("isInvited", true);
-         CloudServerResponse<com.wwdz.user.api.model.user.User> userCloudServerResponse = userReadService.getUserIsNotDelete(dto.getUserId());
-        if (userCloudServerResponse.getCode() != 1001) {
-            return Result.failed("用户信息初始化失败");
+        User user = new User();
+        if (userInfo != null && userInfo.getId() != null ) {
+            user = userInfo;
+        } else {
+            CloudServerResponse<com.wwdz.user.api.model.user.User> userCloudServerResponse = userReadService.getUserIsNotDelete(dto.getUserId());
+            if (userCloudServerResponse.getCode() != 1001) {
+                return Result.failed("用户信息初始化失败");
+            }
+            com.wwdz.user.api.model.user.User wUser = userCloudServerResponse.getResult();
+            user = User.of(wUser);
+            user.setId(dto.getUserId());
+            user.setStatus(UserEnum.StatusEnum.COMMON.getCode());
         }
-        com.wwdz.user.api.model.user.User wUser = userCloudServerResponse.getResult();
-        User user = User.of(wUser);
-        user.setId(dto.getUserId());
-        user.setStatus(UserEnum.StatusEnum.COMMON.getCode());
         logger.info(">>>>>>> 登录用户的信息:{}", JsonUtils.from(user));
 
         String phone = user.getMobile();
@@ -203,7 +208,6 @@ public class UserServiceImpl implements UserService {
             }
         }
         user.setMobile(phone);
-
         result.put("phone", phone);
         boolean collectorWhiteListFlag = collectorWhiteListDao.isExisted(dto.getUserId());
         int userLevel = UserEnum.LevelEnum.COMMON.getCode();

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/SupplierItemServiceImpl.java

@@ -275,6 +275,7 @@ public class SupplierItemServiceImpl implements SupplierItemService {
     }
 
 
+
     @Override
     public Result findDiscountList(SupplierItemRequestDto dto) {
         try {