From 0d9ac58dc11f54351e5e18dba8e950717d78019f Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期一, 09 九月 2019 14:55:24 +0800 Subject: [PATCH] 搜索发现 --- fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 91 +++++++++++++++++++++++++++++++++++++-------- 1 files changed, 74 insertions(+), 17 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 2b3d71b..1879829 100644 --- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java +++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java @@ -27,9 +27,11 @@ 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.TaoBaoWeiQuanException; +import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException; import com.yeshi.fanli.log.LogHelper; +import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service; import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce; +import com.yeshi.fanli.service.inter.integral.IntegralGetService; import com.yeshi.fanli.service.inter.jd.JDOrderService; import com.yeshi.fanli.service.inter.lable.BoutiqueAutoRuleService; import com.yeshi.fanli.service.inter.lable.LabelService; @@ -42,6 +44,7 @@ import com.yeshi.fanli.service.inter.user.ExtractService; import com.yeshi.fanli.service.inter.user.UserInfoService; import com.yeshi.fanli.service.inter.user.UserSystemCouponService; +import com.yeshi.fanli.util.cmq.HongBaoRecieveCMQManager; import com.yeshi.fanli.util.cmq.JDOrderCMQManager; import com.yeshi.fanli.util.cmq.PDDOrderCMQManager; import com.yeshi.fanli.util.cmq.ThreeSaleCMQManager; @@ -102,6 +105,12 @@ @Resource private PDDOrderService pddOrderService; + @Resource + private HongBaoV2Service hongBaoV2Service; + + @Resource + private IntegralGetService integralGetService; + private static boolean isInited = false; public void onApplicationEvent(ContextRefreshedEvent arg0) { @@ -136,6 +145,7 @@ doJDOrderJob();// 浜笢璁㈠崟澶勭悊 doPDDOrderJob();// 鎷煎澶氳鍗曞鐞� doImportantTaoBaoGoodsUpdateJob();// 娣樺疂閲嶈鍟嗗搧鐨勪俊鎭洿鏂� + doHongBaoRecieveIntegralGetJob();// 杩斿埄鍒拌处锛岄噾甯佸鍔� } } @@ -205,12 +215,13 @@ public void run() { while (true) { try { + // 鍙�16涓鍗� List<String> orderIds = CMQManager.getInstance().consumeTaoBaoOrderMsg(16); - Map<String, List<TaoBaoOrder>> map = new HashMap<>(); if (orderIds != null) { for (String orderId : orderIds) { if (NumberUtil.isNumeric(orderId.trim())) { + Map<String, List<TaoBaoOrder>> map = new HashMap<>(); List<TaoBaoOrder> orderList = taoBaoOrderService .getTaoBaoOrderByOrderId(orderId); map.put(orderId, orderList); @@ -569,7 +580,6 @@ } } catch (Exception e) { LogHelper.error("杩樻鍑洪敊:" + e.getMessage()); - } } } @@ -634,17 +644,12 @@ } PDDOrderCMQManager.getInstance().deletePDDOrder(key); } catch (Exception e) { - try { - LogHelper.errorDetailInfo(e); - } catch (Exception e1) { - e1.printStackTrace(); - } + LogHelper.errorDetailInfo(e); } } } } catch (Exception e) { LogHelper.error("鎷煎澶氳鍗�:" + e.getMessage()); - } } } @@ -656,22 +661,74 @@ * 閲嶈鐨勬窐瀹濆晢鍝佷俊鎭洿鏂� */ public void doImportantTaoBaoGoodsUpdateJob() { + // 寮�鍚�2涓嚎绋嬪仛鏇存柊 + for (int i = 0; i < 2; i++) + executor.execute(new Runnable() { + @Override + public void run() { + while (true) { + Map<String, Long> map = CMQManager.getInstance().consumeTBImpGoodsUpdateMsg(16); + if (map != null) { + Iterator<String> its = map.keySet().iterator(); + while (its.hasNext()) { + String key = its.next(); + try { + long startTime = System.currentTimeMillis(); + TaoBaoGoodsBrief goods = TaoKeApiUtil.searchGoodsDetail(map.get(key)); + // 鏇存柊涓�鏉℃暟鎹渶瑕佺殑鏃堕棿 + taoBaoGoodsUpdateService.updateTaoBaoGoods(goods); + long time = System.currentTimeMillis() - startTime; + LogHelper.test("娣樺疂閲嶈鍟嗗搧搴撴洿鏂版椂闂�:" + time); + } catch (Exception e) { + try { + LogHelper.errorDetailInfo(e); + } catch (Exception e1) { + e1.printStackTrace(); + } + } finally { + CMQManager.getInstance().deleteTBImpGoodsUpdateMsg(key); + } + } + } + } + } + }); + + } + + /** + * 绾㈠寘鍒拌处鍚庣殑閲戝竵鑾峰彇 + */ + public void doHongBaoRecieveIntegralGetJob() { executor.execute(new Runnable() { @Override public void run() { while (true) { - Map<String, Long> map = CMQManager.getInstance().consumeTBImpGoodsUpdateMsg(16); + Map<String, Long> map = HongBaoRecieveCMQManager.getInstance() + .consumeQueueMsg(HongBaoRecieveCMQManager.QUEUE_INTEGRAL, 16); if (map != null) { Iterator<String> its = map.keySet().iterator(); while (its.hasNext()) { String key = its.next(); + Long hongBaoId = map.get(key); try { - long startTime = System.currentTimeMillis(); - TaoBaoGoodsBrief goods = TaoKeApiUtil.searchGoodsDetail(map.get(key)); - // 鏇存柊涓�鏉℃暟鎹渶瑕佺殑鏃堕棿 - taoBaoGoodsUpdateService.updateTaoBaoGoods(goods); - long time = System.currentTimeMillis() - startTime; - LogHelper.test("娣樺疂閲嶈鍟嗗搧搴撴洿鏂版椂闂�:" + time); + HongBaoV2 hongBaoV2 = hongBaoV2Service.selectByPrimaryKey(hongBaoId); + if (hongBaoV2 != null && hongBaoV2.getState() == HongBaoV2.STATE_YILINGQU + && hongBaoV2.getMoney().compareTo(new BigDecimal(0)) > 0) { + if (hongBaoV2.getType() == HongBaoV2.TYPE_ZIGOU) {// 鑷喘 + integralGetService.addRebateOrder(hongBaoV2.getUserInfo().getId()); + } else if (hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_GOODS) {// 鍒嗕韩璧� + integralGetService.addShareOrder(hongBaoV2.getUserInfo().getId()); + } else if (hongBaoV2.getType() == HongBaoV2.TYPE_YIJI + || hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_YIJI) {// 涓�绾ч個璇疯禋 + integralGetService.addInviteOrderLevelOne(hongBaoV2.getUserInfo().getId()); + } else if (hongBaoV2.getType() == HongBaoV2.TYPE_ERJI + || hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_ERJI) {// 浜岀骇閭�璇疯禋 + integralGetService.addInviteOrderLevelOne(hongBaoV2.getUserInfo().getId()); + } + } + HongBaoRecieveCMQManager.getInstance() + .deleteQueueMsg(HongBaoRecieveCMQManager.QUEUE_INTEGRAL, key); } catch (Exception e) { try { LogHelper.errorDetailInfo(e); @@ -679,7 +736,7 @@ e1.printStackTrace(); } } finally { - CMQManager.getInstance().deleteTBImpGoodsUpdateMsg(key); + } } } -- Gitblit v1.8.0