From 055fb8d085efd7e120d69aba6c0fbb8db5867553 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 七月 2020 14:37:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
index 9d172f9..957dd17 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -67,15 +67,15 @@
import com.yeshi.fanli.service.manger.money.TeamEincomeManager;
import com.yeshi.fanli.service.manger.order.TeamDividentsManager;
import com.yeshi.fanli.util.ad.DouYinAdUtil;
-import com.yeshi.fanli.util.cmq.DouYinDeviceActiveCMQManager;
-import com.yeshi.fanli.util.cmq.HongBaoRecieveCMQManager;
-import com.yeshi.fanli.util.cmq.UserMoneyChangeCMQManager;
-import com.yeshi.fanli.util.cmq.order.JDOrderCMQManager;
-import com.yeshi.fanli.util.cmq.order.PDDOrderCMQManager;
-import com.yeshi.fanli.util.cmq.order.PlaceOrderCMQManager;
-import com.yeshi.fanli.util.cmq.order.SuningOrderCMQManager;
-import com.yeshi.fanli.util.cmq.order.TeamOrderCMQManager;
-import com.yeshi.fanli.util.cmq.order.VipShopOrderCMQManager;
+import com.yeshi.fanli.util.mq.cmq.DouYinDeviceActiveCMQManager;
+import com.yeshi.fanli.util.mq.cmq.HongBaoRecieveCMQManager;
+import com.yeshi.fanli.util.mq.cmq.UserMoneyChangeCMQManager;
+import com.yeshi.fanli.util.mq.cmq.order.JDOrderCMQManager;
+import com.yeshi.fanli.util.mq.cmq.order.PDDOrderCMQManager;
+import com.yeshi.fanli.util.mq.cmq.order.PlaceOrderCMQManager;
+import com.yeshi.fanli.util.mq.cmq.order.SuningOrderCMQManager;
+import com.yeshi.fanli.util.mq.cmq.order.TeamOrderCMQManager;
+import com.yeshi.fanli.util.mq.cmq.order.VipShopOrderCMQManager;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
/**
@@ -203,7 +203,7 @@
doOrderTeamIncomePreFanLi();// 澶勭悊璁㈠崟鎻愭垚杩斿埄
doDividentsPreJob();
- doOrderTeamIncomeFanLi();
+ doOrderTeamRewardFanLi();
doDividentsJob();
}
@@ -429,9 +429,9 @@
}
/**
- * 澶勭悊鍥㈤槦璁㈠崟杩斿埄
+ * 澶勭悊鍥㈤槦濂栭噾杩斿埄
*/
- public void doOrderTeamIncomeFanLi() {
+ public void doOrderTeamRewardFanLi() {
executor.execute(new Runnable() {
@Override
public void run() {
@@ -444,7 +444,7 @@
String handler = its.next();
try {
UidDateDTO dto = map.get(handler);
- teamEincomeManager.addTeamIncomeTOUserAccount(dto.getDate(), dto.getUid());
+ teamEincomeManager.addTeamRewardTOUserAccount(dto.getDate(), dto.getUid());
TeamOrderCMQManager.getInstance().deleteTeamIncomeMsg(handler);
} catch (Exception e) {
try {
--
Gitblit v1.8.0