From 4d0729e43289d10eba414a2612678910112a7477 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 15 Oct 2020 14:32:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E8=AF=A6=E6=83=85=E5=88=86?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datatower/WxUserStructureController.java | 2 +- .../controller/market/WxOrderController.java | 2 +- .../mem/WxCUserBasicInfoController.java | 4 ++-- .../mem/WxScoreHistoryController.java | 2 +- .../iformall/controller/WxCUserController.java | 4 ++-- .../controller/WxCouponOrderController.java | 2 +- .../iformall/controller/WxMemController.java | 2 +- .../controller/WxMicroPayController.java | 2 +- .../com/iformall/controller/BaseController.java | 17 +++++++++++------ .../controller/WxCardPayController.java | 2 +- .../controller/WxCouponPasswordController.java | 2 +- .../iformall/controller/WxOrderController.java | 4 ++-- .../controller/WxPayOrderController.java | 2 +- .../controller/WxQuestionController.java | 2 +- .../controller/WxUserGrantController.java | 4 ++-- .../LoginUserHandlerMethodArgumentResolver.java | 17 +++++++++-------- .../callback/WxCarCYFCallBackController.java | 2 +- .../callback/WxCarETCPCallBackController.java | 2 +- .../callback/WxCarTJDCallBackController.java | 2 +- .../callback/WxParkCallBackBaseController.java | 2 +- .../iformall/service/impl/PosServiceImpl.java | 4 ++-- .../iformall/domain/po/base/TenantEntity.java | 8 ++++++++ .../iformall/mapper/WxCUserBasicInfoMapper.java | 2 ++ .../service/WxCUserBasicInfoService.java | 2 +- .../impl/WxCUserBasicInfoServiceImpl.java | 4 ++-- .../service/impl/WxCUserServiceImpl.java | 2 +- .../FmInsideOrderSuccessMsgServiceImpl.java | 2 +- .../service/park/impl/etcp/EtcpHelper.java | 2 +- .../resources/mapper/WxCUserBasicInfoMapper.xml | 5 +++++ .../shard/plugin/ShardingSpherePlugin.java | 14 ++++++++++++-- 30 files changed, 77 insertions(+), 46 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java index 2f338740c..595e0e953 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java @@ -632,7 +632,7 @@ public class WxUserStructureController extends BaseController { } // 1. 检查用户积分 - WxCUserBasicInfo info = wxCUserBasicInfoService.getById(userId); + WxCUserBasicInfo info = wxCUserBasicInfoService.getById(userId,getTenantInfo().getFinalTenantId()); if(info == null) { logger.error(ErrorCode.USER_IS_EMPTY.getMessage()); return new ResultData(ErrorCode.USER_IS_EMPTY); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java index 88830d91e..17d21c258 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java @@ -171,7 +171,7 @@ public class WxOrderController extends BaseController { } try { - WxCUserBasicInfo user = wxCUserBasicInfoService.getById(orderSaveDto.getUserId()); + WxCUserBasicInfo user = wxCUserBasicInfoService.getById(orderSaveDto.getUserId(),wxCouponChannel.getFinalTenantId()); if(null == user) { logger.error("wxcuser未找到:"+orderSaveDto.getUserId()); return new ResultData(ErrorCode.COUPON_IS_EMPTY); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index 359736dc3..9f030cd98 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -173,7 +173,7 @@ public class WxCUserBasicInfoController extends BaseController { public ResultData update(@RequestBody WxCUserBasicInfo wxCUserBasicInfo) { logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::update"); TenantEntity tenantEntity = getTenantInfo(); - WxCUserBasicInfo oldInfo = wxCUserBasicInfoService.getById(wxCUserBasicInfo.getId()); + WxCUserBasicInfo oldInfo = wxCUserBasicInfoService.getById(wxCUserBasicInfo.getId(),tenantEntity.getFinalTenantId()); if (!oldInfo.getPhone().equals(wxCUserBasicInfo.getPhone())) { if (checkUniquePhone(wxCUserBasicInfo.getPhone(), tenantEntity) > 0) { return new ResultData(ErrorCode.USER_PHONE_IS_FOUND.getCode(), "手机号已存在"); @@ -222,7 +222,7 @@ public class WxCUserBasicInfoController extends BaseController { @SystemControllerLog(description = "会员管理-查询") public ResultData findById(Long id) { logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::findById"); - WxCUserBasicInfo info = wxCUserBasicInfoService.getById(id); + WxCUserBasicInfo info = wxCUserBasicInfoService.getById(id,getTenantInfo().getFinalTenantId()); if (info == null) return new ResultData(ErrorCode.USER_IS_EMPTY); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java index f7dcb8b9d..fd357aff0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java @@ -73,7 +73,7 @@ public class WxScoreHistoryController extends BaseController { } public boolean checkMemberStatus(Long userId) { - WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(userId); + WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(userId,getTenantInfo().getFinalTenantId()); if (wxCUserBasicInfo != null && wxCUserBasicInfo.getStatus().equals(EnumCUserBasicInfoStatus.LOCKED.getCode())) { logger.info("会员权益被锁定:cUserId:" + userId); return true; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java index dda09db67..1727cfc17 100755 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java @@ -163,7 +163,7 @@ public class WxCUserController extends BaseController { wxCUserFromBService.saveOrUpdate(wxCUserFromB); } } else { - WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(wxCUserFromB.getCUserId()); + WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(wxCUserFromB.getCUserId(),bUser.getFinalTenantId()); if (!StringUtils.isEmpty(wxCUserFromBDto.getName())) { wxCUserBasicInfo.setName(wxCUserFromBDto.getName()); } @@ -224,7 +224,7 @@ public class WxCUserController extends BaseController { } WxCUserFromB wxCUserFromB = wxCUserFromBService.getByOpenidAndAppId(wxCUserFromBDto); if(wxCUserFromB!=null){ - WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(wxCUserFromB.getCUserId()); + WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(wxCUserFromB.getCUserId(),wxCUserFromB.getFinalTenantId()); return new ResultData(wxCUserBasicInfo); } return new ResultData(Result.SUCCESS,"查询成功",null); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 4c0db6958..ac1657ab7 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -251,7 +251,7 @@ public class WxCouponOrderController extends BaseController { if (wxCouponOrderCVo == null) return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); - WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(wxCouponOrderCVo.getcUserId()); + WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(wxCouponOrderCVo.getcUserId(),wxCouponOrderCVo.getFinalTenantId()); if (wxCUserBasicInfo != null && EnumCreditLockedStatus.CLOSE.getCode().equals(wxCUserBasicInfo.getStatus())) { return new ResultData(ErrorCode.MEMBER_IS_LOCKED); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java index 2e47184a7..22a68fa38 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java @@ -72,7 +72,7 @@ public class WxMemController extends BaseController { // return new ResultData(ErrorCode.USER_IS_EMPTY); // } - WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(id); + WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(id,bUser.getFinalTenantId()); if (null != wxCUserBasicInfo && EnumCreditLockedStatus.CLOSE.getCode().equals(wxCUserBasicInfo.getStatus())) { return new ResultData(ErrorCode.MEMBER_IS_LOCKED); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java index 4f45cedd6..481268820 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java @@ -327,7 +327,7 @@ public class WxMicroPayController extends BaseController { logger.error("cUserId参数不正确: " + paramMap.toString()); return new ResultData(ErrorCode.SYS_CLASSCAST_ERROR); } - cUser = wxCUserBasicInfoService.getById(cUserId); + cUser = wxCUserBasicInfoService.getById(cUserId,user.getFinalTenantId()); } else { cUser = wxCUserBasicInfoService.findInfoByPhone(user,phone); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java index 4bb9c1ab4..f4cf955ac 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java @@ -103,6 +103,11 @@ public class BaseController { return tenantEntity; } + public String getFinalTenantId() { + TenantEntity tenantEntity = getTenantInfo(); + return tenantEntity.getFinalTenantId(); + } + // public Long getUserId() { // HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); // Long cUserId = (Long) request.getAttribute(Constant.LOGIN_USER_KEY); @@ -154,11 +159,11 @@ public class BaseController { cUserTokenService.updateTokenCache(token, cuser); } - private WxCUserBasicInfo getCacheMember(Long memberId,String key,long seconds) throws Exception { + private WxCUserBasicInfo getCacheMember(Long memberId,String finalTenantId,String key,long seconds) throws Exception { // 缓存 WxCUserBasicInfo member = RedisCacheUtils.getCacheObject(cuserBasicInfoTemplate, key, WxCUserBasicInfo.class); if(null == member) { - member = wxCUserBasicInfoService.getById(memberId); + member = wxCUserBasicInfoService.getById(memberId,finalTenantId); if (member == null) { throw new MallinkException(ErrorCode.USER_IS_EMPTY); } @@ -170,13 +175,13 @@ public class BaseController { public WxCUserBasicInfo getCacheMember() throws Exception { Long memberId = getMemberId(); String key = "webapp:member:"+memberId; - return getCacheMember(memberId, key, 3600*24*3); + return getCacheMember(memberId,getFinalTenantId(), key, 3600*24*3); } /*此处缓存短暂时间,因为积分、成长值记录*/ - public WxCUserBasicInfo getShortCacheMember(Long memberId) throws Exception { + public WxCUserBasicInfo getShortCacheMember(Long memberId,String finalTenantId) throws Exception { String key = "webapp:short:member:"+memberId; - return getCacheMember(memberId, key, 100); + return getCacheMember(memberId,finalTenantId, key, 100); } public void removeCacheMember(Long memberId) { @@ -228,7 +233,7 @@ public class BaseController { WxCUserBasicInfo byId = null; if (null != userId) { - byId = wxCUserBasicInfoService.getById(userId); + byId = wxCUserBasicInfoService.getById(userId,getFinalTenantId()); } // List list = wxCUserBasicInfoService.findByPhone(tenantEntity, phone); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java index 930b1c53d..16de608d2 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -93,7 +93,7 @@ public class WxCardPayController extends BaseController { private ResultData saveCardPayOrder(Long cUserId,String cardIdStr,String merchantStr,String totalFeeStr,EnumPayWay payWay) { String ipStr = getIpAddr(); logger.info("saveCardPayOrder: " + ipStr + " : cUserId:{} , cardIdStr:{},merchantStr:{},totalFeeStr:{}",cUserId,cardIdStr,cardIdStr,cardIdStr); - WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(cUserId); + WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(cUserId,getFinalTenantId()); if (null != wxCUserBasicInfo && EnumCreditLockedStatus.CLOSE.getCode().equals(wxCUserBasicInfo.getStatus())) { logger.error(ErrorCode.MEMBER_IS_LOCKED.getMessage()); return new ResultData(ErrorCode.MEMBER_IS_LOCKED); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java index 00a97e081..5b11b2844 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java @@ -74,7 +74,7 @@ public class WxCouponPasswordController extends BaseController { } - WxCUserBasicInfo member = userService.getById(memberId); + WxCUserBasicInfo member = userService.getById(memberId,getFinalTenantId()); if(member == null) { logger.error("会员用户未找到: " + memberId); throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "会员用户未找到" + memberId); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index 0bc858526..57a0032b4 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -87,7 +87,7 @@ public class WxOrderController extends BaseController { ResultData resultData = couponChannelCheck(orderSaveDto, wxCouponChannel); if (resultData != null) return resultData; - WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(cUserId); + WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(cUserId,getFinalTenantId()); if (wxCUserBasicInfo != null && wxCUserBasicInfo.getStatus().equals(EnumCUserBasicInfoStatus.LOCKED.getCode())) { logger.info("会员权益被锁定:cUserId:" + cUserId); return new ResultData(ErrorCode.MEMBER_IS_LOCKED); @@ -427,7 +427,7 @@ public class WxOrderController extends BaseController { WxOrder order = null; try { - WxCUserBasicInfo member = wxCUserBasicInfoService.getById(getMemberId()); + WxCUserBasicInfo member = wxCUserBasicInfoService.getById(getMemberId(),getFinalTenantId()); if(member == null) { logger.error("会员用户未找到: " + getMemberId()); throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "会员用户未找到" + getMemberId()); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java index 20d9e64a6..2eb0054f9 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java @@ -98,7 +98,7 @@ public class WxPayOrderController extends BaseController { } private ResultData _create(String orderIdStr,Long userId, EnumPayWay payWay,String appId,PayExtraParam parm,HttpServletRequest request) { - WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(userId); + WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(userId,getFinalTenantId()); if ( null == wxCUserBasicInfo) { logger.error("会员用户不存在."+userId); return new ResultData(ErrorCode.USER_IS_EMPTY.getCode(),"会员用户不存在."+userId); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java index 3e524904c..162d5da85 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java @@ -117,7 +117,7 @@ public class WxQuestionController extends BaseController { } wxQuestionLog.setAnswer(JSONObject.toJSONString(as)); - wxCUserTagsService.assignTags(as, wxCUserBasicInfoService.getById(memberId)); + wxCUserTagsService.assignTags(as, wxCUserBasicInfoService.getById(memberId,getFinalTenantId())); } wxQuestionLog.setUserId(memberId); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 700cedbc4..158762ef4 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -803,7 +803,7 @@ public class WxUserGrantController extends BaseController { if(user.basicInfoIs()){ WxCUserBasicInfo wxCUserBasicInfo; try { - wxCUserBasicInfo = getShortCacheMember(user.getUserId()); + wxCUserBasicInfo = getShortCacheMember(user.getUserId(),getFinalTenantId()); //WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(user.getUserId()); if (wxCUserBasicInfo != null) { userVo.setScore(wxCUserBasicInfo.getPoins()); @@ -991,7 +991,7 @@ public class WxUserGrantController extends BaseController { WxCUserBasicInfo member; try { Long memberId = getMemberId(); - member = wxCUserBasicInfoService.getById(memberId); + member = wxCUserBasicInfoService.getById(memberId,getFinalTenantId()); } catch (Exception e) { return new ResultData(Result.ERROR,e.getMessage()); } diff --git a/mallinkCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java b/mallinkCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java index 8e922ecee..db7f5b15a 100644 --- a/mallinkCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java +++ b/mallinkCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java @@ -35,13 +35,14 @@ public class LoginUserHandlerMethodArgumentResolver implements HandlerMethodArgu @Override public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer container, NativeWebRequest request, WebDataBinderFactory factory) throws Exception { - //获取会员ID - Object object = request.getAttribute(Constant.LOGIN_MEMBER_KEY, RequestAttributes.SCOPE_REQUEST); - if(object == null){ - return null; - } - - WxCUserBasicInfo user = wxCUserBasicInfoService.getById((Long) object); - return user; +// //获取会员ID +// Object object = request.getAttribute(Constant.LOGIN_MEMBER_KEY, RequestAttributes.SCOPE_REQUEST); +// if(object == null){ +// return null; +// } +// +// //WxCUserBasicInfo user = wxCUserBasicInfoService.getById((Long) object); +// return user; + return null; } } diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCYFCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCYFCallBackController.java index e3959e289..0374bd795 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCYFCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCYFCallBackController.java @@ -118,7 +118,7 @@ public class WxCarCYFCallBackController extends BaseController { for (WxCUserCar userCar : userCarList) { userCar.setParentTenantId(park.getParentTenantId()); wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.CAR_STOP, userCar,EnumPayWay.PAY_WAY_NOT_UNPAY_CAR_STOP); - WxCUserBasicInfo cUser = wxCUserBasicInfoService.getById(userCar.getCUserId()); + WxCUserBasicInfo cUser = wxCUserBasicInfoService.getById(userCar.getCUserId(),park.getFinalTenantId()); if(cUser != null){ if(bFirst) { phoneStrs = cUser.getPhone(); diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarETCPCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarETCPCallBackController.java index a3a715c74..6fccafa83 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarETCPCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarETCPCallBackController.java @@ -374,7 +374,7 @@ public class WxCarETCPCallBackController extends BaseController { for (WxCUserCar userCar : userCarList) { userCar.setParentTenantId(park.getParentTenantId()); wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.CAR_STOP, userCar,EnumPayWay.PAY_WAY_NOT_UNPAY_CAR_STOP); - WxCUserBasicInfo cUser = wxCUserBasicInfoService.getById(userCar.getCUserId()); + WxCUserBasicInfo cUser = wxCUserBasicInfoService.getById(userCar.getCUserId(),park.getFinalTenantId()); if(cUser != null){ if(bFirst) { phoneStrs = cUser.getPhone(); diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarTJDCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarTJDCallBackController.java index 1889ae417..ea8bf0d78 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarTJDCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarTJDCallBackController.java @@ -170,7 +170,7 @@ public class WxCarTJDCallBackController extends BaseController { for (WxCUserCar userCar : userCarList) { userCar.setParentTenantId(park.getParentTenantId()); wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.CAR_STOP, userCar,EnumPayWay.PAY_WAY_NOT_UNPAY_CAR_STOP); - WxCUserBasicInfo cUser = wxCUserBasicInfoService.getById(userCar.getCUserId()); + WxCUserBasicInfo cUser = wxCUserBasicInfoService.getById(userCar.getCUserId(),park.getFinalTenantId()); if(cUser != null){ if(bFirst) { phoneStrs = cUser.getPhone(); diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxParkCallBackBaseController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxParkCallBackBaseController.java index 14d79ccbf..6d59a30e0 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxParkCallBackBaseController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxParkCallBackBaseController.java @@ -196,7 +196,7 @@ public class WxParkCallBackBaseController extends BaseController { for (WxCUserCar userCar : userCarList) { userCar.setParentTenantId(wxCarCmdLog.getParentTenantId()); wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.CAR_STOP, userCar,EnumPayWay.PAY_WAY_NOT_UNPAY_CAR_STOP); - WxCUserBasicInfo cUser = wxCUserBasicInfoService.getById(userCar.getCUserId()); + WxCUserBasicInfo cUser = wxCUserBasicInfoService.getById(userCar.getCUserId(),wxCarCmdLog.getFinalTenantId()); if(cUser != null){ if(bFirst) { phoneStrs = cUser.getPhone(); diff --git a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java index d2e3018ce..8f1308239 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -299,7 +299,7 @@ public class PosServiceImpl implements PosService { if (couponOrder == null) { throw new MallinkException(ErrorCode.CARD_IS_NOT_FOUND); } - user = cUserBasicInfoService.getById(couponOrder.getOwnerId()); + user = cUserBasicInfoService.getById(couponOrder.getOwnerId(),couponOrder.getFinalTenantId()); } else { if (StringUtils.isBlank(memIdStr) && StringUtils.isBlank(memPhoneStr)) { errParam2(WxPayConstant.MEM_ID, WxPayConstant.MEM_PHONE); @@ -697,7 +697,7 @@ public class PosServiceImpl implements PosService { logger.error(e.getMessage()); throw new MallinkException(ErrorCode.SYS_PARAMETER_CAST_ERROR.getCode(), e.getMessage()); } - user = cUserBasicInfoService.getById(memId); + user = cUserBasicInfoService.getById(memId,tenantEntity.getFinalTenantId()); } if (StringUtils.isNotBlank(memPhoneStr)) { user = cUserBasicInfoService.findInfoByPhone(tenantEntity,memPhoneStr); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java index 799dcd784..db368997f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java @@ -34,6 +34,14 @@ public class TenantEntity extends BaseEntity { } } + public String getFinalTenantId() { + if (!StringUtils.isBlank(parentTenantId)) { + return parentTenantId; + } + return tenantId; + } + + public String getTenantId() { return tenantId; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java index 545989fee..161ce3d00 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java @@ -21,6 +21,8 @@ public interface WxCUserBasicInfoMapper extends CommonMapper findList(WxCUserBasicInfo wxCUserBasicInfo); List findList1(@Param("tenantInfo")TenantEntity tenantInfo, @Param("basicInfo")WxCUserBasicInfo wxCUserBasicInfo); + + WxCUserBasicInfo selectById(@Param("id")Long id,@Param("finalTenantId")String finalTenantId); void updateScore(WxCUserBasicInfo record); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java index 8487ffa49..452f410f7 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java @@ -53,7 +53,7 @@ public interface WxCUserBasicInfoService { * @param id * @return */ - WxCUserBasicInfo getById(Long id); + WxCUserBasicInfo getById(Long id,String finalTenantId); /** * 保存实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 88bfa6d16..025fc70ff 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -613,8 +613,8 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc } @Override - public WxCUserBasicInfo getById(Long id) { - return wxCUserBasicInfoMapper.selectById(id); + public WxCUserBasicInfo getById(Long id,String finalTenantId) { + return wxCUserBasicInfoMapper.selectById(id,finalTenantId); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java index 2950d986b..33f393d6c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java @@ -275,7 +275,7 @@ public class WxCUserServiceImpl implements WxCUserService { // 用户登陆后 更新最后一次活跃时间 if (user.getUserId() != null) { - WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(user.getUserId()); + WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(user.getUserId(),user.getFinalTenantId()); if (wxCUserBasicInfo != null) { WxCUserBasicInfo basicInfo = new WxCUserBasicInfo(); basicInfo.setId(wxCUserBasicInfo.getId()); diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderSuccessMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderSuccessMsgServiceImpl.java index 81e9ea797..fcc0c5057 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderSuccessMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderSuccessMsgServiceImpl.java @@ -63,7 +63,7 @@ public class FmInsideOrderSuccessMsgServiceImpl implements MsgSendService { throw new MallinkException(ErrorCode.ORDER_COUPON_NOT_MATCH.getCode(), "订单用户不一致" + msg.getOrderId()); } - WxCUserBasicInfo user = userService.getById(msg.getCUserId()); + WxCUserBasicInfo user = userService.getById(msg.getCUserId(),couponChannel.getFinalTenantId()); if(user == null) { logger.error("用户未找到: " + msg.getCUserId()); throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "用户未找到" + msg.getCUserId()); diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java b/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java index 37b638d8d..5661a8e8a 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java @@ -61,7 +61,7 @@ public class EtcpHelper { public ResultData initForEtcp(Map paramMap, Long userId, WxPark park) { String phone = paramMap.get("phone"); - WxCUserBasicInfo user = wxCUserBasicInfoService.getById(userId); + WxCUserBasicInfo user = wxCUserBasicInfoService.getById(userId,park.getFinalTenantId()); if (StringUtils.isBlank(phone) && StringUtils.isBlank(user.getPhone())) { logger.error("暂未成为会员,请授权手机号"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "暂未成为会员,请授权手机号"); diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 4859404e0..fe6f05cca 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -128,6 +128,11 @@ + + +