From 952281fee0e578eb70267ec4d3bcb8ab7708941f Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 7 Aug 2020 19:08:38 +0800 Subject: [PATCH] bug --- .../com/iformall/controller/WxMsgValidationcodeController.java | 2 +- .../main/java/com/iformall/controller/WxPayOrderController.java | 2 +- .../java/com/iformall/controller/WxUserGrantController.java | 2 +- .../java/com/iformall/interceptor/AuthorizationInterceptor.java | 2 +- .../main/java/com/iformall/domain/po/base/BaseCUserEntity.java | 2 +- .../service/pay/wx/miniApp/maPay/WxMiniMaPayAdapterService.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java index 433562efa..a301f36c0 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java @@ -75,7 +75,7 @@ public class WxMsgValidationcodeController extends BaseController { if (rd.code == Result.SUCCESS) { // 更新到basicinfo Long userId = user.getId(); - if (user.isBasicInfo()) { + if (user.basicInfoIs()) { userId = user.getUserId(); } Long basicUserId = saveToBasicInfoByCUser(phone, user.getNickName(), user.getAvatarUrl(), user.getGender(), userId); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java index 0521a7fc7..131a60585 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java @@ -89,7 +89,7 @@ public class WxPayOrderController extends BaseController { } WxCUser user = getWxCUser(); - if (!user.isBasicInfo()) { + if (!user.basicInfoIs()) { logger.error("暂未成为会员,请授权手机号"); return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 2cf94050a..a340ea9b3 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -767,7 +767,7 @@ public class WxUserGrantController extends BaseController { org.springframework.beans.BeanUtils.copyProperties(user, userVo); userVo.setScore(0); userVo.setCredit(0); - if(user.isBasicInfo()){ + if(user.basicInfoIs()){ WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(user.getUserId()); if (wxCUserBasicInfo != null) { userVo.setScore(wxCUserBasicInfo.getPoins()); diff --git a/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java b/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java index 50d904222..85db661bd 100644 --- a/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java +++ b/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java @@ -70,7 +70,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { if (StringUtils.isNotBlank(cUser.getParentTenantId())) { request.setAttribute(Constant.PARENT_TENANT_ID, cUser.getParentTenantId()); } - if(cUser.isBasicInfo()){ + if(cUser.basicInfoIs()){ request.setAttribute(Constant.LOGIN_MEMBER_KEY, cUser.getUserId()); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseCUserEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseCUserEntity.java index 5070f5602..a4d014d35 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseCUserEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseCUserEntity.java @@ -32,7 +32,7 @@ public class BaseCUserEntity extends TenantEntity { * 是否是会员 * @return */ - public boolean isBasicInfo() { + public boolean basicInfoIs() { return UserUtil.CuserIsBasicInfo(this.getUserId()); } } diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/miniApp/maPay/WxMiniMaPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/miniApp/maPay/WxMiniMaPayAdapterService.java index d5fb35713..6e14cc60a 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/miniApp/maPay/WxMiniMaPayAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/miniApp/maPay/WxMiniMaPayAdapterService.java @@ -233,7 +233,7 @@ public class WxMiniMaPayAdapterService extends BaseWxPayAdapterService implement throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(), "微信扫码支付添加微信C端用户失败"); } }else { - if (user1.isBasicInfo()) { + if (user1.basicInfoIs()) { userId = user1.getUserId(); } }