From 5e7b0ed4a154ad067cbcf4aa1a1c7cce32f9864c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 26 四月 2024 18:02:17 +0800
Subject: [PATCH] 唯品会链接解析升级
---
fanli/src/main/java/com/yeshi/fanli/service/manger/JobManager.java | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 101 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/manger/JobManager.java b/fanli/src/main/java/com/yeshi/fanli/service/manger/JobManager.java
index 611feb9..9236c69 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/manger/JobManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/manger/JobManager.java
@@ -4,9 +4,11 @@
import com.yeshi.fanli.dto.ad.DouYinDeviceActiveQueueDTO;
import com.yeshi.fanli.dto.money.UserMoneyChangeDTO;
import com.yeshi.fanli.dto.mq.UidDateDTO;
+import com.yeshi.fanli.dto.mq.order.body.CommonOrderMQMsg;
import com.yeshi.fanli.dto.push.PushContentDetailDTO;
import com.yeshi.fanli.entity.ad.DouYinClickEvent;
import com.yeshi.fanli.entity.bus.user.*;
+import com.yeshi.fanli.entity.dy.DYOrder;
import com.yeshi.fanli.entity.jd.JDOrder;
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.order.HongBaoOrder;
@@ -29,6 +31,7 @@
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
+import com.yeshi.fanli.service.inter.order.dy.DYOrderService;
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;
@@ -43,10 +46,7 @@
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.manger.money.TeamEincomeManager;
import com.yeshi.fanli.service.manger.order.TeamDividentsManager;
-import com.yeshi.fanli.util.CMQManager;
-import com.yeshi.fanli.util.RedisKeyEnum;
-import com.yeshi.fanli.util.RedisManager;
-import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.*;
import com.yeshi.fanli.util.ad.DouYinAdUtil;
import com.yeshi.fanli.util.mq.cmq.DouYinDeviceActiveCMQManager;
import com.yeshi.fanli.util.mq.cmq.HongBaoRecieveCMQManager;
@@ -55,6 +55,8 @@
import com.yeshi.fanli.util.mq.cmq.order.*;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Component;
import org.yeshi.utils.NumberUtil;
@@ -67,6 +69,9 @@
@Component
public class JobManager {
+
+ Logger orderMoneyLog = LoggerFactory.getLogger("orderMoneyLog");
+
@Resource
private BoutiqueAutoRuleService boutiqueAutoRuleService;
@@ -134,6 +139,9 @@
private SuningOrderService suningOrderService;
@Resource
+ private DYOrderService dyOrderService;
+
+ @Resource
private HWPushService hwPushService;
private Map<String, Long> latestRunTimeMap = new HashMap<>();
@@ -171,6 +179,7 @@
doPDDOrderJob();// 鎷煎澶氳鍗曞鐞�
doVipShopOrderJob();// 鍞搧浼氳鍗曞鐞�
doSuningOrderJob();// 鑻忓畞璁㈠崟澶勭悊
+ doAllOrderJob();//鎵�鏈夎鍗曞鐞�
doImportantTaoBaoGoodsUpdateJob();// 娣樺疂閲嶈鍟嗗搧鐨勪俊鎭洿鏂�
doHongBaoRecieveIntegralGetJob();// 杩斿埄鍒拌处锛岄噾甯佸鍔�
// doPlaceOrderIntegralJob();// 涓嬪崟璧犻�侀噾甯佷换鍔�
@@ -432,8 +441,9 @@
String handler = its.next();
try {
UidDateDTO dto = map.get(handler);
+ orderMoneyLog.info("鍥㈤槦鏀剁泭缁撶畻寮�濮嬪鐞嗭細鏃ユ湡-{} Uid-{}", TimeUtil.getGernalTime(dto.getDate().getTime(), "yyyy-MM-dd"), dto.getUid());
teamEincomeManager.addTeamRewardTOUserAccount(dto.getDate(), dto.getUid());
- TeamOrderCMQManager.getInstance().deleteTeamIncomeMsg(handler);
+ orderMoneyLog.info("鍥㈤槦鏀剁泭缁撶畻澶勭悊鎴愬姛锛氭棩鏈�-{} Uid-{}", TimeUtil.getGernalTime(dto.getDate().getTime(), "yyyy-MM-dd"), dto.getUid());
} catch (Exception e) {
try {
LogHelper.errorDetailInfo(e, map.get(handler).toString(), "");
@@ -441,6 +451,8 @@
e1.printStackTrace();
}
}
+ //鏃犺缁撶畻鏄惁鎴愬姛閮藉垹闄ゆ秷鎭�
+ TeamOrderCMQManager.getInstance().deleteTeamIncomeMsg(handler);
}
}
} catch (Exception e) {
@@ -577,12 +589,12 @@
public void run() {
super.run();
try {
- Map<String, Long> map = CMQManager.getInstance().consumeNeedUpdateTaoBaoGoodsIdMsg(16);
+ Map<String, String> map = CMQManager.getInstance().consumeNeedUpdateTaoBaoGoodsIdMsg(16);
if (map != null) {
Iterator<String> its = map.keySet().iterator();
while (its.hasNext()) {
String key = its.next();
- taoBaoGoodsUpdateService.updateByTaoKeGoodsDetail(Long.parseLong(key));
+ taoBaoGoodsUpdateService.updateByTaoKeGoodsDetail(map.get(key));
CMQManager.getInstance().deleteNeedUpdateTaoBaoGoodsIdMsg(key);
}
}
@@ -682,6 +694,7 @@
Iterator<String> its = map.keySet().iterator();
while (its.hasNext()) {
String key = its.next();
+ LogHelper.test("鎷煎澶氳鍗曞鐞嗗紑濮嬶細" + key);
try {
String orderId = map.get(key);
if (!StringUtil.isNullOrEmpty(orderId)) {
@@ -691,7 +704,9 @@
orderProcessService.processPDDOrder(order);
}
PDDOrderCMQManager.getInstance().deletePDDOrder(key);
+ LogHelper.test("鎷煎澶氳鍗曞鐞嗘垚鍔燂細" + key);
} catch (Exception e) {
+ LogHelper.test("鎷煎澶氳鍗曞鐞嗗け璐ワ細" + key);
LogHelper.errorDetailInfo(e);
}
}
@@ -774,6 +789,84 @@
}
+
+ public void doAllOrderJob() {
+ String methodName = getMethodName(Thread.currentThread());
+ new JobThreadExecutorServiceImpl().run(new MyRunnable(methodName) {
+ @Override
+ public void run() {
+ super.run();
+ try {
+ Map<String, CommonOrderMQMsg> map = OrdersCMQManager.getInstance().consumeOrders(16);
+ if (map != null) {
+ Iterator<String> its = map.keySet().iterator();
+ while (its.hasNext()) {
+ String key = its.next();
+ try {
+ CommonOrderMQMsg orderMQMsg = map.get(key);
+ LogHelper.test("璁㈠崟娑堣垂:" + new Gson().toJson(orderMQMsg));
+ if (orderMQMsg != null) {
+ String orderId = orderMQMsg.getOrderId();
+ switch (orderMQMsg.getSourceType()) {
+ case Constant
+ .SOURCE_TYPE_JD: {
+ JDOrder order = jdOrderService.selectDetailByOrderId(Long.parseLong(orderId));
+ orderProcessService.processJDOrder(order);
+ }
+ break;
+ case Constant
+ .SOURCE_TYPE_PDD: {
+ List<PDDOrder> orderList = pddOrderService.selectByOrderSn(orderId);
+ if (orderList != null)
+ for (PDDOrder order : orderList)
+ orderProcessService.processPDDOrder(order);
+ }
+ break;
+ case Constant
+ .SOURCE_TYPE_VIP: {
+ List<VipShopOrder> orderList = vipShopOrderService.listDetailByOrderSn(orderId);
+ if (orderList != null)
+ for (VipShopOrder order : orderList)
+ orderProcessService.processVipShopOrder(order);
+ }
+ break;
+ case Constant
+ .SOURCE_TYPE_SUNING: {
+ List<SuningOrderInfo> orderList = suningOrderService.listByOrderCode(orderId);
+ if (orderList != null)
+ for (SuningOrderInfo order : orderList)
+ orderProcessService.processSuningOrder(order);
+ }
+ break;
+ case Constant
+ .SOURCE_TYPE_DY: {
+ List<DYOrder> orderList = dyOrderService.listByOrderId(orderId);
+ if (orderList != null)
+ for (DYOrder order : orderList)
+ orderProcessService.processDYOrder(order);
+ }
+ break;
+
+
+ }
+
+
+ }
+ OrdersCMQManager.getInstance().deleteOrder(key);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ }
+ }
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ }
+ });
+
+ }
+
+
/**
* 閲嶈鐨勬窐瀹濆晢鍝佷俊鎭洿鏂�
*/
@@ -785,7 +878,7 @@
@Override
public void run() {
super.run();
- Map<String, Long> map = CMQManager.getInstance().consumeTBImpGoodsUpdateMsg(16);
+ Map<String, String> map = CMQManager.getInstance().consumeTBImpGoodsUpdateMsg(16);
if (map != null) {
Iterator<String> its = map.keySet().iterator();
while (its.hasNext()) {
--
Gitblit v1.8.0