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