From f15acf7f2d57db3a32c574b0dfc21f564dca6024 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:01:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 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 737adf6..81fc96c 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
@@ -73,6 +73,7 @@
import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.service.inter.order.OrderMoneySettleService;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
+import com.yeshi.fanli.service.inter.order.OrderTeamRewardService;
import com.yeshi.fanli.service.inter.order.jd.JDOrderService;
import com.yeshi.fanli.service.inter.order.pdd.PDDOrderService;
import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
@@ -165,6 +166,9 @@
@Resource
private HongBaoV2AddManager hongBaoV2AddManager;
+
+ @Resource
+ private OrderTeamRewardService orderTeamRewardService;
/**
* 鏄惁鏄垎浜鍗�
@@ -739,7 +743,8 @@
order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);
order.setUserInfo(new UserInfo(uid));
try {
- PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
+ if (!Constant.IS_TEST)
+ PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
} catch (Exception e) {
}
}
@@ -1338,4 +1343,28 @@
return false;
}
+ @Override
+ public void fanliOrderTeamReward() {
+ Date time = new Date();
+ long count = orderTeamRewardService.countCanSettleUid(time);
+ int pageSize = 500;
+ int page = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
+ List<Long> uidList = new ArrayList<>();
+ for (int i = 0; i < page; i++) {
+ List<Long> list = orderTeamRewardService.listCanSettleUid(time, i + 1, pageSize);
+ if (list != null && list.size() > 0)
+ uidList.addAll(list);
+ }
+ // 娣诲姞鍒伴槦鍒�
+ if (uidList != null)
+ for (Long uid : uidList)
+ if (!Constant.IS_TEST)
+ CMQManager.getInstance().addFanLiOrderTeamRewardMsg(uid);
+ }
+
+ @Override
+ public void fanliOrderTeamReward(Long uid) throws OrderMoneySettleException {
+ orderMoneySettleService.orderTeamRewardSettle(uid);
+ }
+
}
--
Gitblit v1.8.0