From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001 From: yujian <yujian> Date: 星期一, 08 四月 2019 15:15:09 +0800 Subject: [PATCH] 冲突解决 --- fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 44 ++++++++++++++++++++++++++++++++++---------- 1 files changed, 34 insertions(+), 10 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 3b31512..ec535c2 100644 --- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java +++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java @@ -23,11 +23,13 @@ import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder; import com.yeshi.fanli.exception.TaoBaoWeiQuanException; import com.yeshi.fanli.log.LogHelper; +import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce; import com.yeshi.fanli.service.inter.lable.BoutiqueAutoRuleService; import com.yeshi.fanli.service.inter.lable.LabelService; 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; @@ -64,10 +66,15 @@ @Resource private QualityFactoryService qualityFactoryService; - + @Resource private UserSystemCouponService userSystemCouponService; - + + @Resource + private ThreeSaleSerivce threeSaleSerivce; + + @Resource + private TaoBaoOrderService taoBaoOrderService; private static boolean isInited = false; @@ -95,9 +102,11 @@ doOrderTiChengFanLi();// 澶勭悊璁㈠崟鎻愭垚杩斿埄 doWeiQuanOrder();// 澶勭悊缁存潈璁㈠崟 doPushIOS();// 澶勭悊鍙戦�両OS娑堟伅 + doThreeSaleUserCouponJob();// 澶勭悊閭�璇烽槦鍒� + doUpdateGoodsJob(); } else if (!Constant.IS_TEST) { initScheduler();// 鍚姩瀹氭椂浠诲姟 - // doUpdateGoodsJob(); + // } } @@ -160,7 +169,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() { @@ -169,6 +178,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) { @@ -209,7 +225,7 @@ } } catch (Exception e) { try { - LogHelper.errorDetailInfo(e); + LogHelper.errorDetailInfo(e, "HongBaoV2-ID:" + map.get(handler).getId(), ""); } catch (Exception e1) { e1.printStackTrace(); } @@ -251,7 +267,7 @@ } } catch (Exception e) { try { - LogHelper.errorDetailInfo(e); + LogHelper.errorDetailInfo(e, map.get(handler).toString(), ""); } catch (Exception e1) { e1.printStackTrace(); } @@ -407,10 +423,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(); @@ -418,11 +432,21 @@ String key = its.next(); try { ThreeSale threeSale = map.get(key); + if (threeSale != null) + threeSale = threeSaleSerivce.selectByPrimaryKey(threeSale.getId()); 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