From 30d8e227e8d823b6c38c3b9c90ac2df03b63befe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 二月 2025 16:41:22 +0800
Subject: [PATCH] 淘宝转链接口更新
---
fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java | 39 ++++++++++++++-------------------------
1 files changed, 14 insertions(+), 25 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java b/fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java
index 3d8ed88..c2c5c21 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java
@@ -1,20 +1,5 @@
package com.yeshi.fanli.job.order.taobao;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Component;
-
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
import com.yeshi.fanli.dto.taobao.WeiQuanOrderResult;
@@ -24,24 +9,25 @@
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
import com.yeshi.fanli.log.LogHelper;
-import com.yeshi.fanli.service.inter.common.DataMonitorService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.LostOrderService;
-import com.yeshi.fanli.service.inter.order.OrderMoneySettleService;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;
-import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
-import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
-import org.yeshi.utils.TimeUtil;
+import com.yeshi.fanli.util.mq.rabbit.RabbitmqManager;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
-import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.util.taobao.TaoKeOrderApiUtil;
+import org.springframework.stereotype.Component;
+import org.yeshi.utils.TimeUtil;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.*;
//浠庢窐瀹濈埇鍘昏鍗曟洿鏂�
@Component
@@ -69,6 +55,9 @@
@Resource
private CommonOrderService commonOrderService;
+
+ @Resource
+ private RabbitmqManager rabbitmqManager;
/**
@@ -234,7 +223,7 @@
}
- CMQManager.getInstance().addTaoBaoOrderMsg(key);
+ rabbitmqManager.addTaoBaoOrderMsg(key);
try {
// 6灏忔椂鍐呬笉鍐嶅鐞�
@@ -376,7 +365,7 @@
// 娣樺疂鎺ㄥ箍璁㈠崟 姣忛殧1鍒嗘墽琛屼竴娆�
private void pullLatestCommonOrder() {
LogHelper.job("pullLatestCommonOrder");
- Date systemDate = TaoKeApiUtil.getTaoBaoSystemTime();
+ Date systemDate =new Date(); //TaoKeApiUtil.getTaoBaoSystemTime();
long endTime = systemDate != null ? systemDate.getTime() : System.currentTimeMillis();
updateOrder(endTime - 1000 * 60 * 20L, endTime);
}
@@ -384,7 +373,7 @@
// 鐖彇鏈�杩戜竴澶╃殑甯歌璁㈠崟锛�30鍒嗛挓涓�娆★級
private void pullLatestDayCommonOrder() {
LogHelper.job("pullLatestCommonOrder");
- Date systemDate = TaoKeApiUtil.getTaoBaoSystemTime();
+ Date systemDate = new Date();//TaoKeApiUtil.getTaoBaoSystemTime();
long endTime = systemDate != null ? systemDate.getTime() : System.currentTimeMillis();
updateOrder(endTime - 1000 * 60 * 60 * 24L, endTime);
}
@@ -392,7 +381,7 @@
// 鐖彇鏈�杩戜笁澶╃殑甯歌璁㈠崟锛�6涓皬鏃朵竴娆★級
private void pullLatest3DayCommonOrder() {
LogHelper.job("pullLatestCommonOrder");
- Date systemDate = TaoKeApiUtil.getTaoBaoSystemTime();
+ Date systemDate = new Date();//TaoKeApiUtil.getTaoBaoSystemTime();
long endTime = systemDate != null ? systemDate.getTime() : System.currentTimeMillis();
updateOrder(endTime - 1000 * 60 * 60 * 24 * 3L, endTime);
}
--
Gitblit v1.8.0