From 2bd2200f209ddb7bcc59b636d9de6f8b3f762958 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 23 四月 2020 10:00:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/job/order/OrderTeamDividentsJob.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 6b60b67..40232fe 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
@@ -14,6 +14,7 @@
import com.yeshi.fanli.entity.money.TeamEincomeRecord;
import com.yeshi.fanli.service.inter.money.TeamEincomeRecordService;
import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceOrderService;
+import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceOrderUserMapService;
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;
@@ -30,6 +31,9 @@
@Resource
private TeamDividentsSourceOrderService teamDividentsSourceOrderService;
+
+ @Resource
+ private TeamDividentsSourceOrderUserMapService teamDividentsSourceOrderUserMapService;
@Resource
private TeamDividentsSourceUserService teamDividentsSourceUserService;
@@ -54,11 +58,12 @@
Date preSendTime = new Date(TimeUtil.convertToTimeTemp(day, "yyyy-MM-dd"));
- long count = teamDividentsSourceOrderService.countCanSendUidByPreSendTime(preSendTime);
+ long count = teamDividentsSourceOrderUserMapService.countCanSendSourceUidByPreSendTime(preSendTime);
int pageSize = 500;
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
for (int i = 0; i < totalPage; i++) {
- List<Long> list = teamDividentsSourceOrderService.listCanSendUidByPreSendTime(preSendTime, i + 1, pageSize);
+ List<Long> list = teamDividentsSourceOrderUserMapService.listCanSendSourceUidByPreSendTime(preSendTime,
+ i + 1, pageSize);
for (Long uid : list) {
teamDividentsManager.startDividents(uid, preSendTime);
}
@@ -104,7 +109,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 +1, 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