From e40d1c22c7202aac843c66f9ee9cc000744f9e10 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 六月 2020 15:52:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 edeabbb..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 {
@@ -735,8 +735,9 @@
String key = its.next();
try {
String orderId = map.get(key);
+ LogHelper.test("鍞搧浼氳鍗曟秷璐�:"+orderId);
if (!StringUtil.isNullOrEmpty(orderId)) {
- List<VipShopOrder> orderList = vipShopOrderService.listByOrderSn(orderId);
+ List<VipShopOrder> orderList = vipShopOrderService.listDetailByOrderSn(orderId);
if (orderList != null)
for (VipShopOrder order : orderList)
orderProcessService.processVipShopOrder(order);
@@ -748,7 +749,7 @@
}
}
} catch (Exception e) {
- LogHelper.error("鍞搧浼氳鍗�:" + e.getMessage());
+ LogHelper.errorDetailInfo(e);
}
}
}
@@ -783,7 +784,7 @@
}
}
} catch (Exception e) {
- LogHelper.error("鑻忓畞璁㈠崟:" + e.getMessage());
+ LogHelper.errorDetailInfo(e);
}
}
}
--
Gitblit v1.8.0