From d525f0175016f802def58d244235bd0285df5235 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 四月 2020 15:09:11 +0800
Subject: [PATCH] 分享订单到账，团队订单到账，团队分红到账修改
---
fanli/src/main/java/com/yeshi/fanli/job/order/OrderTeamDividentsJob.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/order/OrderTeamDividentsJob.java b/fanli/src/main/java/com/yeshi/fanli/job/order/OrderTeamDividentsJob.java
index f5bdd29..6b60b67 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/order/OrderTeamDividentsJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/order/OrderTeamDividentsJob.java
@@ -17,6 +17,7 @@
import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceUserService;
import com.yeshi.fanli.service.manger.money.TeamEincomeManager;
import com.yeshi.fanli.service.manger.order.TeamDividentsManager;
+import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.cmq.order.TeamOrderCMQManager;
@@ -47,6 +48,10 @@
@XxlJob("startPreOrderTeamDividentsHandler")
public ReturnT<String> startPreDividents(String param) throws Exception {
String day = TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM") + "-25";
+ if (!StringUtil.isNullOrEmpty(param)) {
+ day = param;
+ }
+
Date preSendTime = new Date(TimeUtil.convertToTimeTemp(day, "yyyy-MM-dd"));
long count = teamDividentsSourceOrderService.countCanSendUidByPreSendTime(preSendTime);
@@ -55,7 +60,7 @@
for (int i = 0; i < totalPage; i++) {
List<Long> list = teamDividentsSourceOrderService.listCanSendUidByPreSendTime(preSendTime, i + 1, pageSize);
for (Long uid : list) {
- teamDividentsManager.startDividents(uid);
+ teamDividentsManager.startDividents(uid, preSendTime);
}
}
startAddDividentsRecord(preSendTime);
@@ -85,6 +90,10 @@
@XxlJob("addTeamDividentsTOUserAccountHandler")
public ReturnT<String> addTeamIncomeTOUserAccount(String param) throws Exception {
String day = TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM") + "-25";
+ if (!StringUtil.isNullOrEmpty(param)) {
+ day = param;
+ }
+
Date preSendTime = new Date(TimeUtil.convertToTimeTemp(day, "yyyy-MM-dd"));
List<Integer> typeList = new ArrayList<>();
@@ -95,7 +104,7 @@
int pageSize = 500;
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
for (int i = 0; i < totalPage; i++) {
- List<Long> list = teamEincomeRecordService.listCanRecieveUid(preSendTime, typeList, i * pageSize, pageSize);
+ List<Long> list = teamEincomeRecordService.listCanRecieveUid(preSendTime, typeList, i +1, pageSize);
for (Long uid : list) {
TeamOrderCMQManager.getInstance().addTeamDividentsMsg(new UidDateDTO(uid, preSendTime));
}
--
Gitblit v1.8.0