From f15acf7f2d57db3a32c574b0dfc21f564dca6024 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:01:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 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 29d9980..5133d26 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -35,6 +35,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
+import com.yeshi.fanli.exception.money.OrderMoneySettleException;
import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.ad.DouYinClickEventService;
@@ -162,7 +163,8 @@
doTaoBaoOrders();// 澶勭悊娣樺疂璁㈠崟
doTaoBaoNewOrders();// 澶勭悊娣樺疂璁㈠崟锛堝垰鍒氫骇鐢熺殑锛�
doOrderFanLiNew();// 鏂扮増杩斿埄
-// doOrderTiChengFanLi();// 澶勭悊璁㈠崟鎻愭垚杩斿埄
+ doOrderTiChengFanLi();// 澶勭悊璁㈠崟鎻愭垚杩斿埄
+ doOrderTeamRewardFanLi();// 鍥㈤槦濂栧姳鍒拌处
doWeiQuanOrder();// 澶勭悊缁存潈璁㈠崟
doPushIOS();// 澶勭悊鍙戦�両OS娑堟伅
doUserMoneyDebtJob();// 鍊哄姟鍋胯繕
@@ -327,7 +329,8 @@
try {
HongBaoV2 hongbao = map.get(handler);
if (hongbao != null) {
- String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.hongBaoFanLi, hongbao.getId() + "");
+ String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.hongBaoFanLi,
+ hongbao.getId() + "");
if (StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
// 澶勭悊涔嬪悗瑕侀殧2灏忔椂鍐嶆杩涜澶勭悊
redisManager.cacheCommonString(key, "1", 60 * 60 * 2);
@@ -401,6 +404,47 @@
}
/**
+ * 璁㈠崟鍥㈤槦濂栧姳鍒拌处
+ */
+ public void doOrderTeamRewardFanLi() {
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ while (true) {
+ try {
+
+ Map<String, Long> map = CMQManager.getInstance().consumeOrderTeamRewardMsg(16);
+ if (map != null) {
+ Iterator<String> its = map.keySet().iterator();
+ while (its.hasNext()) {
+ String handler = its.next();
+ try {
+ orderProcessService.fanliOrderTeamReward(map.get(handler));
+ CMQManager.getInstance().deleteOrderTeamRewardMsg(handler);
+ } catch (OrderMoneySettleException e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e, map.get(handler).toString(), "");
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+
+ }
+ }
+ }
+ });
+ }
+
+ /**
* 澶勭悊娣樺疂璁㈠崟缁存潈
*/
public void doWeiQuanOrder() {
--
Gitblit v1.8.0