From 7665849db56ce2e0212078f942602b6cfc6c22ad Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 五月 2020 10:19:15 +0800
Subject: [PATCH] 苏宁相关代码添加
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 80 +++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 41 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..2476fe7 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;
@@ -36,7 +37,6 @@
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.entity.vipshop.VipShopOrder;
import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;
import com.yeshi.fanli.exception.order.dividents.TeamDividentsRecordException;
import com.yeshi.fanli.log.LogHelper;
@@ -52,7 +52,6 @@
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.tb.TaoBaoOrderService;
-import com.yeshi.fanli.service.inter.order.vipshop.VipShopOrderService;
import com.yeshi.fanli.service.inter.push.DeviceActiveService;
import com.yeshi.fanli.service.inter.push.IOSPushService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
@@ -71,7 +70,6 @@
import com.yeshi.fanli.util.cmq.order.PDDOrderCMQManager;
import com.yeshi.fanli.util.cmq.order.PlaceOrderCMQManager;
import com.yeshi.fanli.util.cmq.order.TeamOrderCMQManager;
-import com.yeshi.fanli.util.cmq.order.VipShopOrderCMQManager;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
/**
@@ -152,8 +150,8 @@
@Resource
private TeamEincomeManager teamEincomeManager;
- @Resource
- private VipShopOrderService vipShopOrderService;
+// @Resource
+// private VipShopOrderService vipShopOrderService;
private static boolean isInited = false;
@@ -179,7 +177,6 @@
doTaoBaoOrders();// 澶勭悊娣樺疂璁㈠崟
doTaoBaoNewOrders();// 澶勭悊娣樺疂璁㈠崟锛堝垰鍒氫骇鐢熺殑锛�
doOrderFanLiNew();// 鏂扮増杩斿埄
-
doOrderShareFanLi();
doWeiQuanOrder();// 澶勭悊缁存潈璁㈠崟
doPushIOS();// 澶勭悊鍙戦�両OS娑堟伅
@@ -188,7 +185,7 @@
doUpdateGoodsJob(); // 鏇存柊鍟嗗搧闃熷垪
doJDOrderJob();// 浜笢璁㈠崟澶勭悊
doPDDOrderJob();// 鎷煎澶氳鍗曞鐞�
- doVipShopOrderJob();// 鍞搧浼氳鍗曞鐞�
+// doVipShopOrderJob();// 鍞搧浼氳鍗曞鐞�
doImportantTaoBaoGoodsUpdateJob();// 娣樺疂閲嶈鍟嗗搧鐨勪俊鎭洿鏂�
doHongBaoRecieveIntegralGetJob();// 杩斿埄鍒拌处锛岄噾甯佸鍔�
// doPlaceOrderIntegralJob();// 涓嬪崟璧犻�侀噾甯佷换鍔�
@@ -199,6 +196,7 @@
doOrderTeamIncomeFanLi();
doDividentsJob();
}
+
}
/**
@@ -405,7 +403,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();
}
@@ -714,39 +712,39 @@
}
- public void doVipShopOrderJob() {
- executor.execute(new Runnable() {
- @Override
- public void run() {
- while (true) {
- try {
- Map<String, String> map = VipShopOrderCMQManager.getInstance().consumeVipShopOrder(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<VipShopOrder> orderList = vipShopOrderService.listByOrderSn(orderId);
- if (orderList != null)
- for (VipShopOrder order : orderList)
- orderProcessService.processVipShopOrder(order);
- }
- VipShopOrderCMQManager.getInstance().deleteVipShopOrder(key);
- } catch (Exception e) {
- LogHelper.errorDetailInfo(e);
- }
- }
- }
- } catch (Exception e) {
- LogHelper.error("鎷煎澶氳鍗�:" + e.getMessage());
- }
- }
- }
- });
-
- }
+// public void doVipShopOrderJob() {
+// executor.execute(new Runnable() {
+// @Override
+// public void run() {
+// while (true) {
+// try {
+// Map<String, String> map = VipShopOrderCMQManager.getInstance().consumeVipShopOrder(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<VipShopOrder> orderList = vipShopOrderService.listByOrderSn(orderId);
+// if (orderList != null)
+// for (VipShopOrder order : orderList)
+// orderProcessService.processVipShopOrder(order);
+// }
+// VipShopOrderCMQManager.getInstance().deleteVipShopOrder(key);
+// } catch (Exception e) {
+// LogHelper.errorDetailInfo(e);
+// }
+// }
+// }
+// } catch (Exception e) {
+// LogHelper.error("鎷煎澶氳鍗�:" + e.getMessage());
+// }
+// }
+// }
+// });
+//
+// }
/**
* 閲嶈鐨勬窐瀹濆晢鍝佷俊鎭洿鏂�
--
Gitblit v1.8.0