From 8ce7c720e4e7a604b0ff770349b5556f39d37759 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 九月 2021 11:44:38 +0800
Subject: [PATCH] 好省呗应用兼容
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/order/TaoBaoOrderController.java | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/order/TaoBaoOrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/order/TaoBaoOrderController.java
index c79d034..9ffd6f8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/order/TaoBaoOrderController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/order/TaoBaoOrderController.java
@@ -2,8 +2,10 @@
import com.google.gson.*;
import com.yeshi.common.entity.PageEntity;
+import com.yeshi.fanli.dao.taobao.TaoBaoOrderBackUpDao;
import com.yeshi.fanli.entity.accept.AdminAcceptData;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
+import com.yeshi.fanli.entity.taobao.TaoBaoOrderBackUp;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
import com.yeshi.fanli.job.order.taobao.UpdateOrderJob;
import com.yeshi.fanli.job.order.taobao.UpdateTBRelationAndSpecialOrderJob;
@@ -14,6 +16,7 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
+import com.yeshi.fanli.util.taobao.TaoKeOrderApiUtil;
import net.sf.json.JSONObject;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -48,6 +51,9 @@
@Resource
private OrderProcessService orderProcessService;
+
+ @Resource
+ private TaoBaoOrderBackUpDao taoBaoOrderBackUpDao;
/**
* 鏌ヨ鍒楄〃 - 鏂板悗鍙�
@@ -106,7 +112,6 @@
}
-
@RequestMapping(value = "listTaoBaoOrderNoUpdate")
public void listTaoBaoOrderUnUpdate(AdminAcceptData acceptData, String callback, String key, Integer pageIndex, PrintWriter out) {
@@ -155,7 +160,6 @@
}
-
@RequestMapping(value = "updateTaoBaoOrder")
public void updateTaoBaoOrder(AdminAcceptData acceptData, String callback, String ids, PrintWriter out) {
try {
@@ -171,24 +175,37 @@
orderIds.add(idsArray.optString(i));
}
- Long[] startTimes = new Long[orderIds.size()];
- Long[] endTimes = new Long[orderIds.size()];
-
int p = 0;
for (Iterator<String> its = orderIds.iterator(); its.hasNext(); ) {
String orderId = its.next();
List<TaoBaoOrder> list = taoBaoOrderService.getTaoBaoOrderByOrderId(orderId);
- startTimes[p] = TimeUtil.convertToTimeTemp(list.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss") - 1000L;
- endTimes[p] = TimeUtil.convertToTimeTemp(list.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss") + 1000L;
- p++;
+ try {
+ //濡傛灉鍒涘缓鏃堕棿瓒呰繃浜�90澶╃殑鎶涘嚭寮傚父
+ if (list.size() == 0 || TimeUtil.convertToTimeTemp(list.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss") < System.currentTimeMillis() - 1000 * 60 * 60L * 24 * 90)
+ throw new Exception("闇�瑕佹湰鍦版洿鏂�");
+ long startTime = TimeUtil.convertToTimeTemp(list.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss") - 1000L;
+ long endTime = TimeUtil.convertToTimeTemp(list.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss") + 1000L;
+ updateRelationAndSpecialOrderJob.updateRelationAndSpecialOrder(startTime, endTime);
+ updateOrderJob.updateOrder(startTime, endTime);
+ } catch (Exception e) {
+ //浠庢湰鍦板浠芥嬁鍑鸿鍗�
+ List<String> tradeIds = new ArrayList<>();
+ for (TaoBaoOrder order : list) {
+ tradeIds.add(order.getTradeId());
+ }
+ List<TaoBaoOrderBackUp> orderBackUps = taoBaoOrderBackUpDao.listByIds(tradeIds);
+ List<TaoBaoOrder> orderList = new ArrayList<>();
+ for (TaoBaoOrderBackUp backUp : orderBackUps) {
+ orderList.add(TaoKeOrderApiUtil.parseTaoBaoOrderNew(JSONObject.fromObject(backUp.getContent())));
+ }
+ updateOrderJob.addOrder(orderList);
+ }
}
- for (int i = 0; i < idsArray.size(); i++) {
- updateRelationAndSpecialOrderJob.updateRelationAndSpecialOrder(startTimes[i], endTimes[i]);
- updateOrderJob.updateOrder(startTimes[i], endTimes[i]);
- }
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鏇存柊鎴愬姛"));
} catch (Exception e) {
+
+
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏇存柊澶辫触"));
e.printStackTrace();
}
--
Gitblit v1.8.0