From 457265eb82265650cf6c87519803975f23bd2fd3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 18:33:21 +0800
Subject: [PATCH] 订单统计与返利到账集成测试相关的bug修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 58 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
index 2a0c112..e747c3c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -406,7 +406,8 @@
|| hb.getPreGetTime().getTime() > System.currentTimeMillis())
continue;
try {
- CMQManager.getInstance().addFanLiMsgNew(hb);
+ if (Constant.ENABLE_MQ)
+ CMQManager.getInstance().addFanLiMsgNew(hb);
} catch (Exception e) {
try {
LogHelper.errorDetailInfo(e);
@@ -520,7 +521,8 @@
for (TaoBaoWeiQuanOrder order : orderList) {
try {
if (order.getState().contains("缁存潈鎴愬姛")) {
- CMQManager.getInstance().addWeiQuanOrderMsg(order);
+ if (Constant.ENABLE_MQ)
+ CMQManager.getInstance().addWeiQuanOrderMsg(order);
}
} catch (Exception e) {
LogHelper.error("缁存潈璁㈠崟鍔犲叆鍒伴槦鍒楀嚭閿�:" + order != null ? new Gson().toJson(order) : null);
@@ -600,7 +602,8 @@
while (its.hasNext()) {
Long uid = its.next();
try {
- CMQManager.getInstance().addFanLiTiChengMsg(uid);
+ if (Constant.ENABLE_MQ)
+ CMQManager.getInstance().addFanLiTiChengMsg(uid);
} catch (Exception e) {
e.printStackTrace();
LogHelper.error(e);
@@ -612,20 +615,21 @@
@Transactional(rollbackFor = Exception.class)
public void fanliInvaiteAndShare(Long uid) throws TaoBaoWeiQuanException {
// 閭�璇疯禋鍒拌处
+ Date now = new Date();
try {
- orderMoneySettleService.inviteSettleTB(uid);
+ orderMoneySettleService.inviteSettleTB(uid, now);
} catch (OrderMoneySettleException e) {
e.printStackTrace();
}
try {
- orderMoneySettleService.inviteSettleJD(uid);
+ orderMoneySettleService.inviteSettleJD(uid, now);
} catch (OrderMoneySettleException e) {
e.printStackTrace();
}
//
try {
- orderMoneySettleService.inviteSettlePDD(uid);
+ orderMoneySettleService.inviteSettlePDD(uid, now);
} catch (OrderMoneySettleException e) {
e.printStackTrace();
}
@@ -645,6 +649,29 @@
//
try {
orderMoneySettleService.shareSettlePDD(uid);
+ } catch (OrderMoneySettleException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void fanliPreInvaite(Long uid, Date maxPreGetTime) {
+ // 閭�璇疯禋鍒拌处
+ try {
+ orderMoneySettleService.inviteSettleTB(uid, maxPreGetTime);
+ } catch (OrderMoneySettleException e) {
+ e.printStackTrace();
+ }
+
+ try {
+ orderMoneySettleService.inviteSettleJD(uid, maxPreGetTime);
+ } catch (OrderMoneySettleException e) {
+ e.printStackTrace();
+ }
+
+ try {
+ orderMoneySettleService.inviteSettlePDD(uid, maxPreGetTime);
} catch (OrderMoneySettleException e) {
e.printStackTrace();
}
@@ -749,7 +776,7 @@
order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);
order.setUserInfo(new UserInfo(uid));
try {
- if (!Constant.IS_TEST)
+ if (Constant.ENABLE_MQ)
PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
} catch (Exception e) {
}
@@ -800,7 +827,8 @@
order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);
order.setUserInfo(new UserInfo(uid));
try {
- PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
+ if (Constant.ENABLE_MQ)
+ PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
} catch (Exception e) {
}
}
@@ -922,7 +950,8 @@
order.setOrderType(Constant.SOURCE_TYPE_JD);
order.setUserInfo(new UserInfo(uid));
try {
- PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
+ if (Constant.ENABLE_MQ)
+ PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
} catch (Exception e) {
}
}
@@ -953,7 +982,8 @@
order.setOrderType(Constant.SOURCE_TYPE_JD);
order.setUserInfo(new UserInfo(uid));
try {
- PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
+ if (Constant.ENABLE_MQ)
+ PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
} catch (Exception e) {
}
}
@@ -1062,7 +1092,8 @@
order.setOrderType(Constant.SOURCE_TYPE_PDD);
order.setUserInfo(new UserInfo(uid));
try {
- PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
+ if (Constant.ENABLE_MQ)
+ PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
} catch (Exception e) {
}
}
@@ -1095,7 +1126,8 @@
order.setOrderType(Constant.SOURCE_TYPE_PDD);
order.setUserInfo(new UserInfo(uid));
try {
- PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
+ if (Constant.ENABLE_MQ)
+ PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
} catch (Exception e) {
}
}
@@ -1250,7 +1282,7 @@
public List<HongBaoV2> getCanBalanceElmeFanliHongBao() {
List<Integer> list = new ArrayList<>();
list.add(HongBaoV2.TYPE_ELME);
- return hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(list, null, null, 0, 1000);
+ return hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(list, null, null, new Date(), 0, 1000);
}
@Override
--
Gitblit v1.8.0