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 7e7eceb44..fafbcf6d6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -95,7 +95,7 @@ public class WxCUserBasicInfoController extends BaseController { info.setLevel(WxLevelConfigService.DEFAULT_LEVEL); } else { info.setLevel(WxLevelConfigService.DEFAULT_LEVEL); - List levelList = wxLevelConfigService.getByTenantId(info.getTenantId()); + List levelList = wxLevelConfigService.getByTenantInfo(info.getTenantInfo()); for (WxLevelConfig levelConfig : levelList) { if (info.getPoins() >= levelConfig.getPoints()) { info.setLevel(levelConfig.getLevel()); @@ -225,6 +225,7 @@ public class WxCUserBasicInfoController extends BaseController { if (info == null) return new ResultData(ErrorCode.USER_IS_EMPTY); + info.updateTenantInfo(getTenantInfo()); setUserInfoTag(info); setUserInfoLevel(info); @@ -373,7 +374,6 @@ public class WxCUserBasicInfoController extends BaseController { final MallUserInfo user = getUser(); String userId = "" + user.getId(); String importKey = Constant.importMemPrev + userId; - final String tenantId = getTenantId(); //查询当前用户得到的值是否为空,为空继续,不为空,返回模板正在导入 Boolean allCount = stringRedisTemplate.opsForHash().hasKey(importKey, "allCount"); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java index b72bb5129..a177d36df 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java @@ -133,7 +133,6 @@ public class WxBillDailyController extends BaseController { final MallUserInfo user = getUser(); String userId = "bill_daily_" + user.getId(); String importKey = Constant.importMemPrev + userId; - final String tenantId = getTenantId(); //查询当前用户得到的值是否为空,为空继续,不为空,返回模板正在导入 Boolean allCount = stringRedisTemplate.opsForHash().hasKey(importKey, "allCount"); diff --git a/mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java b/mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java index 038f84010..b60428246 100644 --- a/mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java +++ b/mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java @@ -9,6 +9,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.PosOrder; import com.iformall.domain.po.PosPayOrder; import com.iformall.domain.po.WxMerchantBUser; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.pay.WxPayConstant; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java index bbfd92a5b..06d8cf43a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java @@ -131,7 +131,7 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { public void cleanWebOpenId(MallUserInfo user) { MallUserInfo updateUser = new MallUserInfo(); updateUser.setId(user.getId()); - updateUser.setTenantId(user.getTenantId()); + updateUser.updateTenantInfo(user); updateUser.setUsername(user.getUsername()); mallUserInfoMapper.removeWebOpenId(updateUser); } @@ -141,7 +141,7 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { public void cleanAllOpenId(MallUserInfo user) { MallUserInfo updateUser = new MallUserInfo(); updateUser.setId(user.getId()); - updateUser.setTenantId(user.getTenantId()); + updateUser.updateTenantInfo(user); updateUser.setUsername(user.getUsername()); mallUserInfoMapper.removeAllOpenId(updateUser); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java index 5372ed76f..c1cfd3f99 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java @@ -100,7 +100,7 @@ public class MallUserRoleServiceImpl implements MallUserRoleService { Long roleId = userRole.getRoleId(); MallRolePermission p = new MallRolePermission(); p.setRoleId(roleId); - p.setTenantId(userInfo.getTenantId()); + p.updateTenantInfo(userInfo); List rolePermissions = mallRolePermissionMapper.findList(p); for (MallRolePermission rp : rolePermissions) { logger.info("user permission id " + rp.getPermissionId()); @@ -123,7 +123,7 @@ public class MallUserRoleServiceImpl implements MallUserRoleService { Long roleId = userRole.getRoleId(); MallRolePermission p = new MallRolePermission(); p.setRoleId(roleId); - p.setTenantId(userInfo.getTenantId()); + p.updateTenantInfo(userInfo); List rolePermissionList = mallRolePermissionMapper.findList(p); String menus = ""; for (MallRolePermission rp : rolePermissionList) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index 84be19f04..7fe1859d2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -79,7 +79,7 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { WxActivity wxActivity = wxActivityMapper.selectById(wxActivityJoin.getActivityId()); Integer personLimit = wxActivity.getPersonLimit(); WxActivityJoin params = new WxActivityJoin(); - params.setTenantId(wxActivity.getTenantId()); + params.updateTenantInfo(wxActivity); params.setActivityId(wxActivity.getId()); params.setStatus(EnumActivityJoinStatus.CONFIRMED.getCode()); int count = wxActivityJoinMapper.selectCount(new QueryWrapper(params)); @@ -183,7 +183,7 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { Integer credit = wxActivity.getCredit(); //积分历史 WxCreditHistory wxCreditHistory = new WxCreditHistory(); - wxCreditHistory.setTenantId(wxActivity.getTenantId()); + wxCreditHistory.updateTenantInfo(wxActivity); wxCreditHistory.setCUserId(wxActivityJoin.getUserId()); wxCreditHistory.setCreditNum(credit); wxCreditHistory.setCreditType(EnumScoreType.ACTIVITY_JOIN.getCode()); @@ -241,7 +241,7 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); wxMsgRecord.setModelType(EnumMsgModel.TIME_LIMIT_CAMPAIGN_JOIN_SUCCESS.getCode()); wxMsgRecord.setReceiver(phone); - wxMsgRecord.setTenantId(join.getTenantId()); + wxMsgRecord.updateTenantInfo(join); wxMsgRecord.setDynamicContentMap(msgReplaceMap); mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); logger.info("》》》》》》》》》》》"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java index d19659e9a..adee61af0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java @@ -183,7 +183,7 @@ public class WxActivityServiceImpl implements WxActivityService { campaign = new WxCampaign(); } campaign.setCoverImg(wxActivity.getCoverImg()); - campaign.setTenantId(wxActivity.getTenantId()); + campaign.updateTenantInfo(wxActivity); campaign.setTitle(wxActivity.getTitle()); campaign.setSubTitle(wxActivity.getSubTitle()); campaign.setDetail(wxActivity.getDetail()); @@ -205,7 +205,7 @@ public class WxActivityServiceImpl implements WxActivityService { WxActivityJoin activityJoin = new WxActivityJoin(); activityJoin.setUserId(userId); activityJoin.setActivityId(id); - activityJoin.setTenantId(wxActivity.getTenantId()); + activityJoin.updateTenantInfo(wxActivity); //查询是否已参加报名 //下线 就是 结束 if (wxActivity.getStatus().equals(EnumActivityStatus.STATUS_TAKE_OFFF.getCode())) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAdminLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAdminLogServiceImpl.java index 42d9edc36..f40ae2c0c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAdminLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAdminLogServiceImpl.java @@ -53,7 +53,7 @@ public class WxAdminLogServiceImpl implements WxAdminLogService { public void saveLogCount(WxAdminLog record) { // TODO use redis to optimize WxAdminLog reqQ = new WxAdminLog(); - reqQ.setTenantId(record.getTenantId()); + reqQ.updateTenantInfo(record); reqQ.setUrl(record.getUrl()); reqQ.setType(record.getType()); reqQ.setActionDate(record.getActionDate()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java index cfffc0ea3..76d88add5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java @@ -89,7 +89,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { WxAppinfo appinfo = appinfoMapper.findByAppId(record.getAuthorizerAppid()); if(appinfo != null) { record.setId(appinfo.getId()); - record.setTenantId(appinfo.getTenantId()); + record.updateTenantInfo(appinfo.getTenantInfo()); record.setType(appinfo.getType()); } else { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index cb5361ffb..2551717db 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -10,6 +10,7 @@ import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxMerchantDto; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.MailMsg; import com.iformall.domain.vo.*; import com.iformall.enums.*; @@ -320,7 +321,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { settleRecord.setSettleMoney(wxBillSettle.getBalance()); settleRecord.setSettleTime(new Date()); settleRecord.setSettleWay(EnumSettleRecordWay.WEBCAT.getCode()); - settleRecord.setTenantId(wxBillSettle.getTenantId()); + settleRecord.updateTenantInfo(wxBillSettle); BigDecimal money = new BigDecimal(settleRecord.getSettleMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); settleRecord.setDetail(EnumSettleRecordWay.getEnum(settleRecord.getSettleWay()).getMessage() + "收款" + money.toString() + "元"); @@ -416,7 +417,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillAction.setUserId(wxMerchantBUser.getId()); wxBillAction.setUserName(wxMerchantBUser.getName()); wxBillAction.setPhone(wxMerchantBUser.getPhone()); - wxBillAction.setTenantId(wxMerchantBUser.getTenantId()); + wxBillAction.updateTenantInfo(wxMerchantBUser); wxBillAction.setPayDate(date); try { wxBillActionService.save(wxBillAction); @@ -460,7 +461,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillAction.setUserId(wxMerchantBUser.getId()); wxBillAction.setUserName(wxMerchantBUser.getName()); wxBillAction.setPhone(wxMerchantBUser.getPhone()); - wxBillAction.setTenantId(wxMerchantBUser.getTenantId()); + wxBillAction.updateTenantInfo(wxMerchantBUser); wxBillAction.setPayDate(date); try { wxBillActionService.save(wxBillAction); @@ -505,7 +506,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillAction.setUserId(wxMerchantBUser.getId()); wxBillAction.setUserName(wxMerchantBUser.getName()); wxBillAction.setPhone(wxMerchantBUser.getPhone()); - wxBillAction.setTenantId(wxMerchantBUser.getTenantId()); + wxBillAction.updateTenantInfo(wxMerchantBUser); wxBillAction.setPayDate(date); try { wxBillActionService.save(wxBillAction); @@ -550,7 +551,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillAction.setUserId(wxMerchantBUser.getId()); wxBillAction.setUserName(wxMerchantBUser.getName()); wxBillAction.setPhone(wxMerchantBUser.getPhone()); - wxBillAction.setTenantId(wxMerchantBUser.getTenantId()); + wxBillAction.updateTenantInfo(wxMerchantBUser); wxBillAction.setPayDate(date); try { wxBillActionService.save(wxBillAction); @@ -595,7 +596,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillAction.setUserId(wxMerchantBUser.getId()); wxBillAction.setUserName(wxMerchantBUser.getName()); wxBillAction.setPhone(wxMerchantBUser.getPhone()); - wxBillAction.setTenantId(wxMerchantBUser.getTenantId()); + wxBillAction.updateTenantInfo(wxMerchantBUser); wxBillAction.setPayDate(date); try { wxBillActionService.save(wxBillAction); @@ -640,7 +641,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillAction.setUserId(wxMerchantBUser.getId()); wxBillAction.setUserName(wxMerchantBUser.getName()); wxBillAction.setPhone(wxMerchantBUser.getPhone()); - wxBillAction.setTenantId(wxMerchantBUser.getTenantId()); + wxBillAction.updateTenantInfo(wxMerchantBUser); wxBillAction.setPayDate(date); try { wxBillActionService.save(wxBillAction); @@ -685,7 +686,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillAction.setUserId(wxMerchantBUser.getId()); wxBillAction.setUserName(wxMerchantBUser.getName()); wxBillAction.setPhone(wxMerchantBUser.getPhone()); - wxBillAction.setTenantId(wxMerchantBUser.getTenantId()); + wxBillAction.updateTenantInfo(wxMerchantBUser); wxBillAction.setPayDate(date); try { wxBillActionService.save(wxBillAction); @@ -705,11 +706,11 @@ public class WxBillAllServiceImpl implements WxBillAllService { //wxBillOtherDepositService.updateBillStatus(wxBillOtherDeposit); //更新其他账单 WxBillOther wxBillOther = new WxBillOther(); - wxBillOther.setTenantId(record.getTenantId()); + wxBillOther.updateTenantInfo(record); wxBillOtherService.updateBillStatus(wxBillOther); //更新日常账单状态 WxBillDaily wxBillDaily = new WxBillDaily(); - wxBillDaily.setTenantId(record.getTenantId()); + wxBillDaily.updateTenantInfo(record); wxBillDailyService.updateBillStatus(wxBillDaily); //更新租赁押金账单状态 //WxBillDeposit wxBillDeposit = new WxBillDeposit(); @@ -721,11 +722,11 @@ public class WxBillAllServiceImpl implements WxBillAllService { //wxBillPropertyDepositService.updateBillStatus(wxBillPropertyDeposit); //更新物业账单状态 WxBillProperty wxBillProperty = new WxBillProperty(); - wxBillProperty.setTenantId(record.getTenantId()); + wxBillProperty.updateTenantInfo(record); wxBillPropertyService.updateBillStatus(wxBillProperty); //更新租赁账单状态 WxBillRent wxBillRent = new WxBillRent(); - wxBillRent.setTenantId(record.getTenantId()); + wxBillRent.updateTenantInfo(record); wxBillRentService.updateBillStatus(wxBillRent); logger.info("更新各账单状态结束"); } @@ -740,7 +741,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { //付款方式 WxPayAccountBill wxPayAccountBill = new WxPayAccountBill(); - wxPayAccountBill.setTenantId(wxBillAll.getTenantId()); + wxPayAccountBill.updateTenantInfo(wxBillAll); WxPayAccountBill payAccountBill = wxPayAccountBillMapper.selectOne(new QueryWrapper(wxPayAccountBill)); if (payAccountBill != null) { String bankCardId = payAccountBill.getBankCardId(); @@ -1638,6 +1639,10 @@ public class WxBillAllServiceImpl implements WxBillAllService { String manager = (String) mapList.get(0).get("manager"); String managerPhone = (String) mapList.get(0).get("managerPhone"); + TenantEntity tenantEntity = new TenantEntity() {{ + setTenantId(tenantId); + }}; + String billListStr = ""; BigDecimal sumNeedPay = new BigDecimal(0); for (Map bill : mapList) { @@ -1666,7 +1671,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { mailMsg.setModelType(EnumMailMsgModel.MAIL_BILL_WAIT_PAY.getCode()); mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); mailMsg.setTo(new String[]{email}); - mailMsg.setTenantId(tenantId); + mailMsg.updateTenantInfo(tenantEntity); mailMsg.setDynamicContentMap(map); mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); } @@ -1693,6 +1698,10 @@ public class WxBillAllServiceImpl implements WxBillAllService { String managerPhone = (String) mapList.get(0).get("managerPhone"); Long expiredDay = (Long) mapList.get(0).get("expiredDay"); + TenantEntity tenantEntity = new TenantEntity() {{ + setTenantId(tenantId); + }}; + String billListStr = ""; BigDecimal sumNeedPay = new BigDecimal(0); for (Map bill : mapList) { @@ -1723,7 +1732,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); mailMsg.setModelType(EnumMailMsgModel.MAIL_BILL_OWE.getCode()); mailMsg.setTo(new String[]{email}); - mailMsg.setTenantId(tenantId); + mailMsg.updateTenantInfo(tenantEntity); mailMsg.setDynamicContentMap(map); mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index a5ac92cc3..3479caa62 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -161,7 +161,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { logger.info("新增日常账单"); WxBillDaily dailyQuery = new WxBillDaily(); dailyQuery.setType(record.getType()); - dailyQuery.setTenantId(record.getTenantId()); + dailyQuery.updateTenantInfo(user); dailyQuery.setMerchantId(record.getMerchantId()); dailyQuery.setReceiveDate(record.getReceiveDate()); dailyQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); @@ -239,7 +239,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { wxBillAction.setUserId(user.getId()); wxBillAction.setUserName(user.getName()); wxBillAction.setPhone(user.getPhone()); - wxBillAction.setTenantId(wxBillDaily.getTenantId()); + wxBillAction.updateTenantInfo(user); wxBillAction.setPayDate(wxBillDaily.getPayDate()); try { wxBillActionService.save(wxBillAction); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java index 3fafbb938..1e378b98c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -185,7 +185,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { wxBillAction.setUserId(user.getId()); wxBillAction.setUserName(user.getName()); wxBillAction.setPhone(user.getPhone()); - wxBillAction.setTenantId(wxBillDeposit.getTenantId()); + wxBillAction.updateTenantInfo(user); wxBillAction.setPayDate(wxBillDeposit.getPayDate()); try { wxBillActionService.save(wxBillAction); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java index 0a1f151d2..15ddcff3f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -156,7 +156,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService logger.info("新增其他账单"); WxBillOtherDeposit otherDepositQuery = new WxBillOtherDeposit(); - otherDepositQuery.setTenantId(record.getTenantId()); + otherDepositQuery.updateTenantInfo(user); otherDepositQuery.setMerchantId(record.getMerchantId()); otherDepositQuery.setReceiveDate(record.getReceiveDate()); otherDepositQuery.setComments(record.getComments()); @@ -301,7 +301,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService wxBillAction.setUserId(user.getId()); wxBillAction.setUserName(user.getName()); wxBillAction.setPhone(user.getPhone()); - wxBillAction.setTenantId(wxBillDeposit.getTenantId()); + wxBillAction.updateTenantInfo(user); try { wxBillActionService.save(wxBillAction); } catch (Exception e) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index c3c5fe986..7451b3c6f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -307,7 +307,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxCoupon.setApprovalType(operateType); wxCouponMapper.updateById(wxCoupon); //清除缓存 - clearCache(wxCoupon.getTenantId()); + clearCache(wxCoupon); }else if(EnumFlowKey.SETTLE.getCode().equals(flowType)){ WxBillSettle wxBillSettle = new WxBillSettle(); wxBillSettle.setId(businessId); @@ -335,11 +335,11 @@ public class WxFlowServiceImpl implements WxFlowService { /** * 清除c端首页券列表缓存 - * @param tenantId + * @param tenantEntity */ - public void clearCache(String tenantId){ + public void clearCache(TenantEntity tenantEntity){ for (int i = 1; i <=5 ; i++) { - String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage()+tenantId+"_" + i + ":"; + String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage()+tenantEntity.getTenantId()+"_" + i + ":"; cdRedisTemplate.delete(key); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java index 6bb22efbf..99f448a5a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -252,7 +252,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { //修改basic表积分 WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo(); wxCUserBasicInfo.setId(wxCUser.getId()); - wxCUserBasicInfo.setTenantId(wxCUser.getTenantId()); + wxCUserBasicInfo.updateTenantInfo(wxCUser); wxCUserBasicInfo.setPhone(wxCUser.getPhone()); wxCUserBasicInfo.setPoins(newScore); wxCUserBasicInfoMapper.updateScore(wxCUserBasicInfo);