From 21c1c197ec0dba6da332bf4119c262267dcfb191 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 26 五月 2020 10:29:03 +0800
Subject: [PATCH] 粉丝信息同步调整
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 55 insertions(+), 1 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 ac72c98..43a0078 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -36,7 +36,9 @@
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;
import com.yeshi.fanli.service.inter.ad.DouYinClickEventService;
import com.yeshi.fanli.service.inter.lable.BoutiqueAutoRuleService;
@@ -50,6 +52,7 @@
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;
@@ -68,6 +71,7 @@
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;
/**
@@ -148,6 +152,9 @@
@Resource
private TeamEincomeManager teamEincomeManager;
+ @Resource
+ private VipShopOrderService vipShopOrderService;
+
private static boolean isInited = false;
public void onApplicationEvent(ContextRefreshedEvent arg0) {
@@ -181,6 +188,7 @@
doUpdateGoodsJob(); // 鏇存柊鍟嗗搧闃熷垪
doJDOrderJob();// 浜笢璁㈠崟澶勭悊
doPDDOrderJob();// 鎷煎澶氳鍗曞鐞�
+ doVipShopOrderJob();// 鍞搧浼氳鍗曞鐞�
doImportantTaoBaoGoodsUpdateJob();// 娣樺疂閲嶈鍟嗗搧鐨勪俊鎭洿鏂�
doHongBaoRecieveIntegralGetJob();// 杩斿埄鍒拌处锛岄噾甯佸鍔�
// doPlaceOrderIntegralJob();// 涓嬪崟璧犻�侀噾甯佷换鍔�
@@ -706,6 +714,40 @@
}
+ 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());
+ }
+ }
+ }
+ });
+
+ }
+
/**
* 閲嶈鐨勬窐瀹濆晢鍝佷俊鎭洿鏂�
*/
@@ -1162,7 +1204,19 @@
try {
teamDividentsManager.addToTeamEincome(dto.getUid(), dto.getDate());
TeamOrderCMQManager.getInstance().deleteTeamDividentsPreMsg(key);
- } catch (Exception e) {
+ } catch (TeamDividentsRecordException e1) {
+ if (e1.getCode() == TeamDividentsRecordException.CODE_EXIST) {
+ TeamOrderCMQManager.getInstance().deleteTeamDividentsPreMsg(key);
+ } else {
+ try {
+ LogHelper.errorDetailInfo(e1);
+ } catch (Exception e2) {
+ e2.printStackTrace();
+ }
+ }
+ }
+
+ catch (Exception e) {
try {
LogHelper.errorDetailInfo(e);
} catch (Exception e1) {
--
Gitblit v1.8.0