Merge branch 'master' into dev

hai-cweb/src/main/java/com/cweb/controller/HighUserCardController.java

@@ -156,13 +156,11 @@ public class HighUserCardController {
                 redisUtil.del(body.getString("phone"));
 
                 // 定义个人所有数据
-                HighUser user = highUserService.findByUserId(userInfoModel.getHighUser().getId());
                 HighUserModel highUserModel = new HighUserModel();
-                user.setPassword(null);
+                HighUser detailData = highUserService.getDetailDataByUser(userInfoModel.getHighUser().getId());
-                user.setIsSetPayPwd(highUserPayPasswordService.isSetPayPwd(user.getId()));
+                detailData.setPassword(null);
-                user.setIsSetHltCard(highUserCardService.isBindHtlCard(user.getId()));
+                highUserModel.setHighUser(detailData);
-                highUserModel.setHighUser(user);
+                SessionObject so = new SessionObject(detailData.getUnionId(), 1 , highUserModel);
-                SessionObject so = new SessionObject(user.getUnionId(), 1 , highUserModel);
                 return ResponseMsgUtil.success(so);
             }
             throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "验证码错误");

hai-cweb/src/main/java/com/cweb/controller/HighUserCommonController.java

@@ -65,12 +65,11 @@ public class HighUserCommonController {
                 user.setStatus(1);
                 highUserService.insertUser(user);
             }
-            // 定义个人所有数据
             HighUserModel highUserModel = new HighUserModel();
-            user.setPassword(null);
+            HighUser detailData = highUserService.getDetailDataByUser(user.getId());
-            highUserModel.setHighUser(user);
+            detailData.setPassword(null);
-            SessionObject so = new SessionObject(Base64Util.encode(user.getId().toString()), 1 , highUserModel);
+            highUserModel.setHighUser(detailData);
-            userCenter.save(request, response, so);
+            SessionObject so = new SessionObject(detailData.getUnionId(), 1 , highUserModel);
             return ResponseMsgUtil.success(so);
         } catch (Exception e) {
             return ResponseMsgUtil.exception(e);

hai-cweb/src/main/java/com/cweb/controller/HighUserController.java

@@ -94,11 +94,12 @@ public class HighUserController {
 
             HighUser highUser = highUserService.bindUserPhone(phone, request);
 
+            // 定义个人所有数据
             HighUserModel highUserModel = new HighUserModel();
-            highUser.setPassword(null);
+            HighUser detailData = highUserService.getDetailDataByUser(highUser.getId());
-            highUserModel.setHighUser(highUser);
+            detailData.setPassword(null);
-            SessionObject so = new SessionObject(highUser.getUnionId(), 1 , highUserModel);
+            highUserModel.setHighUser(detailData);
-            userCenter.save(request, response, so);
+            SessionObject so = new SessionObject(detailData.getUnionId(), 1 , highUserModel);
             return ResponseMsgUtil.success(so);
 
         } catch (Exception e) {
@@ -151,13 +152,11 @@ public class HighUserController {
             highUserPayPasswordService.editUserPayPwd(userPayPassword);
 
             // 定义个人所有数据
-            HighUser user = highUserService.findByUserId(userInfoModel.getHighUser().getId());
             HighUserModel highUserModel = new HighUserModel();
-            user.setPassword(null);
+            HighUser detailData = highUserService.getDetailDataByUser(userInfoModel.getHighUser().getId());
-            user.setIsSetPayPwd(highUserPayPasswordService.isSetPayPwd(user.getId()));
+            detailData.setPassword(null);
-            user.setIsSetHltCard(highUserCardService.isBindHtlCard(user.getId()));
+            highUserModel.setHighUser(detailData);
-            highUserModel.setHighUser(user);
+            SessionObject so = new SessionObject(detailData.getUnionId(), 1 , highUserModel);
-            SessionObject so = new SessionObject(user.getUnionId(), 1 , highUserModel);
             return ResponseMsgUtil.success(so);
 
         } catch (Exception e) {

hai-cweb/src/main/java/com/cweb/controller/WechatController.java

@@ -107,7 +107,6 @@ public class WechatController {
             HighUser detailData = highUserService.getDetailDataByUser(highUser.getId());
             detailData.setPassword(null);
             highUserModel.setHighUser(detailData);
-
             SessionObject so = new SessionObject(highUser.getUnionId(), 1 , highUserModel);
             userCenter.save(request, response, so);
 
@@ -155,7 +154,6 @@ public class WechatController {
             HighUser detailData = highUserService.getDetailDataByUser(user.getId());
             detailData.setPassword(null);
             highUserModel.setHighUser(detailData);
-
             SessionObject so = new SessionObject(user.getUnionId(), 1 , highUserModel);
             userCenter.save(request, response, so);
 
@@ -222,9 +220,9 @@ public class WechatController {
             HighUser detailData = highUserService.getDetailDataByUser(user.getId());
             detailData.setPassword(null);
             highUserModel.setHighUser(detailData);
-
             SessionObject so = new SessionObject(user.getUnionId(), 1 , highUserModel);
             userCenter.save(request, response, so);
+
             return ResponseMsgUtil.success(so);
 
         } catch (Exception e) {
@@ -335,10 +333,10 @@ public class WechatController {
 
             // 定义个人所有数据
             HighUserModel highUserModel = new HighUserModel();
-            user.setPassword(null);
+            HighUser detailData = highUserService.getDetailDataByUser(user.getId());
-            highUserModel.setHighUser(user);
+            detailData.setPassword(null);
-            user.setIsSetPayPwd(highUserPayPasswordService.isSetPayPwd(user.getId()));
+            highUserModel.setHighUser(detailData);
-            SessionObject so = new SessionObject(userInfo.getString("unionid"), 1 , highUserModel);
+            SessionObject so = new SessionObject(user.getUnionId(), 1 , highUserModel);
             userCenter.save(request, response, so);
             return ResponseMsgUtil.success(so);