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 | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 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 5bdd801..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
@@ -1,6 +1,8 @@
package com.yeshi.fanli.job.order;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
import javax.annotation.Resource;
@@ -8,11 +10,15 @@
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
+import com.yeshi.fanli.dto.mq.UidDateDTO;
+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;
//鍥㈤槦鏀剁泭
@Component
@@ -22,13 +28,13 @@
private TeamDividentsManager teamDividentsManager;
@Resource
- private TeamDividentsSourceOrderService teamDividentsSourceOrderService;
-
- @Resource
private TeamDividentsSourceUserService teamDividentsSourceUserService;
@Resource
private OrderProcessService orderProcessService;
+
+ @Resource
+ private TeamEincomeRecordService teamEincomeRecordService;
public OrderTeamIncomeJob() {
@@ -43,4 +49,29 @@
return ReturnT.SUCCESS;
}
+ @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<>();
+ 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 + 1, pageSize);
+ for (Long uid : list) {
+ TeamOrderCMQManager.getInstance().addFanLiTeamIncomeMsg(new UidDateDTO(uid, preSendTime));
+ }
+ }
+ return ReturnT.SUCCESS;
+ }
+
}
--
Gitblit v1.8.0