From c2e3dea0d75b7239b1ed66c9d9e1bbb177050858 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 29 六月 2020 13:57:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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..06514ad 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -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