From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/job/order/OrderTeamIncomeJob.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/order/OrderTeamIncomeJob.java b/fanli/src/main/java/com/yeshi/fanli/job/order/OrderTeamIncomeJob.java
index 3731e29..a0893a9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/order/OrderTeamIncomeJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/order/OrderTeamIncomeJob.java
@@ -14,9 +14,9 @@
import com.yeshi.fanli.entity.money.TeamEincomeRecord;
import com.yeshi.fanli.service.inter.money.TeamEincomeRecordService;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
-import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceOrderService;
import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceUserService;
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;
@@ -26,9 +26,6 @@
@Resource
private TeamDividentsManager teamDividentsManager;
-
- @Resource
- private TeamDividentsSourceOrderService teamDividentsSourceOrderService;
@Resource
private TeamDividentsSourceUserService teamDividentsSourceUserService;
@@ -55,6 +52,9 @@
@XxlJob("addTeamIncomeTOUserAccountHandler")
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<>();
@@ -66,7 +66,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().addFanLiTeamIncomeMsg(new UidDateDTO(uid, preSendTime));
}
--
Gitblit v1.8.0