From 3cc9b37357411757f68ca479d7b58dce26b41651 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 12 四月 2019 16:45:01 +0800
Subject: [PATCH] 专题查询修改
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 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 55d65ea..3460a1a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -29,6 +29,7 @@
import com.yeshi.fanli.service.inter.lable.QualityFactoryService;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.service.inter.push.IOSPushService;
+import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
import com.yeshi.fanli.service.inter.user.ExtractService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
@@ -72,6 +73,12 @@
@Resource
private ThreeSaleSerivce threeSaleSerivce;
+ @Resource
+ private TaoBaoOrderService taoBaoOrderService;
+
+ @Resource
+ private RedisManager redisManager;
+
private static boolean isInited = false;
public void onApplicationEvent(ContextRefreshedEvent arg0) {
@@ -99,9 +106,10 @@
doWeiQuanOrder();// 澶勭悊缁存潈璁㈠崟
doPushIOS();// 澶勭悊鍙戦�両OS娑堟伅
doThreeSaleUserCouponJob();// 澶勭悊閭�璇烽槦鍒�
+ doUpdateGoodsJob();
} else if (!Constant.IS_TEST) {
initScheduler();// 鍚姩瀹氭椂浠诲姟
- // doUpdateGoodsJob();
+ //
}
}
@@ -164,7 +172,7 @@
*/
public void doTaoBaoOrders() {
// 鍚屾椂寮�鍚�3涓嚎绋嬪鐞�
- for (int i = 0; i < 3; i++) {
+ for (int i = 0; i < 1; i++) {
executor.execute(new Runnable() {
@Override
public void run() {
@@ -173,6 +181,13 @@
// 鍙�16涓鍗�
Map<String, List<TaoBaoOrder>> map = CMQManager.getInstance().consumeTaoBaoOrderMsg(16);
if (map != null) {
+ // 浠庡簱閲岄潰鏌ヨ
+ Iterator<String> its = map.keySet().iterator();
+ while (its.hasNext()) {
+ String orderId = its.next();
+ List<TaoBaoOrder> orderList = taoBaoOrderService.getTaoBaoOrderByOrderId(orderId);
+ map.put(orderId, orderList);
+ }
orderProcessService.processOrder(map);
}
} catch (Exception e) {
@@ -203,7 +218,15 @@
while (its.hasNext()) {
String handler = its.next();
try {
- orderProcessService.fanli(map.get(handler));
+ HongBaoV2 hongbao = map.get(handler);
+ if (hongbao != null) {
+ String key = "hongbao-fanli-" + hongbao.getId();
+ if (StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
+ // 澶勭悊涔嬪悗瑕侀殧2灏忔椂鍐嶆杩涜澶勭悊
+ redisManager.cacheCommonString(key, "1", 60 * 60 * 2);
+ orderProcessService.fanli(map.get(handler));
+ }
+ }
CMQManager.getInstance().deleteFanLiMsgNew(handler);
} catch (TaoBaoWeiQuanException e) {
try {
@@ -255,7 +278,7 @@
}
} catch (Exception e) {
try {
- LogHelper.errorDetailInfo(e);
+ LogHelper.errorDetailInfo(e, map.get(handler).toString(), "");
} catch (Exception e1) {
e1.printStackTrace();
}
@@ -411,10 +434,8 @@
while (true) {
try {
-
Map<String, ThreeSale> map = ThreeSaleCMQManager.getInstance()
.consumeQueueMsg(ThreeSaleCMQManager.QUEUE_USER_COUPON, 16);
-
if (map != null) {
Iterator<String> its = map.keySet().iterator();
@@ -427,8 +448,16 @@
if (threeSale != null) {
if (threeSale.getState() != null && threeSale.getState() == true) {
// 閭�璇锋垚鍔� - 鍒告縺娲荤敓鏁�
+ LogHelper.test("doThreeSaleUserCouponJob-" + threeSale.getId());
+
Long bossId = threeSale.getBoss().getId();
- userSystemCouponService.activatedWelfareFreeCoupon(bossId);
+ // 涓嬬骇鏄电О
+
+ String workerNickName = userInfoService
+ .selectByPKey(threeSale.getWorker().getId()).getNickName();
+
+ userSystemCouponService.activatedWelfareFreeCoupon(bossId,
+ workerNickName);
}
}
ThreeSaleCMQManager.getInstance()
--
Gitblit v1.8.0