hurui
/
hai-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
dev-discount
胡锐 3 years ago
parent c935a94a4e e024ca67b9
commit 6ce150439e
4 changed files with 22 additions and 28 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      hai-cweb/src/main/java/com/cweb/controller/HighUserCardController.java
  2. 9
      hai-cweb/src/main/java/com/cweb/controller/HighUserCommonController.java
  3. 19
      hai-cweb/src/main/java/com/cweb/controller/HighUserController.java
  4. 12
      hai-cweb/src/main/java/com/cweb/controller/WechatController.java

10
hai-cweb/src/main/java/com/cweb/controller/HighUserCardController.java
Unescape View File

@ -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);
user.setIsSetPayPwd(highUserPayPasswordService.isSetPayPwd(user.getId()));
user.setIsSetHltCard(highUserCardService.isBindHtlCard(user.getId()));
highUserModel.setHighUser(user);
SessionObject so = new SessionObject(user.getUnionId(), 1 , highUserModel);
HighUser detailData = highUserService.getDetailDataByUser(userInfoModel.getHighUser().getId());
detailData.setPassword(null);
highUserModel.setHighUser(detailData);
SessionObject so = new SessionObject(detailData.getUnionId(), 1 , highUserModel);
return ResponseMsgUtil.success(so);
}
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "验证码错误");

9
hai-cweb/src/main/java/com/cweb/controller/HighUserCommonController.java
Unescape View File

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

19
hai-cweb/src/main/java/com/cweb/controller/HighUserController.java
Unescape View File

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

12
hai-cweb/src/main/java/com/cweb/controller/WechatController.java
Unescape View File

@ -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);
highUserModel.setHighUser(user);
user.setIsSetPayPwd(highUserPayPasswordService.isSetPayPwd(user.getId()));
SessionObject so = new SessionObject(userInfo.getString("unionid"), 1 , highUserModel);
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);

Write Preview
Loading…
Cancel
Save