| @@ -632,7 +632,7 @@ public class WxUserStructureController extends BaseController { | |||||
| } | } | ||||
| // 1. 检查用户积分 | // 1. 检查用户积分 | ||||
| WxCUserBasicInfo info = wxCUserBasicInfoService.getById(userId); | |||||
| WxCUserBasicInfo info = wxCUserBasicInfoService.getById(userId,getTenantInfo().getFinalTenantId()); | |||||
| if(info == null) { | if(info == null) { | ||||
| logger.error(ErrorCode.USER_IS_EMPTY.getMessage()); | logger.error(ErrorCode.USER_IS_EMPTY.getMessage()); | ||||
| return new ResultData(ErrorCode.USER_IS_EMPTY); | return new ResultData(ErrorCode.USER_IS_EMPTY); | ||||
| @@ -171,7 +171,7 @@ public class WxOrderController extends BaseController { | |||||
| } | } | ||||
| try { | try { | ||||
| WxCUserBasicInfo user = wxCUserBasicInfoService.getById(orderSaveDto.getUserId()); | |||||
| WxCUserBasicInfo user = wxCUserBasicInfoService.getById(orderSaveDto.getUserId(),wxCouponChannel.getFinalTenantId()); | |||||
| if(null == user) { | if(null == user) { | ||||
| logger.error("wxcuser未找到:"+orderSaveDto.getUserId()); | logger.error("wxcuser未找到:"+orderSaveDto.getUserId()); | ||||
| return new ResultData(ErrorCode.COUPON_IS_EMPTY); | return new ResultData(ErrorCode.COUPON_IS_EMPTY); | ||||
| @@ -173,7 +173,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||||
| public ResultData update(@RequestBody WxCUserBasicInfo wxCUserBasicInfo) { | public ResultData update(@RequestBody WxCUserBasicInfo wxCUserBasicInfo) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::update"); | logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::update"); | ||||
| TenantEntity tenantEntity = getTenantInfo(); | TenantEntity tenantEntity = getTenantInfo(); | ||||
| WxCUserBasicInfo oldInfo = wxCUserBasicInfoService.getById(wxCUserBasicInfo.getId()); | |||||
| WxCUserBasicInfo oldInfo = wxCUserBasicInfoService.getById(wxCUserBasicInfo.getId(),tenantEntity.getFinalTenantId()); | |||||
| if (!oldInfo.getPhone().equals(wxCUserBasicInfo.getPhone())) { | if (!oldInfo.getPhone().equals(wxCUserBasicInfo.getPhone())) { | ||||
| if (checkUniquePhone(wxCUserBasicInfo.getPhone(), tenantEntity) > 0) { | if (checkUniquePhone(wxCUserBasicInfo.getPhone(), tenantEntity) > 0) { | ||||
| return new ResultData(ErrorCode.USER_PHONE_IS_FOUND.getCode(), "手机号已存在"); | return new ResultData(ErrorCode.USER_PHONE_IS_FOUND.getCode(), "手机号已存在"); | ||||
| @@ -222,7 +222,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||||
| @SystemControllerLog(description = "会员管理-查询") | @SystemControllerLog(description = "会员管理-查询") | ||||
| public ResultData findById(Long id) { | public ResultData findById(Long id) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::findById"); | logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::findById"); | ||||
| WxCUserBasicInfo info = wxCUserBasicInfoService.getById(id); | |||||
| WxCUserBasicInfo info = wxCUserBasicInfoService.getById(id,getTenantInfo().getFinalTenantId()); | |||||
| if (info == null) | if (info == null) | ||||
| return new ResultData(ErrorCode.USER_IS_EMPTY); | return new ResultData(ErrorCode.USER_IS_EMPTY); | ||||
| @@ -73,7 +73,7 @@ public class WxScoreHistoryController extends BaseController { | |||||
| } | } | ||||
| public boolean checkMemberStatus(Long userId) { | 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())) { | if (wxCUserBasicInfo != null && wxCUserBasicInfo.getStatus().equals(EnumCUserBasicInfoStatus.LOCKED.getCode())) { | ||||
| logger.info("会员权益被锁定:cUserId:" + userId); | logger.info("会员权益被锁定:cUserId:" + userId); | ||||
| return true; | return true; | ||||
| @@ -163,7 +163,7 @@ public class WxCUserController extends BaseController { | |||||
| wxCUserFromBService.saveOrUpdate(wxCUserFromB); | wxCUserFromBService.saveOrUpdate(wxCUserFromB); | ||||
| } | } | ||||
| } else { | } else { | ||||
| WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(wxCUserFromB.getCUserId()); | |||||
| WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(wxCUserFromB.getCUserId(),bUser.getFinalTenantId()); | |||||
| if (!StringUtils.isEmpty(wxCUserFromBDto.getName())) { | if (!StringUtils.isEmpty(wxCUserFromBDto.getName())) { | ||||
| wxCUserBasicInfo.setName(wxCUserFromBDto.getName()); | wxCUserBasicInfo.setName(wxCUserFromBDto.getName()); | ||||
| } | } | ||||
| @@ -224,7 +224,7 @@ public class WxCUserController extends BaseController { | |||||
| } | } | ||||
| WxCUserFromB wxCUserFromB = wxCUserFromBService.getByOpenidAndAppId(wxCUserFromBDto); | WxCUserFromB wxCUserFromB = wxCUserFromBService.getByOpenidAndAppId(wxCUserFromBDto); | ||||
| if(wxCUserFromB!=null){ | if(wxCUserFromB!=null){ | ||||
| WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(wxCUserFromB.getCUserId()); | |||||
| WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(wxCUserFromB.getCUserId(),wxCUserFromB.getFinalTenantId()); | |||||
| return new ResultData(wxCUserBasicInfo); | return new ResultData(wxCUserBasicInfo); | ||||
| } | } | ||||
| return new ResultData(Result.SUCCESS,"查询成功",null); | return new ResultData(Result.SUCCESS,"查询成功",null); | ||||
| @@ -251,7 +251,7 @@ public class WxCouponOrderController extends BaseController { | |||||
| if (wxCouponOrderCVo == null) | if (wxCouponOrderCVo == null) | ||||
| return new ResultData(ErrorCode.COUPON_ORDER_IS_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())) { | if (wxCUserBasicInfo != null && EnumCreditLockedStatus.CLOSE.getCode().equals(wxCUserBasicInfo.getStatus())) { | ||||
| return new ResultData(ErrorCode.MEMBER_IS_LOCKED); | return new ResultData(ErrorCode.MEMBER_IS_LOCKED); | ||||
| } | } | ||||
| @@ -72,7 +72,7 @@ public class WxMemController extends BaseController { | |||||
| // return new ResultData(ErrorCode.USER_IS_EMPTY); | // 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())) { | if (null != wxCUserBasicInfo && EnumCreditLockedStatus.CLOSE.getCode().equals(wxCUserBasicInfo.getStatus())) { | ||||
| return new ResultData(ErrorCode.MEMBER_IS_LOCKED); | return new ResultData(ErrorCode.MEMBER_IS_LOCKED); | ||||
| } | } | ||||
| @@ -327,7 +327,7 @@ public class WxMicroPayController extends BaseController { | |||||
| logger.error("cUserId参数不正确: " + paramMap.toString()); | logger.error("cUserId参数不正确: " + paramMap.toString()); | ||||
| return new ResultData(ErrorCode.SYS_CLASSCAST_ERROR); | return new ResultData(ErrorCode.SYS_CLASSCAST_ERROR); | ||||
| } | } | ||||
| cUser = wxCUserBasicInfoService.getById(cUserId); | |||||
| cUser = wxCUserBasicInfoService.getById(cUserId,user.getFinalTenantId()); | |||||
| } else { | } else { | ||||
| cUser = wxCUserBasicInfoService.findInfoByPhone(user,phone); | cUser = wxCUserBasicInfoService.findInfoByPhone(user,phone); | ||||
| } | } | ||||
| @@ -103,6 +103,11 @@ public class BaseController { | |||||
| return tenantEntity; | return tenantEntity; | ||||
| } | } | ||||
| public String getFinalTenantId() { | |||||
| TenantEntity tenantEntity = getTenantInfo(); | |||||
| return tenantEntity.getFinalTenantId(); | |||||
| } | |||||
| // public Long getUserId() { | // public Long getUserId() { | ||||
| // HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | // HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | ||||
| // Long cUserId = (Long) request.getAttribute(Constant.LOGIN_USER_KEY); | // Long cUserId = (Long) request.getAttribute(Constant.LOGIN_USER_KEY); | ||||
| @@ -154,11 +159,11 @@ public class BaseController { | |||||
| cUserTokenService.updateTokenCache(token, cuser); | 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); | WxCUserBasicInfo member = RedisCacheUtils.getCacheObject(cuserBasicInfoTemplate, key, WxCUserBasicInfo.class); | ||||
| if(null == member) { | if(null == member) { | ||||
| member = wxCUserBasicInfoService.getById(memberId); | |||||
| member = wxCUserBasicInfoService.getById(memberId,finalTenantId); | |||||
| if (member == null) { | if (member == null) { | ||||
| throw new MallinkException(ErrorCode.USER_IS_EMPTY); | throw new MallinkException(ErrorCode.USER_IS_EMPTY); | ||||
| } | } | ||||
| @@ -170,13 +175,13 @@ public class BaseController { | |||||
| public WxCUserBasicInfo getCacheMember() throws Exception { | public WxCUserBasicInfo getCacheMember() throws Exception { | ||||
| Long memberId = getMemberId(); | Long memberId = getMemberId(); | ||||
| String key = "webapp:member:"+memberId; | 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; | String key = "webapp:short:member:"+memberId; | ||||
| return getCacheMember(memberId, key, 100); | |||||
| return getCacheMember(memberId,finalTenantId, key, 100); | |||||
| } | } | ||||
| public void removeCacheMember(Long memberId) { | public void removeCacheMember(Long memberId) { | ||||
| @@ -228,7 +233,7 @@ public class BaseController { | |||||
| WxCUserBasicInfo byId = null; | WxCUserBasicInfo byId = null; | ||||
| if (null != userId) { | if (null != userId) { | ||||
| byId = wxCUserBasicInfoService.getById(userId); | |||||
| byId = wxCUserBasicInfoService.getById(userId,getFinalTenantId()); | |||||
| } | } | ||||
| // List<WxCUserBasicInfo> list = wxCUserBasicInfoService.findByPhone(tenantEntity, phone); | // List<WxCUserBasicInfo> list = wxCUserBasicInfoService.findByPhone(tenantEntity, phone); | ||||
| @@ -93,7 +93,7 @@ public class WxCardPayController extends BaseController { | |||||
| private ResultData saveCardPayOrder(Long cUserId,String cardIdStr,String merchantStr,String totalFeeStr,EnumPayWay payWay) { | private ResultData saveCardPayOrder(Long cUserId,String cardIdStr,String merchantStr,String totalFeeStr,EnumPayWay payWay) { | ||||
| String ipStr = getIpAddr(); | String ipStr = getIpAddr(); | ||||
| logger.info("saveCardPayOrder: " + ipStr + " : cUserId:{} , cardIdStr:{},merchantStr:{},totalFeeStr:{}",cUserId,cardIdStr,cardIdStr,cardIdStr); | 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())) { | if (null != wxCUserBasicInfo && EnumCreditLockedStatus.CLOSE.getCode().equals(wxCUserBasicInfo.getStatus())) { | ||||
| logger.error(ErrorCode.MEMBER_IS_LOCKED.getMessage()); | logger.error(ErrorCode.MEMBER_IS_LOCKED.getMessage()); | ||||
| return new ResultData(ErrorCode.MEMBER_IS_LOCKED); | return new ResultData(ErrorCode.MEMBER_IS_LOCKED); | ||||
| @@ -74,7 +74,7 @@ public class WxCouponPasswordController extends BaseController { | |||||
| } | } | ||||
| WxCUserBasicInfo member = userService.getById(memberId); | |||||
| WxCUserBasicInfo member = userService.getById(memberId,getFinalTenantId()); | |||||
| if(member == null) { | if(member == null) { | ||||
| logger.error("会员用户未找到: " + memberId); | logger.error("会员用户未找到: " + memberId); | ||||
| throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "会员用户未找到" + memberId); | throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "会员用户未找到" + memberId); | ||||
| @@ -87,7 +87,7 @@ public class WxOrderController extends BaseController { | |||||
| ResultData resultData = couponChannelCheck(orderSaveDto, wxCouponChannel); | ResultData resultData = couponChannelCheck(orderSaveDto, wxCouponChannel); | ||||
| if (resultData != null) return resultData; | 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())) { | if (wxCUserBasicInfo != null && wxCUserBasicInfo.getStatus().equals(EnumCUserBasicInfoStatus.LOCKED.getCode())) { | ||||
| logger.info("会员权益被锁定:cUserId:" + cUserId); | logger.info("会员权益被锁定:cUserId:" + cUserId); | ||||
| return new ResultData(ErrorCode.MEMBER_IS_LOCKED); | return new ResultData(ErrorCode.MEMBER_IS_LOCKED); | ||||
| @@ -427,7 +427,7 @@ public class WxOrderController extends BaseController { | |||||
| WxOrder order = null; | WxOrder order = null; | ||||
| try { | try { | ||||
| WxCUserBasicInfo member = wxCUserBasicInfoService.getById(getMemberId()); | |||||
| WxCUserBasicInfo member = wxCUserBasicInfoService.getById(getMemberId(),getFinalTenantId()); | |||||
| if(member == null) { | if(member == null) { | ||||
| logger.error("会员用户未找到: " + getMemberId()); | logger.error("会员用户未找到: " + getMemberId()); | ||||
| throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "会员用户未找到" + getMemberId()); | throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "会员用户未找到" + getMemberId()); | ||||
| @@ -98,7 +98,7 @@ public class WxPayOrderController extends BaseController { | |||||
| } | } | ||||
| private ResultData _create(String orderIdStr,Long userId, EnumPayWay payWay,String appId,PayExtraParam parm,HttpServletRequest request) { | 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) { | if ( null == wxCUserBasicInfo) { | ||||
| logger.error("会员用户不存在."+userId); | logger.error("会员用户不存在."+userId); | ||||
| return new ResultData(ErrorCode.USER_IS_EMPTY.getCode(),"会员用户不存在."+userId); | return new ResultData(ErrorCode.USER_IS_EMPTY.getCode(),"会员用户不存在."+userId); | ||||
| @@ -117,7 +117,7 @@ public class WxQuestionController extends BaseController { | |||||
| } | } | ||||
| wxQuestionLog.setAnswer(JSONObject.toJSONString(as)); | wxQuestionLog.setAnswer(JSONObject.toJSONString(as)); | ||||
| wxCUserTagsService.assignTags(as, wxCUserBasicInfoService.getById(memberId)); | |||||
| wxCUserTagsService.assignTags(as, wxCUserBasicInfoService.getById(memberId,getFinalTenantId())); | |||||
| } | } | ||||
| wxQuestionLog.setUserId(memberId); | wxQuestionLog.setUserId(memberId); | ||||
| @@ -803,7 +803,7 @@ public class WxUserGrantController extends BaseController { | |||||
| if(user.basicInfoIs()){ | if(user.basicInfoIs()){ | ||||
| WxCUserBasicInfo wxCUserBasicInfo; | WxCUserBasicInfo wxCUserBasicInfo; | ||||
| try { | try { | ||||
| wxCUserBasicInfo = getShortCacheMember(user.getUserId()); | |||||
| wxCUserBasicInfo = getShortCacheMember(user.getUserId(),getFinalTenantId()); | |||||
| //WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(user.getUserId()); | //WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(user.getUserId()); | ||||
| if (wxCUserBasicInfo != null) { | if (wxCUserBasicInfo != null) { | ||||
| userVo.setScore(wxCUserBasicInfo.getPoins()); | userVo.setScore(wxCUserBasicInfo.getPoins()); | ||||
| @@ -991,7 +991,7 @@ public class WxUserGrantController extends BaseController { | |||||
| WxCUserBasicInfo member; | WxCUserBasicInfo member; | ||||
| try { | try { | ||||
| Long memberId = getMemberId(); | Long memberId = getMemberId(); | ||||
| member = wxCUserBasicInfoService.getById(memberId); | |||||
| member = wxCUserBasicInfoService.getById(memberId,getFinalTenantId()); | |||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| return new ResultData(Result.ERROR,e.getMessage()); | return new ResultData(Result.ERROR,e.getMessage()); | ||||
| } | } | ||||
| @@ -35,13 +35,14 @@ public class LoginUserHandlerMethodArgumentResolver implements HandlerMethodArgu | |||||
| @Override | @Override | ||||
| public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer container, | public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer container, | ||||
| NativeWebRequest request, WebDataBinderFactory factory) throws Exception { | 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; | |||||
| } | } | ||||
| } | } | ||||
| @@ -118,7 +118,7 @@ public class WxCarCYFCallBackController extends BaseController { | |||||
| for (WxCUserCar userCar : userCarList) { | for (WxCUserCar userCar : userCarList) { | ||||
| userCar.setParentTenantId(park.getParentTenantId()); | userCar.setParentTenantId(park.getParentTenantId()); | ||||
| wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.CAR_STOP, userCar,EnumPayWay.PAY_WAY_NOT_UNPAY_CAR_STOP); | 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(cUser != null){ | ||||
| if(bFirst) { | if(bFirst) { | ||||
| phoneStrs = cUser.getPhone(); | phoneStrs = cUser.getPhone(); | ||||
| @@ -374,7 +374,7 @@ public class WxCarETCPCallBackController extends BaseController { | |||||
| for (WxCUserCar userCar : userCarList) { | for (WxCUserCar userCar : userCarList) { | ||||
| userCar.setParentTenantId(park.getParentTenantId()); | userCar.setParentTenantId(park.getParentTenantId()); | ||||
| wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.CAR_STOP, userCar,EnumPayWay.PAY_WAY_NOT_UNPAY_CAR_STOP); | 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(cUser != null){ | ||||
| if(bFirst) { | if(bFirst) { | ||||
| phoneStrs = cUser.getPhone(); | phoneStrs = cUser.getPhone(); | ||||
| @@ -170,7 +170,7 @@ public class WxCarTJDCallBackController extends BaseController { | |||||
| for (WxCUserCar userCar : userCarList) { | for (WxCUserCar userCar : userCarList) { | ||||
| userCar.setParentTenantId(park.getParentTenantId()); | userCar.setParentTenantId(park.getParentTenantId()); | ||||
| wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.CAR_STOP, userCar,EnumPayWay.PAY_WAY_NOT_UNPAY_CAR_STOP); | 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(cUser != null){ | ||||
| if(bFirst) { | if(bFirst) { | ||||
| phoneStrs = cUser.getPhone(); | phoneStrs = cUser.getPhone(); | ||||
| @@ -196,7 +196,7 @@ public class WxParkCallBackBaseController extends BaseController { | |||||
| for (WxCUserCar userCar : userCarList) { | for (WxCUserCar userCar : userCarList) { | ||||
| userCar.setParentTenantId(wxCarCmdLog.getParentTenantId()); | userCar.setParentTenantId(wxCarCmdLog.getParentTenantId()); | ||||
| wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.CAR_STOP, userCar,EnumPayWay.PAY_WAY_NOT_UNPAY_CAR_STOP); | 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(cUser != null){ | ||||
| if(bFirst) { | if(bFirst) { | ||||
| phoneStrs = cUser.getPhone(); | phoneStrs = cUser.getPhone(); | ||||
| @@ -299,7 +299,7 @@ public class PosServiceImpl implements PosService { | |||||
| if (couponOrder == null) { | if (couponOrder == null) { | ||||
| throw new MallinkException(ErrorCode.CARD_IS_NOT_FOUND); | throw new MallinkException(ErrorCode.CARD_IS_NOT_FOUND); | ||||
| } | } | ||||
| user = cUserBasicInfoService.getById(couponOrder.getOwnerId()); | |||||
| user = cUserBasicInfoService.getById(couponOrder.getOwnerId(),couponOrder.getFinalTenantId()); | |||||
| } else { | } else { | ||||
| if (StringUtils.isBlank(memIdStr) && StringUtils.isBlank(memPhoneStr)) { | if (StringUtils.isBlank(memIdStr) && StringUtils.isBlank(memPhoneStr)) { | ||||
| errParam2(WxPayConstant.MEM_ID, WxPayConstant.MEM_PHONE); | errParam2(WxPayConstant.MEM_ID, WxPayConstant.MEM_PHONE); | ||||
| @@ -697,7 +697,7 @@ public class PosServiceImpl implements PosService { | |||||
| logger.error(e.getMessage()); | logger.error(e.getMessage()); | ||||
| throw new MallinkException(ErrorCode.SYS_PARAMETER_CAST_ERROR.getCode(), 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)) { | if (StringUtils.isNotBlank(memPhoneStr)) { | ||||
| user = cUserBasicInfoService.findInfoByPhone(tenantEntity,memPhoneStr); | user = cUserBasicInfoService.findInfoByPhone(tenantEntity,memPhoneStr); | ||||
| @@ -34,6 +34,14 @@ public class TenantEntity extends BaseEntity { | |||||
| } | } | ||||
| } | } | ||||
| public String getFinalTenantId() { | |||||
| if (!StringUtils.isBlank(parentTenantId)) { | |||||
| return parentTenantId; | |||||
| } | |||||
| return tenantId; | |||||
| } | |||||
| public String getTenantId() { | public String getTenantId() { | ||||
| return tenantId; | return tenantId; | ||||
| } | } | ||||
| @@ -21,6 +21,8 @@ public interface WxCUserBasicInfoMapper extends CommonMapper<WxCUserBasicInfo, S | |||||
| List<WxCUserBasicInfo> findList(WxCUserBasicInfo wxCUserBasicInfo); | List<WxCUserBasicInfo> findList(WxCUserBasicInfo wxCUserBasicInfo); | ||||
| List<WxCUserBasicInfo> findList1(@Param("tenantInfo")TenantEntity tenantInfo, @Param("basicInfo")WxCUserBasicInfo wxCUserBasicInfo); | List<WxCUserBasicInfo> findList1(@Param("tenantInfo")TenantEntity tenantInfo, @Param("basicInfo")WxCUserBasicInfo wxCUserBasicInfo); | ||||
| WxCUserBasicInfo selectById(@Param("id")Long id,@Param("finalTenantId")String finalTenantId); | |||||
| void updateScore(WxCUserBasicInfo record); | void updateScore(WxCUserBasicInfo record); | ||||
| @@ -53,7 +53,7 @@ public interface WxCUserBasicInfoService { | |||||
| * @param id | * @param id | ||||
| * @return | * @return | ||||
| */ | */ | ||||
| WxCUserBasicInfo getById(Long id); | |||||
| WxCUserBasicInfo getById(Long id,String finalTenantId); | |||||
| /** | /** | ||||
| * 保存实体 | * 保存实体 | ||||
| @@ -613,8 +613,8 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc | |||||
| } | } | ||||
| @Override | @Override | ||||
| public WxCUserBasicInfo getById(Long id) { | |||||
| return wxCUserBasicInfoMapper.selectById(id); | |||||
| public WxCUserBasicInfo getById(Long id,String finalTenantId) { | |||||
| return wxCUserBasicInfoMapper.selectById(id,finalTenantId); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -275,7 +275,7 @@ public class WxCUserServiceImpl implements WxCUserService { | |||||
| // 用户登陆后 更新最后一次活跃时间 | // 用户登陆后 更新最后一次活跃时间 | ||||
| if (user.getUserId() != null) { | if (user.getUserId() != null) { | ||||
| WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(user.getUserId()); | |||||
| WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(user.getUserId(),user.getFinalTenantId()); | |||||
| if (wxCUserBasicInfo != null) { | if (wxCUserBasicInfo != null) { | ||||
| WxCUserBasicInfo basicInfo = new WxCUserBasicInfo(); | WxCUserBasicInfo basicInfo = new WxCUserBasicInfo(); | ||||
| basicInfo.setId(wxCUserBasicInfo.getId()); | basicInfo.setId(wxCUserBasicInfo.getId()); | ||||
| @@ -63,7 +63,7 @@ public class FmInsideOrderSuccessMsgServiceImpl implements MsgSendService { | |||||
| throw new MallinkException(ErrorCode.ORDER_COUPON_NOT_MATCH.getCode(), "订单用户不一致" + msg.getOrderId()); | 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) { | if(user == null) { | ||||
| logger.error("用户未找到: " + msg.getCUserId()); | logger.error("用户未找到: " + msg.getCUserId()); | ||||
| throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "用户未找到" + msg.getCUserId()); | throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "用户未找到" + msg.getCUserId()); | ||||
| @@ -61,7 +61,7 @@ public class EtcpHelper { | |||||
| public ResultData initForEtcp(Map<String, String> paramMap, Long userId, WxPark park) { | public ResultData initForEtcp(Map<String, String> paramMap, Long userId, WxPark park) { | ||||
| String phone = paramMap.get("phone"); | 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())) { | if (StringUtils.isBlank(phone) && StringUtils.isBlank(user.getPhone())) { | ||||
| logger.error("暂未成为会员,请授权手机号"); | logger.error("暂未成为会员,请授权手机号"); | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "暂未成为会员,请授权手机号"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "暂未成为会员,请授权手机号"); | ||||
| @@ -128,6 +128,11 @@ | |||||
| </sql> | </sql> | ||||
| <select id="selectById" parameterType="java.util.HashMap" resultMap="BaseResultMap"> | |||||
| select <include refid="allColumns"/> from wx_c_user_basic_info where id =#{id} and final_tenant_id = #{finalTenantId} | |||||
| </select> | |||||
| <select id="findList" parameterType="com.iformall.domain.po.WxCUserBasicInfo" resultMap="BaseResultMap"> | <select id="findList" parameterType="com.iformall.domain.po.WxCUserBasicInfo" resultMap="BaseResultMap"> | ||||
| select r.* from ( | select r.* from ( | ||||
| select | select | ||||
| @@ -11,6 +11,7 @@ import net.sf.jsqlparser.statement.select.*; | |||||
| import net.sf.jsqlparser.statement.update.Update; | import net.sf.jsqlparser.statement.update.Update; | ||||
| import net.sf.jsqlparser.util.TablesNamesFinder; | import net.sf.jsqlparser.util.TablesNamesFinder; | ||||
| import org.apache.ibatis.executor.statement.StatementHandler; | import org.apache.ibatis.executor.statement.StatementHandler; | ||||
| import org.apache.ibatis.logging.LogFactory; | |||||
| import org.apache.ibatis.mapping.BoundSql; | import org.apache.ibatis.mapping.BoundSql; | ||||
| import org.apache.ibatis.mapping.MappedStatement; | import org.apache.ibatis.mapping.MappedStatement; | ||||
| import org.apache.ibatis.plugin.*; | import org.apache.ibatis.plugin.*; | ||||
| @@ -29,6 +30,7 @@ import java.math.BigDecimal; | |||||
| import java.sql.Date; | import java.sql.Date; | ||||
| import java.sql.Time; | import java.sql.Time; | ||||
| import java.sql.Timestamp; | import java.sql.Timestamp; | ||||
| import java.util.Iterator; | |||||
| import java.util.List; | import java.util.List; | ||||
| import java.util.Map; | import java.util.Map; | ||||
| import java.util.Properties; | import java.util.Properties; | ||||
| @@ -38,7 +40,6 @@ import java.util.Properties; | |||||
| */ | */ | ||||
| public class ShardingSpherePlugin implements MyBatisPlus { | public class ShardingSpherePlugin implements MyBatisPlus { | ||||
| public ShardingSpherePlugin(){ | public ShardingSpherePlugin(){ | ||||
| } | } | ||||
| @@ -190,6 +191,15 @@ public class ShardingSpherePlugin implements MyBatisPlus { | |||||
| o = ((Map) parameterObject).get(column); | o = ((Map) parameterObject).get(column); | ||||
| }else if (((Map) parameterObject).containsKey(field)) { | }else if (((Map) parameterObject).containsKey(field)) { | ||||
| o = ((Map) parameterObject).get(field); | o = ((Map) parameterObject).get(field); | ||||
| }else { | |||||
| Map m = (Map) parameterObject; | |||||
| for (Iterator it = m.keySet().iterator();it.hasNext();) { | |||||
| o = m.get(it.next()); | |||||
| Object v = getValue(column,o,parentChainMap); | |||||
| if (null != v) { | |||||
| return v; | |||||
| } | |||||
| } | |||||
| } | } | ||||
| return getValue(column,o,parentChainMap); | return getValue(column,o,parentChainMap); | ||||
| }else if (isBasicTypeValue(parameterObject)) { | }else if (isBasicTypeValue(parameterObject)) { | ||||
| @@ -229,7 +239,7 @@ public class ShardingSpherePlugin implements MyBatisPlus { | |||||
| return o; | return o; | ||||
| }catch(Exception e) { | }catch(Exception e) { | ||||
| e.printStackTrace(); | e.printStackTrace(); | ||||
| return parameterObject; | |||||
| return null; | |||||
| } | } | ||||
| } | } | ||||