From 47618e991895749fd040f3b90b8504be3fd5376f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 四月 2020 16:11:42 +0800
Subject: [PATCH] 到账规则修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 122 +++++++++++++++++++++++++---------------
1 files changed, 75 insertions(+), 47 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 a08b0fe..0baa158 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
@@ -30,6 +30,7 @@
import com.yeshi.fanli.dao.mybatis.order.HongBaoOrderMapper;
import com.yeshi.fanli.dao.mybatis.order.OrderMapper;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;
+import com.yeshi.fanli.dto.mq.UidDateDTO;
import com.yeshi.fanli.dto.mq.order.OrderTopicTagEnum;
import com.yeshi.fanli.dto.mq.order.body.OrderMQMsg;
import com.yeshi.fanli.dto.mq.order.body.OrderMoneyRecievedMQMsg;
@@ -588,70 +589,74 @@
}
@Override
- public void fanliInvaiteAndShare() {
- // 鏌ュ嚭閭�璇疯禋涓庡垎浜禋璇ヨ繑鍒╃殑鐢ㄦ埛ID
- List<Long> inviteAndShareUids = hongBaoV2Mapper.listUidCanBanlanceShareAndInvite(1000);
+ public void fanliPreInvaite(Date maxTime) {
+ // 鏌ュ嚭閭�璇疯禋鐨勭敤鎴稩D
+ List<Integer> typeList = new ArrayList<>();
+ typeList.add(HongBaoV2.TYPE_YIJI);
+ typeList.add(HongBaoV2.TYPE_ERJI);
+ typeList.add(HongBaoV2.TYPE_SHARE_YIJI);
+ typeList.add(HongBaoV2.TYPE_SHARE_ERJI);
+
+ long count = hongBaoV2Mapper.countUidCanBanlanceByTypeAndMaxTime(typeList, maxTime);
+ int pageSize = 1000;
+ int page = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
Set<Long> uidSets = new HashSet<>();
- if (inviteAndShareUids != null)
- for (Long uid : inviteAndShareUids) {
- if (userInfoMapper.selectAvailableByPrimaryKey(uid) != null)
- uidSets.add(uid);
- }
+ for (int i = 0; i < page; i++) {
+ List<Long> inviteAndShareUids = hongBaoV2Mapper.listUidCanBanlanceByTypeAndMaxTime(typeList, maxTime,
+ i * pageSize, pageSize);
+ if (inviteAndShareUids != null)
+ for (Long uid : inviteAndShareUids) {
+ if (userInfoMapper.selectAvailableByPrimaryKey(uid) != null)
+ uidSets.add(uid);
+ }
+ }
// 鏍规嵁鐢ㄦ埛ID
Iterator<Long> its = uidSets.iterator();
while (its.hasNext()) {
Long uid = its.next();
try {
if (Constant.ENABLE_MQ)
- CMQManager.getInstance().addFanLiTiChengMsg(uid);
+ CMQManager.getInstance().addFanLiTeamIncomeMsg(new UidDateDTO(uid, maxTime));
} catch (Exception e) {
e.printStackTrace();
LogHelper.error(e);
}
}
+
}
@Override
- @Transactional(rollbackFor = Exception.class)
- public void fanliInvaiteAndShare(Long uid) throws TaoBaoWeiQuanException {
- // 閭�璇疯禋鍒拌处
- Date now = new Date();
- try {
- orderMoneySettleService.inviteSettleTB(uid, now);
- } catch (OrderMoneySettleException e) {
- e.printStackTrace();
+ public void fanliShare(Date maxTime) {
+ // 鏌ュ嚭閭�璇疯禋鐨勭敤鎴稩D
+ List<Integer> typeList = new ArrayList<>();
+ typeList.add(HongBaoV2.TYPE_SHARE_GOODS);
+
+ long count = hongBaoV2Mapper.countUidCanBanlanceByTypeAndMaxTime(typeList, maxTime);
+ int pageSize = 1000;
+ int page = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
+ Set<Long> uidSets = new HashSet<>();
+ for (int i = 0; i < page; i++) {
+ List<Long> inviteAndShareUids = hongBaoV2Mapper.listUidCanBanlanceByTypeAndMaxTime(typeList, maxTime,
+ i * pageSize, pageSize);
+ if (inviteAndShareUids != null)
+ for (Long uid : inviteAndShareUids) {
+ if (userInfoMapper.selectAvailableByPrimaryKey(uid) != null)
+ uidSets.add(uid);
+ }
+ }
+ // 鏍规嵁鐢ㄦ埛ID
+ Iterator<Long> its = uidSets.iterator();
+ while (its.hasNext()) {
+ Long uid = its.next();
+ try {
+ if (Constant.ENABLE_MQ)
+ CMQManager.getInstance().addFanLiShareMsg(new UidDateDTO(uid, maxTime));
+ } catch (Exception e) {
+ e.printStackTrace();
+ LogHelper.error(e);
+ }
}
- try {
- orderMoneySettleService.inviteSettleJD(uid, now);
- } catch (OrderMoneySettleException e) {
- e.printStackTrace();
- }
- //
- try {
- orderMoneySettleService.inviteSettlePDD(uid, now);
- } catch (OrderMoneySettleException e) {
- e.printStackTrace();
- }
-
- // 鍒嗕韩璧氬埌璐�
- try {
- orderMoneySettleService.shareSettleTB(uid);
- } catch (OrderMoneySettleException e) {
- e.printStackTrace();
- }
-
- try {
- orderMoneySettleService.shareSettleJD(uid);
- } catch (OrderMoneySettleException e) {
- e.printStackTrace();
- }
- //
- try {
- orderMoneySettleService.shareSettlePDD(uid);
- } catch (OrderMoneySettleException e) {
- e.printStackTrace();
- }
}
@Override
@@ -677,6 +682,29 @@
}
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void fanliShare(Long uid, Date maxPreGetTime) {
+ // 閭�璇疯禋鍒拌处
+ try {
+ orderMoneySettleService.shareSettleTB(uid, maxPreGetTime);
+ } catch (OrderMoneySettleException e) {
+ e.printStackTrace();
+ }
+
+ try {
+ orderMoneySettleService.shareSettleJD(uid, maxPreGetTime);
+ } catch (OrderMoneySettleException e) {
+ e.printStackTrace();
+ }
+
+ try {
+ orderMoneySettleService.shareSettlePDD(uid, maxPreGetTime);
+ } catch (OrderMoneySettleException e) {
+ e.printStackTrace();
+ }
+ }
+
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
@Override
public void processShopingFanliOrderNew(String orderId, List<TaoBaoOrder> orderList)
--
Gitblit v1.8.0