From e40d1c22c7202aac843c66f9ee9cc000744f9e10 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 六月 2020 15:52:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 126 ++++++++++++++++++++++++++++-------------
1 files changed, 86 insertions(+), 40 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 2476fe7..06514ad 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -34,9 +34,11 @@
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;
+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;
@@ -51,7 +53,9 @@
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;
import com.yeshi.fanli.service.inter.push.IOSPushService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
@@ -69,7 +73,9 @@
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;
/**
@@ -150,8 +156,11 @@
@Resource
private TeamEincomeManager teamEincomeManager;
-// @Resource
-// private VipShopOrderService vipShopOrderService;
+ @Resource
+ private VipShopOrderService vipShopOrderService;
+
+ @Resource
+ private SuningOrderService suningOrderService;
private static boolean isInited = false;
@@ -185,7 +194,8 @@
doUpdateGoodsJob(); // 鏇存柊鍟嗗搧闃熷垪
doJDOrderJob();// 浜笢璁㈠崟澶勭悊
doPDDOrderJob();// 鎷煎澶氳鍗曞鐞�
-// doVipShopOrderJob();// 鍞搧浼氳鍗曞鐞�
+ doVipShopOrderJob();// 鍞搧浼氳鍗曞鐞�
+ doSuningOrderJob();// 鑻忓畞璁㈠崟澶勭悊
doImportantTaoBaoGoodsUpdateJob();// 娣樺疂閲嶈鍟嗗搧鐨勪俊鎭洿鏂�
doHongBaoRecieveIntegralGetJob();// 杩斿埄鍒拌处锛岄噾甯佸鍔�
// doPlaceOrderIntegralJob();// 涓嬪崟璧犻�侀噾甯佷换鍔�
@@ -193,7 +203,7 @@
doOrderTeamIncomePreFanLi();// 澶勭悊璁㈠崟鎻愭垚杩斿埄
doDividentsPreJob();
- doOrderTeamIncomeFanLi();
+ doOrderTeamRewardFanLi();
doDividentsJob();
}
@@ -419,9 +429,9 @@
}
/**
- * 澶勭悊鍥㈤槦璁㈠崟杩斿埄
+ * 澶勭悊鍥㈤槦濂栭噾杩斿埄
*/
- public void doOrderTeamIncomeFanLi() {
+ public void doOrderTeamRewardFanLi() {
executor.execute(new Runnable() {
@Override
public void run() {
@@ -434,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 {
@@ -712,39 +722,75 @@
}
-// 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);
+ LogHelper.test("鍞搧浼氳鍗曟秷璐�:"+orderId);
+ if (!StringUtil.isNullOrEmpty(orderId)) {
+ List<VipShopOrder> orderList = vipShopOrderService.listDetailByOrderSn(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.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