Browse Source

[集团版][修改]:集团版预处理

release_toaliyun_real
Stormeye Wu 6 years ago
parent
commit
2fdf4399e6
11 changed files with 39 additions and 28 deletions
  1. +4
    -3
      mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java
  2. +1
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java
  3. +3
    -3
      mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java
  4. +7
    -5
      mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java
  5. +2
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java
  6. +1
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java
  7. +7
    -5
      mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java
  8. +3
    -3
      mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java
  9. +3
    -3
      mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java
  10. +2
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java
  11. +6
    -0
      mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java

+ 4
- 3
mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java View File

@@ -3,6 +3,7 @@ package com.iformall.schedule;
import com.iformall.domain.po.WxMall;
import com.iformall.domain.po.WxPropertyContract;
import com.iformall.domain.po.WxRentContract;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.mapper.WxMallMapper;
import com.iformall.service.WxPropertyContractService;
import com.iformall.service.WxRentContractService;
@@ -41,15 +42,15 @@ public class ContractSchedule {

List<WxMall> wxMalls = wxMallMapper.findList(null);
for (WxMall wxMall : wxMalls) {
String tenantId = wxMall.getTenantId();
TenantEntity tenantEntity = wxMall.getTenantInfo();
WxRentContract wxRentContract = new WxRentContract();
wxRentContract.setTenantId(tenantId);
wxRentContract.updateTenantInfo(tenantEntity);
logger.info("租赁合同状态更新开始");
wxRentContractService.updateStatus(wxRentContract);
logger.info("租赁合同状态更新结束");

WxPropertyContract wxPropertyContract = new WxPropertyContract();
wxPropertyContract.setTenantId(tenantId);
wxPropertyContract.updateTenantInfo(tenantEntity);
logger.info("物业合同状态更新开始");
wxPropertyContractService.updateStatus(wxPropertyContract);
logger.info("物业合同状态更新结束");


+ 1
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java View File

@@ -84,7 +84,7 @@ public class CouponExpiringSchedule {
List<WxGame> list = wxGameMapper.findList(wxGame);
list.stream().forEach(g->{
WxCouponChannel couponChannel = new WxCouponChannel();
couponChannel.setTenantId(g.getTenantId());
couponChannel.updateTenantInfo(g);
couponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_GAME.getCode());
couponChannel.setSubTargetId(g.getId());
couponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());


+ 3
- 3
mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java View File

@@ -115,7 +115,7 @@ public class CouponOrderExpiringSchedule {
if(!co.getCouponType().equals(EnumCouponType.CARD_MULTIMCH.getCode())
&& !co.getAutoRefund().equals(EnumCouponAutoRefund.UNSUPPORTED.getCode())) {
WxAppinfo appinfo = new WxAppinfo();
appinfo.setTenantId(co.getTenantId());
appinfo.updateTenantInfo(co);
appinfo.setType(EnumAppType.B.getCode());
appinfo = wxAppinfoMapper.findList(appinfo).get(0);

@@ -131,7 +131,7 @@ public class CouponOrderExpiringSchedule {
// 不设退款,只能走微信分账-分账完结,把钱给分给商场
try {
WxPayOrder wxPayOrder = new WxPayOrder();
wxPayOrder.setTenantId(co.getTenantId());
wxPayOrder.updateTenantInfo(co);
wxPayOrder.setOrderId(co.getOrderId());
wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder));
@@ -144,7 +144,7 @@ public class CouponOrderExpiringSchedule {
wxSharingOrderDto.setOrderId(wxPayOrder.getId());
wxSharingOrderDto.setPayTimeStart(wxPayOrder.getPayTimeStart());
wxSharingOrderDto.setPayTimeEnd(wxPayOrder.getPayTimeEnd());
wxSharingOrderDto.setTenantId(wxPayOrder.getTenantId());
wxSharingOrderDto.updateTenantInfo(wxPayOrder);
wxSharingOrderDto.setTransactionId(wxPayOrder.getTransactionId());
if (wxPayOrder.getRateAmount() != null) {
// 实际分账金额为 分账金额 + 通道费差


+ 7
- 5
mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java View File

@@ -101,8 +101,9 @@ public class CouponSendSchedule {
logger.info("定时发券: {}发券状态关闭, 任务跳过不执行", mall.getName());
return;
}
TenantEntity tenantEntity = mall.getTenantInfo();
WxLevelConfig wxLevelConfig = new WxLevelConfig();
wxLevelConfig.setTenantId(mall.getTenantId());
wxLevelConfig.updateTenantInfo(tenantEntity);
List<WxLevelConfig> levelConfigList = WxLevelConfigMapper.findList(wxLevelConfig);
levelConfigList = levelConfigList.stream()
.sorted(Comparator.comparing(WxLevelConfig::getPoints))
@@ -128,7 +129,7 @@ public class CouponSendSchedule {
if (sendCount > 0) {

WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto();
wxCUserBasicInfoDto.setTenantId(l.getTenantId());
wxCUserBasicInfoDto.updateTenantInfo(tenantEntity);
wxCUserBasicInfoDto.setLevelStartScore(levelStartScore);
wxCUserBasicInfoDto.setLevelEndScore(levelEndScore);
List<WxCUserBasicInfo> wxCUserBasicInfoList = wxCUserBasicInfoMapper.findListByScore(wxCUserBasicInfoDto);
@@ -139,7 +140,7 @@ public class CouponSendSchedule {
wxCUserBasicInfoList.stream().forEach(cu -> {

WxCouponSend wxCouponSend = new WxCouponSend();
wxCouponSend.setTenantId(l.getTenantId());
wxCouponSend.updateTenantInfo(tenantEntity);
wxCouponSend.setSendType(EnumCouponSendSendType.TIMED.getCode());
wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode());
List<WxCouponSendVo> couponSendList = wxCouponSendMapper.findListVo(wxCouponSend);
@@ -241,9 +242,10 @@ public class CouponSendSchedule {
logger.info("生日发券: {} 发券状态关闭, 任务跳过不执行", mall.getName());
return;
}
TenantEntity tenantEntity = mall.getTenantInfo();
//查找生日券
WxCouponSend wxCouponSend = new WxCouponSend();
wxCouponSend.setTenantId(mall.getTenantId());
wxCouponSend.updateTenantInfo(tenantEntity);
wxCouponSend.setSendType(EnumCouponSendSendType.BIRTHDAY.getCode());
wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode());
List<WxCouponSendVo> couponSendList = wxCouponSendMapper.findListVo(wxCouponSend);
@@ -373,7 +375,7 @@ public class CouponSendSchedule {
WxMsgRecord wxMsgRecord = new WxMsgRecord();
wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode());
wxMsgRecord.setReceiver(cUserBasicInfo.getPhone());
wxMsgRecord.setTenantId(cUserBasicInfo.getTenantId());
wxMsgRecord.updateTenantInfo(mall.getTenantInfo());
Map<String, String> dynamicContentMap = new HashMap<>();

if (birthdayScale > WxScoreRules.DEFAULT_SCALE) {


+ 2
- 2
mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java View File

@@ -58,7 +58,7 @@ public class DaliyAmountSchedule {
WxDateAmountRecord dateAmountRecord = new WxDateAmountRecord();
dateAmountRecord.setPayPrice(total_price);
dateAmountRecord.setMerchantId(merchant.getId());
dateAmountRecord.setTenantId(merchant.getTenantId());
dateAmountRecord.updateTenantInfo(merchant);
dateAmountRecord.setType(EnumDateAmtType.PAY_RECORD.getCode());
dateAmountRecord.setDate(startDate);
dateAmountRecord.setDayOfWeek(cal.get(Calendar.DAY_OF_WEEK));
@@ -106,7 +106,7 @@ public class DaliyAmountSchedule {

mallList.stream().forEach(mall->{
WxMerchant merchantQ = new WxMerchant();
merchantQ.setTenantId(mall.getTenantId());
merchantQ.updateTenantInfo(mall.getTenantInfo());
merchantQ.setStatus(EnumMerchantStatus.VALID.getCode());
List<WxMerchant> merchantList = wxMerchantMapper.findList(merchantQ);



+ 1
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java View File

@@ -235,7 +235,7 @@ public class InvestSchedule {
WxMsgRecord wxMsgRecord = new WxMsgRecord();
wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode());
wxMsgRecord.setReceiver(userInfo.getPhone());
wxMsgRecord.setTenantId(mall.getTenantId());
wxMsgRecord.updateTenantInfo(userInfo);
Map<String, String> dynamicContentMap = new HashMap<>();
wxMsgRecord.setModelType(EnumMsgModel.INVEST_REMIND.getCode());
dynamicContentMap.put("mallName", mall.getName());


+ 7
- 5
mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java View File

@@ -1,5 +1,6 @@
package com.iformall.schedule;

import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.po.msg.*;
import com.iformall.enums.*;
import com.iformall.mq.MqBaseProducer;
@@ -34,37 +35,38 @@ public class MsgReSendSchedule {
List<WxMsgRecord> recordList = wxMsgRecordService.findList(msgRecord);
for (WxMsgRecord wxMsgRecord:recordList) {
logger.info("消息重发:{}",wxMsgRecord.getMsgJson());
TenantEntity tenantEntity = wxMsgRecord.getTenantInfo();
try {
if(EnumMsgRecordType.INSIDE_ORDER_SUCCESS.getCode().equals(wxMsgRecord.getMsgType())){
//内部消息 - 下订单成功
FmInsideOrderSuccessMsg msg = (FmInsideOrderSuccessMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideOrderSuccessMsg.class);
msg.setMsgType(wxMsgRecord.getMsgType());
msg.setReceiver(wxMsgRecord.getReceiver());
msg.setTenantId(wxMsgRecord.getTenantId());
msg.updateTenantInfo(tenantEntity);
mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode());
}else if(EnumMsgRecordType.INSIDE_COUPON_VERIFY.getCode().equals(wxMsgRecord.getMsgType())){
FmInsideCouponVerifyMsg msg = (FmInsideCouponVerifyMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideCouponVerifyMsg.class);
msg.setMsgType(wxMsgRecord.getMsgType());
msg.setReceiver(wxMsgRecord.getReceiver());
msg.setTenantId(wxMsgRecord.getTenantId());
msg.updateTenantInfo(tenantEntity);
mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode());
}else if(EnumMsgRecordType.INSIDE_C_LOGIN.getCode().equals(wxMsgRecord.getMsgType())){
FmInsideCLoginMsg msg = (FmInsideCLoginMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideCLoginMsg.class);
msg.setMsgType(wxMsgRecord.getMsgType());
msg.setReceiver(wxMsgRecord.getReceiver());
msg.setTenantId(wxMsgRecord.getTenantId());
msg.updateTenantInfo(tenantEntity);
mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode());
}else if(EnumMsgRecordType.INSIDE_NOTIFY_PAY_SUCCESS.getCode().equals(wxMsgRecord.getMsgType())){
FmInsideNotifyPaySuccessMsg msg = (FmInsideNotifyPaySuccessMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideNotifyPaySuccessMsg.class);
msg.setMsgType(wxMsgRecord.getMsgType());
msg.setReceiver(wxMsgRecord.getReceiver());
msg.setTenantId(wxMsgRecord.getTenantId());
msg.updateTenantInfo(tenantEntity);
mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode());
}else if(EnumMsgRecordType.INSIDE_NOTIFY_REFUND_SUCCESS.getCode().equals(wxMsgRecord.getMsgType())){
FmInsideNotifyRefundSuccessMsg msg = (FmInsideNotifyRefundSuccessMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideNotifyRefundSuccessMsg.class);
msg.setMsgType(wxMsgRecord.getMsgType());
msg.setReceiver(wxMsgRecord.getReceiver());
msg.setTenantId(wxMsgRecord.getTenantId());
msg.updateTenantInfo(tenantEntity);
mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode());
}
} catch (Exception e) {


+ 3
- 3
mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java View File

@@ -167,7 +167,7 @@ public class OrderExpiringSchedule {
Date curDate = new Date();
WxOrder updateOrder = new WxOrder();
updateOrder.setId(order.getId());
updateOrder.setTenantId(order.getTenantId());
updateOrder.updateTenantInfo(order);
updateOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PRESS_OVERTIME.getCode());
updateOrder.setUpdateDate(curDate);
wxOrderMapper.updateById(updateOrder);
@@ -187,7 +187,7 @@ public class OrderExpiringSchedule {
Date curDate = new Date();
WxOrder updateOrder = new WxOrder();
updateOrder.setId(order.getId());
updateOrder.setTenantId(order.getTenantId());
updateOrder.updateTenantInfo(order);
updateOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_BREAK.getCode());
updateOrder.setUpdateDate(curDate);
wxOrderMapper.updateById(updateOrder);
@@ -204,7 +204,7 @@ public class OrderExpiringSchedule {

//获取APP信息
WxAppinfo appinfo = new WxAppinfo();
appinfo.setTenantId(order.getTenantId());
appinfo.updateTenantInfo(order);
appinfo.setType(EnumAppType.C.getCode());
appinfo = wxAppinfoMapper.findList(appinfo).get(0);
//退款流程


+ 3
- 3
mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java View File

@@ -80,7 +80,7 @@ public class PowerBillAutoBuildSchedule {

private void merchantPowerBillConfigStart(WxPowerBillAutoConfig wxPowerBillAutoConfig) {
WxMerchantPowerBillConfig wxMerchantPowerBillConfig = new WxMerchantPowerBillConfig();
wxMerchantPowerBillConfig.setTenantId(wxPowerBillAutoConfig.getTenantId());
wxMerchantPowerBillConfig.updateTenantInfo(wxPowerBillAutoConfig);
List<WxMerchantPowerBillConfig> wxMerchantPowerBillConfigs = wxMerchantPowerBillConfigMapper.selectList(new QueryWrapper(wxMerchantPowerBillConfig));
for (int i = 0; i < wxMerchantPowerBillConfigs.size(); i++) {
buildPowerBill(wxMerchantPowerBillConfigs.get(i), wxPowerBillAutoConfig);
@@ -150,7 +150,7 @@ public class PowerBillAutoBuildSchedule {
for (int i = 0; i < size; i++) {
KwMerchantMeter merchantMeter = merchantMeterList.get(i);
KwMeterDataDto kwMeterDataDto = new KwMeterDataDto();
kwMeterDataDto.setTenantId(merchantMeter.getTenantId());
kwMeterDataDto.updateTenantInfo(merchantMeter);
kwMeterDataDto.setMeterId(merchantMeter.getMeterId());
kwMeterDataDto.setStartTime(startdate);
kwMeterDataDto.setEndTime(lastdate);
@@ -169,7 +169,7 @@ public class PowerBillAutoBuildSchedule {
WxBillDaily wxBillDaily = new WxBillDaily();
Long merchantId = wxMerchantPowerBillConfig.getMerchantId();
wxBillDaily.setShopId(getShopId(merchantId));
wxBillDaily.setTenantId(wxMerchantPowerBillConfig.getTenantId());
wxBillDaily.updateTenantInfo(wxMerchantPowerBillConfig);
wxBillDaily.setMerchantId(merchantId);
wxBillDaily.setMerchantName(wxMerchantPowerBillConfig.getMerchantName());
wxBillDaily.setType(EnumBillDailyType.POWER.getCode());


+ 2
- 2
mallinkSchedule/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java View File

@@ -94,7 +94,7 @@ public class WxAppVisitSchedule {
private boolean checkData(String date,WxAppinfo appInfo) {
WxUserVisit wxUserVisit = new WxUserVisit();
wxUserVisit.setAppId(appInfo.getAppId());
wxUserVisit.setTenantId(appInfo.getTenantId());
wxUserVisit.updateTenantInfo(appInfo);
wxUserVisit.setRefDate(date);
PageInfo<WxUserVisit> page = wxUserVisitService.listAsPage(wxUserVisit, 1, 10000);
if (page.getList().size() > 0)
@@ -115,7 +115,7 @@ public class WxAppVisitSchedule {
for(WxMaVisitTrend maVisitTrend: vtList) {
WxUserVisit v = new WxUserVisit();
v.setAppId(appInfo.getAppId());
v.setTenantId(appInfo.getTenantId());
v.updateTenantInfo(appInfo);
String time = maVisitTrend.getRefDate();
Date dayDate = new SimpleDateFormat("yyyyMMdd").parse(time);
v.setDayDate(dayDate);


+ 6
- 0
mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java View File

@@ -56,4 +56,10 @@ public class WxMsgRecord extends BaseMsg {
public void updateTenantInfo(TenantEntity tenantEntity) {
setTenantId(tenantEntity.getTenantId());
}

public TenantEntity getTenantInfo() {
return new TenantEntity() {{
setTenantId(tenantId);
}};
}
}

Loading…
Cancel
Save