From b907ba5b12a98e31d56c8847769875906a682b98 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 15 四月 2020 16:49:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/job/order/OrderTeamDividentsJob.java | 51 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 42 insertions(+), 9 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 ce099f2..e12099d 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
@@ -10,9 +10,14 @@
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
+import com.yeshi.fanli.dto.order.dividents.UserDividentsDayDTO;
+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.TeamDividentsSourceUserService;
+import com.yeshi.fanli.service.manger.money.TeamEincomeManager;
import com.yeshi.fanli.service.manger.order.TeamDividentsManager;
+import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.TimeUtil;
//璁㈠崟鍥㈤槦鍒嗙孩
@@ -28,14 +33,20 @@
@Resource
private TeamDividentsSourceUserService teamDividentsSourceUserService;
+ @Resource
+ private TeamEincomeManager teamEincomeManager;
+
+ @Resource
+ private TeamEincomeRecordService teamEincomeRecordService;
+
public OrderTeamDividentsJob() {
}
- // 寮�濮嬪垎绾紝姣忔湀25鍙锋墽琛�
- @XxlJob("startOrderTeamDividents")
- public ReturnT<String> startDividents(String param) throws Exception {
- String day = TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd");
+ // 棰勫垎绾�
+ @XxlJob("startPreOrderTeamDividentsHandler")
+ public ReturnT<String> startPreDividents(String param) throws Exception {
+ String day = TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM") + "-25";
Date preSendTime = new Date(TimeUtil.convertToTimeTemp(day, "yyyy-MM-dd"));
long count = teamDividentsSourceOrderService.countCanSendUidByPreSendTime(preSendTime);
@@ -47,11 +58,12 @@
teamDividentsManager.startDividents(uid);
}
}
- startAddDividentsRecord(day);
+ startAddDividentsRecord(preSendTime);
return ReturnT.SUCCESS;
}
- private void startAddDividentsRecord(String day) {
+ private void startAddDividentsRecord(Date preSendTime) {
+ String day = TimeUtil.getGernalTime(preSendTime.getTime(), "yyyy-MM-dd");
if (!teamDividentsManager.isSourceUserComupteFinish(day))
return;
// 缁熻璧勯噾
@@ -66,9 +78,30 @@
targetUidList.addAll(uidList);
}
- // for (Long uid : targetUidList)
- // CMQManager.getInstance().addTeamDividentsMsg(new
- // UserDividentsDayDTO(uid, day));
+ for (Long uid : targetUidList)
+ CMQManager.getInstance().addTeamDividentsMsg(new UserDividentsDayDTO(uid, preSendTime));
+ }
+
+ @XxlJob("addTeamIncomeTOUserAccountHandler")
+ public ReturnT<String> addTeamIncomeTOUserAccount(String param) throws Exception {
+ String day = TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM") + "-25";
+ Date preSendTime = new Date(TimeUtil.convertToTimeTemp(day, "yyyy-MM-dd"));
+
+ List<Integer> typeList = new ArrayList<>();
+ typeList.add(TeamEincomeRecord.TYPE_TEAM_REWARD);
+ typeList.add(TeamEincomeRecord.TYPE_TEAM_SUBSIDY);
+
+ long count = teamEincomeRecordService.countCanRecieveUid(preSendTime, typeList);
+
+ 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);
+ for (Long uid : list) {
+
+ }
+ }
+ return ReturnT.SUCCESS;
}
}
--
Gitblit v1.8.0