From f15251f01d6c55fb3e3b706af79744d00481b39d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 21 八月 2019 10:14:30 +0800
Subject: [PATCH] 拼多多订单修改
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 293 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 261 insertions(+), 32 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 863bf7c..81d776d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.util;
-import java.util.ArrayList;
+import java.math.BigDecimal;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -12,26 +13,40 @@
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Component;
+import org.yeshi.utils.NumberUtil;
import org.yeshi.utils.tencentcloud.COSManager;
import org.yeshi.utils.tencentcloud.entity.COSInitParams;
+import com.yeshi.fanli.dto.money.UserMoneyChangeDTO;
import com.yeshi.fanli.entity.bus.user.AlipayTransferResultInfo;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
+import com.yeshi.fanli.entity.jd.JDOrder;
+import com.yeshi.fanli.entity.pdd.PDDOrder;
import com.yeshi.fanli.entity.push.PushQueueRecord;
+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.log.LogHelper;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.jd.JDOrderService;
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.money.UserMoneyDebtService;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
+import com.yeshi.fanli.service.inter.pdd.PDDOrderService;
import com.yeshi.fanli.service.inter.push.IOSPushService;
+import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
+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;
+import com.yeshi.fanli.util.cmq.JDOrderCMQManager;
+import com.yeshi.fanli.util.cmq.PDDOrderCMQManager;
+import com.yeshi.fanli.util.cmq.ThreeSaleCMQManager;
+import com.yeshi.fanli.util.cmq.UserMoneyChangeCMQManager;
+import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
/**
* 绯荤粺鍒濆鍖�
@@ -64,13 +79,28 @@
private OrderProcessService orderProcessService;
@Resource
- private QualityFactoryService qualityFactoryService;
+ private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
@Resource
private UserSystemCouponService userSystemCouponService;
@Resource
private ThreeSaleSerivce threeSaleSerivce;
+
+ @Resource
+ private TaoBaoOrderService taoBaoOrderService;
+
+ @Resource
+ private RedisManager redisManager;
+
+ @Resource
+ private UserMoneyDebtService userMoneyDebtService;
+
+ @Resource
+ private JDOrderService jdOrderService;
+
+ @Resource
+ private PDDOrderService pddOrderService;
private static boolean isInited = false;
@@ -94,15 +124,20 @@
if (Constant.IS_TASK) {
doExtractResult();// 澶勭悊鎻愮幇缁撴灉
doTaoBaoOrders();// 澶勭悊娣樺疂璁㈠崟
+ doTaoBaoNewOrders();// 澶勭悊娣樺疂璁㈠崟锛堝垰鍒氫骇鐢熺殑锛�
doOrderFanLiNew();// 鏂扮増杩斿埄
doOrderTiChengFanLi();// 澶勭悊璁㈠崟鎻愭垚杩斿埄
doWeiQuanOrder();// 澶勭悊缁存潈璁㈠崟
doPushIOS();// 澶勭悊鍙戦�両OS娑堟伅
doThreeSaleUserCouponJob();// 澶勭悊閭�璇烽槦鍒�
- } else if (!Constant.IS_TEST) {
- initScheduler();// 鍚姩瀹氭椂浠诲姟
- // doUpdateGoodsJob();
+ doUserMoneyDebtJob();// 鍊哄姟鍋胯繕
+ initScheduler();// 鍚姩鍟嗗搧鏇存柊瀹氭椂浠诲姟
+ doUpdateGoodsJob(); // 鏇存柊鍟嗗搧闃熷垪
+ doJDOrderJob();// 浜笢璁㈠崟澶勭悊
+ doPDDOrderJob();// 鎷煎澶氳鍗曞鐞�
+ doImportantTaoBaoGoodsUpdateJob();// 娣樺疂閲嶈鍟嗗搧鐨勪俊鎭洿鏂�
}
+
}
/**
@@ -170,10 +205,60 @@
public void run() {
while (true) {
try {
+
// 鍙�16涓鍗�
- Map<String, List<TaoBaoOrder>> map = CMQManager.getInstance().consumeTaoBaoOrderMsg(16);
- if (map != null) {
- orderProcessService.processOrder(map);
+ List<String> orderIds = CMQManager.getInstance().consumeTaoBaoOrderMsg(16);
+ 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);
+ LogHelper.orderInfo("寮�濮嬪鐞嗚鍗�:" + orderId);
+ orderProcessService.processOrder(map);
+ LogHelper.orderInfo("缁撴潫澶勭悊璁㈠崟:" + orderId);
+ }
+ }
+ }
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+
+ }
+ }
+ }
+ }
+ });
+ }
+ }
+
+ /**
+ * 鍒氬垰浜х敓鐨勮鍗�
+ */
+ public void doTaoBaoNewOrders() {
+ // 鍚屾椂寮�鍚�3涓嚎绋嬪鐞�
+ for (int i = 0; i < 1; i++) {
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ while (true) {
+ try {
+ // 鍙�16涓鍗�
+ List<String> orderIds = CMQManager.getInstance().consumeTaoBaoNewOrderMsg(16);
+ Map<String, List<TaoBaoOrder>> map = new HashMap<>();
+ if (orderIds != null) {
+ for (String orderId : orderIds) {
+ List<TaoBaoOrder> orderList = taoBaoOrderService.getTaoBaoOrderByOrderId(orderId);
+ map.put(orderId, orderList);
+
+ LogHelper.orderInfo("鏂拌鍗�-寮�濮嬪鐞嗚鍗�:" + orderId);
+ long startTime = System.currentTimeMillis();
+ orderProcessService.processOrder(map);
+ LogHelper.orderInfo("鏂拌鍗�-缁撴潫澶勭悊璁㈠崟:" + orderId + "- 澶勭悊鏃堕棿:"
+ + (System.currentTimeMillis() - startTime));
+ }
}
} catch (Exception e) {
try {
@@ -203,7 +288,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 {
@@ -340,7 +433,7 @@
}
}
} catch (Exception e) {
-
+ LogHelper.errorDetailInfo(e);
}
}
}
@@ -355,43 +448,28 @@
boutiqueAutoRuleService.startScheduler();
}
+ /**
+ * 鏇存柊绮鹃�夊簱鍟嗗搧
+ */
public void doUpdateGoodsJob() {
-
- // 閲囩敤4涓嚎绋嬪仛鏇存柊
for (int i = 0; i < 1; i++)
executor.execute(new Runnable() {
@Override
public void run() {
-
while (true) {
try {
-
Map<String, Long> map = CMQManager.getInstance().consumeNeedUpdateTaoBaoGoodsIdMsg(16);
-
if (map != null) {
-
Iterator<String> its = map.keySet().iterator();
while (its.hasNext()) {
-
String key = its.next();
- try {
- Long goodsId = map.get(key);
- List<Long> list = new ArrayList<>();
- list.add(goodsId);
- qualityFactoryService.updateGoodsFactory(list);
- CMQManager.getInstance().deleteNeedUpdateTaoBaoGoodsIdMsg(key);
- } catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
- }
+ taoBaoGoodsUpdateService.updateByTaoKeGoodsDetail(Long.parseLong(key));
+ CMQManager.getInstance().deleteNeedUpdateTaoBaoGoodsIdMsg(key);
}
}
} catch (Exception e) {
+ e.printStackTrace();
LogHelper.error("鏇存柊鍟嗗搧鍑洪敊:" + e.getMessage());
-
}
}
}
@@ -457,4 +535,155 @@
});
}
+
+ /**
+ * 鐢ㄦ埛鍊熻捶澶勭悊
+ */
+ public void doUserMoneyDebtJob() {
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ while (true) {
+ try {
+ Map<String, UserMoneyChangeDTO> map = UserMoneyChangeCMQManager.getInstance()
+ .consumeQueueMsg(UserMoneyChangeCMQManager.QUEUE_DEBT, 16);
+ if (map != null) {
+
+ Iterator<String> its = map.keySet().iterator();
+ while (its.hasNext()) {
+ String key = its.next();
+ try {
+ UserMoneyChangeDTO dto = map.get(key);
+ if (dto != null && dto.getChangeMoney().compareTo(new BigDecimal(0)) > 0) {
+ userMoneyDebtService.repayDebt(dto.getUid());
+ }
+ UserMoneyChangeCMQManager.getInstance()
+ .deleteQueueMsg(UserMoneyChangeCMQManager.QUEUE_DEBT, key);
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ LogHelper.error("杩樻鍑洪敊:" + e.getMessage());
+ }
+ }
+ }
+ });
+ }
+
+ public void doJDOrderJob() {
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ while (true) {
+ try {
+ Map<String, String> map = JDOrderCMQManager.getInstance().consumeJDOrder(16);
+ if (map != null) {
+ Iterator<String> its = map.keySet().iterator();
+ while (its.hasNext()) {
+ String key = its.next();
+ try {
+ String orderId = map.get(key);
+ if (!StringUtil.isNullOrEmpty(orderId)) {
+ JDOrder order = jdOrderService.selectDetailByOrderId(Long.parseLong(orderId));
+ orderProcessService.processJDOrder(order);
+ }
+ JDOrderCMQManager.getInstance().deleteJDOrder(key);
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ LogHelper.error("鎷煎澶氳鍗曞嚭閿�:" + e.getMessage());
+
+ }
+ }
+ }
+ });
+
+ }
+
+ public void doPDDOrderJob() {
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ while (true) {
+ try {
+ Map<String, String> map = PDDOrderCMQManager.getInstance().consumePDDOrder(16);
+ if (map != null) {
+ Iterator<String> its = map.keySet().iterator();
+ while (its.hasNext()) {
+ String key = its.next();
+ try {
+ String orderId = map.get(key);
+ if (!StringUtil.isNullOrEmpty(orderId)) {
+ List<PDDOrder> orderList = pddOrderService.selectByOrderSn(orderId);
+ if (orderList != null)
+ for (PDDOrder order : orderList)
+ orderProcessService.processPDDOrder(order);
+ }
+ PDDOrderCMQManager.getInstance().deletePDDOrder(key);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ }
+ }
+ } catch (Exception e) {
+ LogHelper.error("鎷煎澶氳鍗�:" + e.getMessage());
+ }
+ }
+ }
+ });
+
+ }
+
+ /**
+ * 閲嶈鐨勬窐瀹濆晢鍝佷俊鎭洿鏂�
+ */
+ 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);
+ }
+ }
+ }
+ }
+ }
+ });
+
+ }
+
}
--
Gitblit v1.8.0