From 645c16466ce9dbe563c03943b0ab5fd46c8eed00 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 29 六月 2020 16:40:33 +0800
Subject: [PATCH] 免单券类型获得
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 8 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 43a0078..06514ad 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -18,6 +18,7 @@
import org.yeshi.utils.tencentcloud.COSManager;
import org.yeshi.utils.tencentcloud.entity.COSInitParams;
+import com.google.gson.Gson;
import com.yeshi.fanli.dto.ad.DouYinDeviceActiveQueueDTO;
import com.yeshi.fanli.dto.money.UserMoneyChangeDTO;
import com.yeshi.fanli.dto.mq.UidDateDTO;
@@ -33,6 +34,7 @@
import com.yeshi.fanli.entity.pdd.PDDOrder;
import com.yeshi.fanli.entity.push.DeviceActive;
import com.yeshi.fanli.entity.push.PushQueueRecord;
+import com.yeshi.fanli.entity.suning.SuningOrderInfo;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
@@ -51,6 +53,7 @@
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.service.inter.order.jd.JDOrderService;
import com.yeshi.fanli.service.inter.order.pdd.PDDOrderService;
+import com.yeshi.fanli.service.inter.order.suning.SuningOrderService;
import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
import com.yeshi.fanli.service.inter.order.vipshop.VipShopOrderService;
import com.yeshi.fanli.service.inter.push.DeviceActiveService;
@@ -70,6 +73,7 @@
import com.yeshi.fanli.util.cmq.order.JDOrderCMQManager;
import com.yeshi.fanli.util.cmq.order.PDDOrderCMQManager;
import com.yeshi.fanli.util.cmq.order.PlaceOrderCMQManager;
+import com.yeshi.fanli.util.cmq.order.SuningOrderCMQManager;
import com.yeshi.fanli.util.cmq.order.TeamOrderCMQManager;
import com.yeshi.fanli.util.cmq.order.VipShopOrderCMQManager;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -154,6 +158,9 @@
@Resource
private VipShopOrderService vipShopOrderService;
+
+ @Resource
+ private SuningOrderService suningOrderService;
private static boolean isInited = false;
@@ -179,7 +186,6 @@
doTaoBaoOrders();// 澶勭悊娣樺疂璁㈠崟
doTaoBaoNewOrders();// 澶勭悊娣樺疂璁㈠崟锛堝垰鍒氫骇鐢熺殑锛�
doOrderFanLiNew();// 鏂扮増杩斿埄
-
doOrderShareFanLi();
doWeiQuanOrder();// 澶勭悊缁存潈璁㈠崟
doPushIOS();// 澶勭悊鍙戦�両OS娑堟伅
@@ -189,6 +195,7 @@
doJDOrderJob();// 浜笢璁㈠崟澶勭悊
doPDDOrderJob();// 鎷煎澶氳鍗曞鐞�
doVipShopOrderJob();// 鍞搧浼氳鍗曞鐞�
+ doSuningOrderJob();// 鑻忓畞璁㈠崟澶勭悊
doImportantTaoBaoGoodsUpdateJob();// 娣樺疂閲嶈鍟嗗搧鐨勪俊鎭洿鏂�
doHongBaoRecieveIntegralGetJob();// 杩斿埄鍒拌处锛岄噾甯佸鍔�
// doPlaceOrderIntegralJob();// 涓嬪崟璧犻�侀噾甯佷换鍔�
@@ -196,9 +203,10 @@
doOrderTeamIncomePreFanLi();// 澶勭悊璁㈠崟鎻愭垚杩斿埄
doDividentsPreJob();
- doOrderTeamIncomeFanLi();
+ doOrderTeamRewardFanLi();
doDividentsJob();
}
+
}
/**
@@ -405,7 +413,7 @@
TeamOrderCMQManager.getInstance().deleteTeamIncomePreMsg(handler);
} catch (Exception e) {
try {
- LogHelper.errorDetailInfo(e, map.get(handler).toString(), "");
+ LogHelper.errorDetailInfo(e,new Gson().toJson(map.get(handler)).toString(), "");
} catch (Exception e1) {
e1.printStackTrace();
}
@@ -421,9 +429,9 @@
}
/**
- * 澶勭悊鍥㈤槦璁㈠崟杩斿埄
+ * 澶勭悊鍥㈤槦濂栭噾杩斿埄
*/
- public void doOrderTeamIncomeFanLi() {
+ public void doOrderTeamRewardFanLi() {
executor.execute(new Runnable() {
@Override
public void run() {
@@ -436,7 +444,7 @@
String handler = its.next();
try {
UidDateDTO dto = map.get(handler);
- teamEincomeManager.addTeamIncomeTOUserAccount(dto.getDate(), dto.getUid());
+ teamEincomeManager.addTeamRewardTOUserAccount(dto.getDate(), dto.getUid());
TeamOrderCMQManager.getInstance().deleteTeamIncomeMsg(handler);
} catch (Exception e) {
try {
@@ -727,8 +735,9 @@
String key = its.next();
try {
String orderId = map.get(key);
+ LogHelper.test("鍞搧浼氳鍗曟秷璐�:"+orderId);
if (!StringUtil.isNullOrEmpty(orderId)) {
- List<VipShopOrder> orderList = vipShopOrderService.listByOrderSn(orderId);
+ List<VipShopOrder> orderList = vipShopOrderService.listDetailByOrderSn(orderId);
if (orderList != null)
for (VipShopOrder order : orderList)
orderProcessService.processVipShopOrder(order);
@@ -740,7 +749,42 @@
}
}
} catch (Exception e) {
- LogHelper.error("鎷煎澶氳鍗�:" + e.getMessage());
+ LogHelper.errorDetailInfo(e);
+ }
+ }
+ }
+ });
+
+ }
+
+
+ public void doSuningOrderJob() {
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ while (true) {
+ try {
+ Map<String, String> map = SuningOrderCMQManager.getInstance().consumeSuningOrder(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<SuningOrderInfo> orderList = suningOrderService.listByOrderCode(orderId);
+ if (orderList != null)
+ for (SuningOrderInfo order : orderList)
+ orderProcessService.processSuningOrder(order);
+ }
+ SuningOrderCMQManager.getInstance().deleteSuningOrder(key);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ }
+ }
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
}
}
}
--
Gitblit v1.8.0