| @@ -3,6 +3,7 @@ package com.iformall.schedule; | |||||
| import com.iformall.domain.po.WxMall; | import com.iformall.domain.po.WxMall; | ||||
| import com.iformall.domain.po.WxPropertyContract; | import com.iformall.domain.po.WxPropertyContract; | ||||
| import com.iformall.domain.po.WxRentContract; | import com.iformall.domain.po.WxRentContract; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import com.iformall.mapper.WxMallMapper; | import com.iformall.mapper.WxMallMapper; | ||||
| import com.iformall.service.WxPropertyContractService; | import com.iformall.service.WxPropertyContractService; | ||||
| import com.iformall.service.WxRentContractService; | import com.iformall.service.WxRentContractService; | ||||
| @@ -41,15 +42,15 @@ public class ContractSchedule { | |||||
| List<WxMall> wxMalls = wxMallMapper.findList(null); | List<WxMall> wxMalls = wxMallMapper.findList(null); | ||||
| for (WxMall wxMall : wxMalls) { | for (WxMall wxMall : wxMalls) { | ||||
| String tenantId = wxMall.getTenantId(); | |||||
| TenantEntity tenantEntity = wxMall.getTenantInfo(); | |||||
| WxRentContract wxRentContract = new WxRentContract(); | WxRentContract wxRentContract = new WxRentContract(); | ||||
| wxRentContract.setTenantId(tenantId); | |||||
| wxRentContract.updateTenantInfo(tenantEntity); | |||||
| logger.info("租赁合同状态更新开始"); | logger.info("租赁合同状态更新开始"); | ||||
| wxRentContractService.updateStatus(wxRentContract); | wxRentContractService.updateStatus(wxRentContract); | ||||
| logger.info("租赁合同状态更新结束"); | logger.info("租赁合同状态更新结束"); | ||||
| WxPropertyContract wxPropertyContract = new WxPropertyContract(); | WxPropertyContract wxPropertyContract = new WxPropertyContract(); | ||||
| wxPropertyContract.setTenantId(tenantId); | |||||
| wxPropertyContract.updateTenantInfo(tenantEntity); | |||||
| logger.info("物业合同状态更新开始"); | logger.info("物业合同状态更新开始"); | ||||
| wxPropertyContractService.updateStatus(wxPropertyContract); | wxPropertyContractService.updateStatus(wxPropertyContract); | ||||
| logger.info("物业合同状态更新结束"); | logger.info("物业合同状态更新结束"); | ||||
| @@ -84,7 +84,7 @@ public class CouponExpiringSchedule { | |||||
| List<WxGame> list = wxGameMapper.findList(wxGame); | List<WxGame> list = wxGameMapper.findList(wxGame); | ||||
| list.stream().forEach(g->{ | list.stream().forEach(g->{ | ||||
| WxCouponChannel couponChannel = new WxCouponChannel(); | WxCouponChannel couponChannel = new WxCouponChannel(); | ||||
| couponChannel.setTenantId(g.getTenantId()); | |||||
| couponChannel.updateTenantInfo(g); | |||||
| couponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_GAME.getCode()); | couponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_GAME.getCode()); | ||||
| couponChannel.setSubTargetId(g.getId()); | couponChannel.setSubTargetId(g.getId()); | ||||
| couponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); | couponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); | ||||
| @@ -115,7 +115,7 @@ public class CouponOrderExpiringSchedule { | |||||
| if(!co.getCouponType().equals(EnumCouponType.CARD_MULTIMCH.getCode()) | if(!co.getCouponType().equals(EnumCouponType.CARD_MULTIMCH.getCode()) | ||||
| && !co.getAutoRefund().equals(EnumCouponAutoRefund.UNSUPPORTED.getCode())) { | && !co.getAutoRefund().equals(EnumCouponAutoRefund.UNSUPPORTED.getCode())) { | ||||
| WxAppinfo appinfo = new WxAppinfo(); | WxAppinfo appinfo = new WxAppinfo(); | ||||
| appinfo.setTenantId(co.getTenantId()); | |||||
| appinfo.updateTenantInfo(co); | |||||
| appinfo.setType(EnumAppType.B.getCode()); | appinfo.setType(EnumAppType.B.getCode()); | ||||
| appinfo = wxAppinfoMapper.findList(appinfo).get(0); | appinfo = wxAppinfoMapper.findList(appinfo).get(0); | ||||
| @@ -131,7 +131,7 @@ public class CouponOrderExpiringSchedule { | |||||
| // 不设退款,只能走微信分账-分账完结,把钱给分给商场 | // 不设退款,只能走微信分账-分账完结,把钱给分给商场 | ||||
| try { | try { | ||||
| WxPayOrder wxPayOrder = new WxPayOrder(); | WxPayOrder wxPayOrder = new WxPayOrder(); | ||||
| wxPayOrder.setTenantId(co.getTenantId()); | |||||
| wxPayOrder.updateTenantInfo(co); | |||||
| wxPayOrder.setOrderId(co.getOrderId()); | wxPayOrder.setOrderId(co.getOrderId()); | ||||
| wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); | wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); | ||||
| wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder)); | wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder)); | ||||
| @@ -144,7 +144,7 @@ public class CouponOrderExpiringSchedule { | |||||
| wxSharingOrderDto.setOrderId(wxPayOrder.getId()); | wxSharingOrderDto.setOrderId(wxPayOrder.getId()); | ||||
| wxSharingOrderDto.setPayTimeStart(wxPayOrder.getPayTimeStart()); | wxSharingOrderDto.setPayTimeStart(wxPayOrder.getPayTimeStart()); | ||||
| wxSharingOrderDto.setPayTimeEnd(wxPayOrder.getPayTimeEnd()); | wxSharingOrderDto.setPayTimeEnd(wxPayOrder.getPayTimeEnd()); | ||||
| wxSharingOrderDto.setTenantId(wxPayOrder.getTenantId()); | |||||
| wxSharingOrderDto.updateTenantInfo(wxPayOrder); | |||||
| wxSharingOrderDto.setTransactionId(wxPayOrder.getTransactionId()); | wxSharingOrderDto.setTransactionId(wxPayOrder.getTransactionId()); | ||||
| if (wxPayOrder.getRateAmount() != null) { | if (wxPayOrder.getRateAmount() != null) { | ||||
| // 实际分账金额为 分账金额 + 通道费差 | // 实际分账金额为 分账金额 + 通道费差 | ||||
| @@ -101,8 +101,9 @@ public class CouponSendSchedule { | |||||
| logger.info("定时发券: {}发券状态关闭, 任务跳过不执行", mall.getName()); | logger.info("定时发券: {}发券状态关闭, 任务跳过不执行", mall.getName()); | ||||
| return; | return; | ||||
| } | } | ||||
| TenantEntity tenantEntity = mall.getTenantInfo(); | |||||
| WxLevelConfig wxLevelConfig = new WxLevelConfig(); | WxLevelConfig wxLevelConfig = new WxLevelConfig(); | ||||
| wxLevelConfig.setTenantId(mall.getTenantId()); | |||||
| wxLevelConfig.updateTenantInfo(tenantEntity); | |||||
| List<WxLevelConfig> levelConfigList = WxLevelConfigMapper.findList(wxLevelConfig); | List<WxLevelConfig> levelConfigList = WxLevelConfigMapper.findList(wxLevelConfig); | ||||
| levelConfigList = levelConfigList.stream() | levelConfigList = levelConfigList.stream() | ||||
| .sorted(Comparator.comparing(WxLevelConfig::getPoints)) | .sorted(Comparator.comparing(WxLevelConfig::getPoints)) | ||||
| @@ -128,7 +129,7 @@ public class CouponSendSchedule { | |||||
| if (sendCount > 0) { | if (sendCount > 0) { | ||||
| WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); | WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); | ||||
| wxCUserBasicInfoDto.setTenantId(l.getTenantId()); | |||||
| wxCUserBasicInfoDto.updateTenantInfo(tenantEntity); | |||||
| wxCUserBasicInfoDto.setLevelStartScore(levelStartScore); | wxCUserBasicInfoDto.setLevelStartScore(levelStartScore); | ||||
| wxCUserBasicInfoDto.setLevelEndScore(levelEndScore); | wxCUserBasicInfoDto.setLevelEndScore(levelEndScore); | ||||
| List<WxCUserBasicInfo> wxCUserBasicInfoList = wxCUserBasicInfoMapper.findListByScore(wxCUserBasicInfoDto); | List<WxCUserBasicInfo> wxCUserBasicInfoList = wxCUserBasicInfoMapper.findListByScore(wxCUserBasicInfoDto); | ||||
| @@ -139,7 +140,7 @@ public class CouponSendSchedule { | |||||
| wxCUserBasicInfoList.stream().forEach(cu -> { | wxCUserBasicInfoList.stream().forEach(cu -> { | ||||
| WxCouponSend wxCouponSend = new WxCouponSend(); | WxCouponSend wxCouponSend = new WxCouponSend(); | ||||
| wxCouponSend.setTenantId(l.getTenantId()); | |||||
| wxCouponSend.updateTenantInfo(tenantEntity); | |||||
| wxCouponSend.setSendType(EnumCouponSendSendType.TIMED.getCode()); | wxCouponSend.setSendType(EnumCouponSendSendType.TIMED.getCode()); | ||||
| wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode()); | wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode()); | ||||
| List<WxCouponSendVo> couponSendList = wxCouponSendMapper.findListVo(wxCouponSend); | List<WxCouponSendVo> couponSendList = wxCouponSendMapper.findListVo(wxCouponSend); | ||||
| @@ -241,9 +242,10 @@ public class CouponSendSchedule { | |||||
| logger.info("生日发券: {} 发券状态关闭, 任务跳过不执行", mall.getName()); | logger.info("生日发券: {} 发券状态关闭, 任务跳过不执行", mall.getName()); | ||||
| return; | return; | ||||
| } | } | ||||
| TenantEntity tenantEntity = mall.getTenantInfo(); | |||||
| //查找生日券 | //查找生日券 | ||||
| WxCouponSend wxCouponSend = new WxCouponSend(); | WxCouponSend wxCouponSend = new WxCouponSend(); | ||||
| wxCouponSend.setTenantId(mall.getTenantId()); | |||||
| wxCouponSend.updateTenantInfo(tenantEntity); | |||||
| wxCouponSend.setSendType(EnumCouponSendSendType.BIRTHDAY.getCode()); | wxCouponSend.setSendType(EnumCouponSendSendType.BIRTHDAY.getCode()); | ||||
| wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode()); | wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode()); | ||||
| List<WxCouponSendVo> couponSendList = wxCouponSendMapper.findListVo(wxCouponSend); | List<WxCouponSendVo> couponSendList = wxCouponSendMapper.findListVo(wxCouponSend); | ||||
| @@ -373,7 +375,7 @@ public class CouponSendSchedule { | |||||
| WxMsgRecord wxMsgRecord = new WxMsgRecord(); | WxMsgRecord wxMsgRecord = new WxMsgRecord(); | ||||
| wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); | wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); | ||||
| wxMsgRecord.setReceiver(cUserBasicInfo.getPhone()); | wxMsgRecord.setReceiver(cUserBasicInfo.getPhone()); | ||||
| wxMsgRecord.setTenantId(cUserBasicInfo.getTenantId()); | |||||
| wxMsgRecord.updateTenantInfo(mall.getTenantInfo()); | |||||
| Map<String, String> dynamicContentMap = new HashMap<>(); | Map<String, String> dynamicContentMap = new HashMap<>(); | ||||
| if (birthdayScale > WxScoreRules.DEFAULT_SCALE) { | if (birthdayScale > WxScoreRules.DEFAULT_SCALE) { | ||||
| @@ -58,7 +58,7 @@ public class DaliyAmountSchedule { | |||||
| WxDateAmountRecord dateAmountRecord = new WxDateAmountRecord(); | WxDateAmountRecord dateAmountRecord = new WxDateAmountRecord(); | ||||
| dateAmountRecord.setPayPrice(total_price); | dateAmountRecord.setPayPrice(total_price); | ||||
| dateAmountRecord.setMerchantId(merchant.getId()); | dateAmountRecord.setMerchantId(merchant.getId()); | ||||
| dateAmountRecord.setTenantId(merchant.getTenantId()); | |||||
| dateAmountRecord.updateTenantInfo(merchant); | |||||
| dateAmountRecord.setType(EnumDateAmtType.PAY_RECORD.getCode()); | dateAmountRecord.setType(EnumDateAmtType.PAY_RECORD.getCode()); | ||||
| dateAmountRecord.setDate(startDate); | dateAmountRecord.setDate(startDate); | ||||
| dateAmountRecord.setDayOfWeek(cal.get(Calendar.DAY_OF_WEEK)); | dateAmountRecord.setDayOfWeek(cal.get(Calendar.DAY_OF_WEEK)); | ||||
| @@ -106,7 +106,7 @@ public class DaliyAmountSchedule { | |||||
| mallList.stream().forEach(mall->{ | mallList.stream().forEach(mall->{ | ||||
| WxMerchant merchantQ = new WxMerchant(); | WxMerchant merchantQ = new WxMerchant(); | ||||
| merchantQ.setTenantId(mall.getTenantId()); | |||||
| merchantQ.updateTenantInfo(mall.getTenantInfo()); | |||||
| merchantQ.setStatus(EnumMerchantStatus.VALID.getCode()); | merchantQ.setStatus(EnumMerchantStatus.VALID.getCode()); | ||||
| List<WxMerchant> merchantList = wxMerchantMapper.findList(merchantQ); | List<WxMerchant> merchantList = wxMerchantMapper.findList(merchantQ); | ||||
| @@ -235,7 +235,7 @@ public class InvestSchedule { | |||||
| WxMsgRecord wxMsgRecord = new WxMsgRecord(); | WxMsgRecord wxMsgRecord = new WxMsgRecord(); | ||||
| wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); | wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); | ||||
| wxMsgRecord.setReceiver(userInfo.getPhone()); | wxMsgRecord.setReceiver(userInfo.getPhone()); | ||||
| wxMsgRecord.setTenantId(mall.getTenantId()); | |||||
| wxMsgRecord.updateTenantInfo(userInfo); | |||||
| Map<String, String> dynamicContentMap = new HashMap<>(); | Map<String, String> dynamicContentMap = new HashMap<>(); | ||||
| wxMsgRecord.setModelType(EnumMsgModel.INVEST_REMIND.getCode()); | wxMsgRecord.setModelType(EnumMsgModel.INVEST_REMIND.getCode()); | ||||
| dynamicContentMap.put("mallName", mall.getName()); | dynamicContentMap.put("mallName", mall.getName()); | ||||
| @@ -1,5 +1,6 @@ | |||||
| package com.iformall.schedule; | package com.iformall.schedule; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import com.iformall.domain.po.msg.*; | import com.iformall.domain.po.msg.*; | ||||
| import com.iformall.enums.*; | import com.iformall.enums.*; | ||||
| import com.iformall.mq.MqBaseProducer; | import com.iformall.mq.MqBaseProducer; | ||||
| @@ -34,37 +35,38 @@ public class MsgReSendSchedule { | |||||
| List<WxMsgRecord> recordList = wxMsgRecordService.findList(msgRecord); | List<WxMsgRecord> recordList = wxMsgRecordService.findList(msgRecord); | ||||
| for (WxMsgRecord wxMsgRecord:recordList) { | for (WxMsgRecord wxMsgRecord:recordList) { | ||||
| logger.info("消息重发:{}",wxMsgRecord.getMsgJson()); | logger.info("消息重发:{}",wxMsgRecord.getMsgJson()); | ||||
| TenantEntity tenantEntity = wxMsgRecord.getTenantInfo(); | |||||
| try { | try { | ||||
| if(EnumMsgRecordType.INSIDE_ORDER_SUCCESS.getCode().equals(wxMsgRecord.getMsgType())){ | if(EnumMsgRecordType.INSIDE_ORDER_SUCCESS.getCode().equals(wxMsgRecord.getMsgType())){ | ||||
| //内部消息 - 下订单成功 | //内部消息 - 下订单成功 | ||||
| FmInsideOrderSuccessMsg msg = (FmInsideOrderSuccessMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideOrderSuccessMsg.class); | FmInsideOrderSuccessMsg msg = (FmInsideOrderSuccessMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideOrderSuccessMsg.class); | ||||
| msg.setMsgType(wxMsgRecord.getMsgType()); | msg.setMsgType(wxMsgRecord.getMsgType()); | ||||
| msg.setReceiver(wxMsgRecord.getReceiver()); | msg.setReceiver(wxMsgRecord.getReceiver()); | ||||
| msg.setTenantId(wxMsgRecord.getTenantId()); | |||||
| msg.updateTenantInfo(tenantEntity); | |||||
| mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | ||||
| }else if(EnumMsgRecordType.INSIDE_COUPON_VERIFY.getCode().equals(wxMsgRecord.getMsgType())){ | }else if(EnumMsgRecordType.INSIDE_COUPON_VERIFY.getCode().equals(wxMsgRecord.getMsgType())){ | ||||
| FmInsideCouponVerifyMsg msg = (FmInsideCouponVerifyMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideCouponVerifyMsg.class); | FmInsideCouponVerifyMsg msg = (FmInsideCouponVerifyMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideCouponVerifyMsg.class); | ||||
| msg.setMsgType(wxMsgRecord.getMsgType()); | msg.setMsgType(wxMsgRecord.getMsgType()); | ||||
| msg.setReceiver(wxMsgRecord.getReceiver()); | msg.setReceiver(wxMsgRecord.getReceiver()); | ||||
| msg.setTenantId(wxMsgRecord.getTenantId()); | |||||
| msg.updateTenantInfo(tenantEntity); | |||||
| mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | ||||
| }else if(EnumMsgRecordType.INSIDE_C_LOGIN.getCode().equals(wxMsgRecord.getMsgType())){ | }else if(EnumMsgRecordType.INSIDE_C_LOGIN.getCode().equals(wxMsgRecord.getMsgType())){ | ||||
| FmInsideCLoginMsg msg = (FmInsideCLoginMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideCLoginMsg.class); | FmInsideCLoginMsg msg = (FmInsideCLoginMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideCLoginMsg.class); | ||||
| msg.setMsgType(wxMsgRecord.getMsgType()); | msg.setMsgType(wxMsgRecord.getMsgType()); | ||||
| msg.setReceiver(wxMsgRecord.getReceiver()); | msg.setReceiver(wxMsgRecord.getReceiver()); | ||||
| msg.setTenantId(wxMsgRecord.getTenantId()); | |||||
| msg.updateTenantInfo(tenantEntity); | |||||
| mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | ||||
| }else if(EnumMsgRecordType.INSIDE_NOTIFY_PAY_SUCCESS.getCode().equals(wxMsgRecord.getMsgType())){ | }else if(EnumMsgRecordType.INSIDE_NOTIFY_PAY_SUCCESS.getCode().equals(wxMsgRecord.getMsgType())){ | ||||
| FmInsideNotifyPaySuccessMsg msg = (FmInsideNotifyPaySuccessMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideNotifyPaySuccessMsg.class); | FmInsideNotifyPaySuccessMsg msg = (FmInsideNotifyPaySuccessMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideNotifyPaySuccessMsg.class); | ||||
| msg.setMsgType(wxMsgRecord.getMsgType()); | msg.setMsgType(wxMsgRecord.getMsgType()); | ||||
| msg.setReceiver(wxMsgRecord.getReceiver()); | msg.setReceiver(wxMsgRecord.getReceiver()); | ||||
| msg.setTenantId(wxMsgRecord.getTenantId()); | |||||
| msg.updateTenantInfo(tenantEntity); | |||||
| mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | ||||
| }else if(EnumMsgRecordType.INSIDE_NOTIFY_REFUND_SUCCESS.getCode().equals(wxMsgRecord.getMsgType())){ | }else if(EnumMsgRecordType.INSIDE_NOTIFY_REFUND_SUCCESS.getCode().equals(wxMsgRecord.getMsgType())){ | ||||
| FmInsideNotifyRefundSuccessMsg msg = (FmInsideNotifyRefundSuccessMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideNotifyRefundSuccessMsg.class); | FmInsideNotifyRefundSuccessMsg msg = (FmInsideNotifyRefundSuccessMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideNotifyRefundSuccessMsg.class); | ||||
| msg.setMsgType(wxMsgRecord.getMsgType()); | msg.setMsgType(wxMsgRecord.getMsgType()); | ||||
| msg.setReceiver(wxMsgRecord.getReceiver()); | msg.setReceiver(wxMsgRecord.getReceiver()); | ||||
| msg.setTenantId(wxMsgRecord.getTenantId()); | |||||
| msg.updateTenantInfo(tenantEntity); | |||||
| mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | ||||
| } | } | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| @@ -167,7 +167,7 @@ public class OrderExpiringSchedule { | |||||
| Date curDate = new Date(); | Date curDate = new Date(); | ||||
| WxOrder updateOrder = new WxOrder(); | WxOrder updateOrder = new WxOrder(); | ||||
| updateOrder.setId(order.getId()); | updateOrder.setId(order.getId()); | ||||
| updateOrder.setTenantId(order.getTenantId()); | |||||
| updateOrder.updateTenantInfo(order); | |||||
| updateOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PRESS_OVERTIME.getCode()); | updateOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PRESS_OVERTIME.getCode()); | ||||
| updateOrder.setUpdateDate(curDate); | updateOrder.setUpdateDate(curDate); | ||||
| wxOrderMapper.updateById(updateOrder); | wxOrderMapper.updateById(updateOrder); | ||||
| @@ -187,7 +187,7 @@ public class OrderExpiringSchedule { | |||||
| Date curDate = new Date(); | Date curDate = new Date(); | ||||
| WxOrder updateOrder = new WxOrder(); | WxOrder updateOrder = new WxOrder(); | ||||
| updateOrder.setId(order.getId()); | updateOrder.setId(order.getId()); | ||||
| updateOrder.setTenantId(order.getTenantId()); | |||||
| updateOrder.updateTenantInfo(order); | |||||
| updateOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_BREAK.getCode()); | updateOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_BREAK.getCode()); | ||||
| updateOrder.setUpdateDate(curDate); | updateOrder.setUpdateDate(curDate); | ||||
| wxOrderMapper.updateById(updateOrder); | wxOrderMapper.updateById(updateOrder); | ||||
| @@ -204,7 +204,7 @@ public class OrderExpiringSchedule { | |||||
| //获取APP信息 | //获取APP信息 | ||||
| WxAppinfo appinfo = new WxAppinfo(); | WxAppinfo appinfo = new WxAppinfo(); | ||||
| appinfo.setTenantId(order.getTenantId()); | |||||
| appinfo.updateTenantInfo(order); | |||||
| appinfo.setType(EnumAppType.C.getCode()); | appinfo.setType(EnumAppType.C.getCode()); | ||||
| appinfo = wxAppinfoMapper.findList(appinfo).get(0); | appinfo = wxAppinfoMapper.findList(appinfo).get(0); | ||||
| //退款流程 | //退款流程 | ||||
| @@ -80,7 +80,7 @@ public class PowerBillAutoBuildSchedule { | |||||
| private void merchantPowerBillConfigStart(WxPowerBillAutoConfig wxPowerBillAutoConfig) { | private void merchantPowerBillConfigStart(WxPowerBillAutoConfig wxPowerBillAutoConfig) { | ||||
| WxMerchantPowerBillConfig wxMerchantPowerBillConfig = new WxMerchantPowerBillConfig(); | WxMerchantPowerBillConfig wxMerchantPowerBillConfig = new WxMerchantPowerBillConfig(); | ||||
| wxMerchantPowerBillConfig.setTenantId(wxPowerBillAutoConfig.getTenantId()); | |||||
| wxMerchantPowerBillConfig.updateTenantInfo(wxPowerBillAutoConfig); | |||||
| List<WxMerchantPowerBillConfig> wxMerchantPowerBillConfigs = wxMerchantPowerBillConfigMapper.selectList(new QueryWrapper(wxMerchantPowerBillConfig)); | List<WxMerchantPowerBillConfig> wxMerchantPowerBillConfigs = wxMerchantPowerBillConfigMapper.selectList(new QueryWrapper(wxMerchantPowerBillConfig)); | ||||
| for (int i = 0; i < wxMerchantPowerBillConfigs.size(); i++) { | for (int i = 0; i < wxMerchantPowerBillConfigs.size(); i++) { | ||||
| buildPowerBill(wxMerchantPowerBillConfigs.get(i), wxPowerBillAutoConfig); | buildPowerBill(wxMerchantPowerBillConfigs.get(i), wxPowerBillAutoConfig); | ||||
| @@ -150,7 +150,7 @@ public class PowerBillAutoBuildSchedule { | |||||
| for (int i = 0; i < size; i++) { | for (int i = 0; i < size; i++) { | ||||
| KwMerchantMeter merchantMeter = merchantMeterList.get(i); | KwMerchantMeter merchantMeter = merchantMeterList.get(i); | ||||
| KwMeterDataDto kwMeterDataDto = new KwMeterDataDto(); | KwMeterDataDto kwMeterDataDto = new KwMeterDataDto(); | ||||
| kwMeterDataDto.setTenantId(merchantMeter.getTenantId()); | |||||
| kwMeterDataDto.updateTenantInfo(merchantMeter); | |||||
| kwMeterDataDto.setMeterId(merchantMeter.getMeterId()); | kwMeterDataDto.setMeterId(merchantMeter.getMeterId()); | ||||
| kwMeterDataDto.setStartTime(startdate); | kwMeterDataDto.setStartTime(startdate); | ||||
| kwMeterDataDto.setEndTime(lastdate); | kwMeterDataDto.setEndTime(lastdate); | ||||
| @@ -169,7 +169,7 @@ public class PowerBillAutoBuildSchedule { | |||||
| WxBillDaily wxBillDaily = new WxBillDaily(); | WxBillDaily wxBillDaily = new WxBillDaily(); | ||||
| Long merchantId = wxMerchantPowerBillConfig.getMerchantId(); | Long merchantId = wxMerchantPowerBillConfig.getMerchantId(); | ||||
| wxBillDaily.setShopId(getShopId(merchantId)); | wxBillDaily.setShopId(getShopId(merchantId)); | ||||
| wxBillDaily.setTenantId(wxMerchantPowerBillConfig.getTenantId()); | |||||
| wxBillDaily.updateTenantInfo(wxMerchantPowerBillConfig); | |||||
| wxBillDaily.setMerchantId(merchantId); | wxBillDaily.setMerchantId(merchantId); | ||||
| wxBillDaily.setMerchantName(wxMerchantPowerBillConfig.getMerchantName()); | wxBillDaily.setMerchantName(wxMerchantPowerBillConfig.getMerchantName()); | ||||
| wxBillDaily.setType(EnumBillDailyType.POWER.getCode()); | wxBillDaily.setType(EnumBillDailyType.POWER.getCode()); | ||||
| @@ -94,7 +94,7 @@ public class WxAppVisitSchedule { | |||||
| private boolean checkData(String date,WxAppinfo appInfo) { | private boolean checkData(String date,WxAppinfo appInfo) { | ||||
| WxUserVisit wxUserVisit = new WxUserVisit(); | WxUserVisit wxUserVisit = new WxUserVisit(); | ||||
| wxUserVisit.setAppId(appInfo.getAppId()); | wxUserVisit.setAppId(appInfo.getAppId()); | ||||
| wxUserVisit.setTenantId(appInfo.getTenantId()); | |||||
| wxUserVisit.updateTenantInfo(appInfo); | |||||
| wxUserVisit.setRefDate(date); | wxUserVisit.setRefDate(date); | ||||
| PageInfo<WxUserVisit> page = wxUserVisitService.listAsPage(wxUserVisit, 1, 10000); | PageInfo<WxUserVisit> page = wxUserVisitService.listAsPage(wxUserVisit, 1, 10000); | ||||
| if (page.getList().size() > 0) | if (page.getList().size() > 0) | ||||
| @@ -115,7 +115,7 @@ public class WxAppVisitSchedule { | |||||
| for(WxMaVisitTrend maVisitTrend: vtList) { | for(WxMaVisitTrend maVisitTrend: vtList) { | ||||
| WxUserVisit v = new WxUserVisit(); | WxUserVisit v = new WxUserVisit(); | ||||
| v.setAppId(appInfo.getAppId()); | v.setAppId(appInfo.getAppId()); | ||||
| v.setTenantId(appInfo.getTenantId()); | |||||
| v.updateTenantInfo(appInfo); | |||||
| String time = maVisitTrend.getRefDate(); | String time = maVisitTrend.getRefDate(); | ||||
| Date dayDate = new SimpleDateFormat("yyyyMMdd").parse(time); | Date dayDate = new SimpleDateFormat("yyyyMMdd").parse(time); | ||||
| v.setDayDate(dayDate); | v.setDayDate(dayDate); | ||||
| @@ -56,4 +56,10 @@ public class WxMsgRecord extends BaseMsg { | |||||
| public void updateTenantInfo(TenantEntity tenantEntity) { | public void updateTenantInfo(TenantEntity tenantEntity) { | ||||
| setTenantId(tenantEntity.getTenantId()); | setTenantId(tenantEntity.getTenantId()); | ||||
| } | } | ||||
| public TenantEntity getTenantInfo() { | |||||
| return new TenantEntity() {{ | |||||
| setTenantId(tenantId); | |||||
| }}; | |||||
| } | |||||
| } | } | ||||