From 712fb305d6f79961e879a2f543107e19d7f9e8a2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 11 五月 2020 10:08:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/tb/TaoBaoOrderServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/tb/TaoBaoOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/tb/TaoBaoOrderServiceImpl.java
index f238cdf..d2988bf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/tb/TaoBaoOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/tb/TaoBaoOrderServiceImpl.java
@@ -137,8 +137,17 @@
// 鏈夐噸澶嶇殑浜ゆ槗ID涓嶅鐞�
if (tradesIds.size() != list.size()) {
+ // 鍘婚櫎閲嶅浜ゆ槗ID
+ tradesIds = new HashSet<>();
+ for (int i = 0; i < list.size(); i++) {
+ if (tradesIds.contains(list.get(i).getTradeId())) {
+ list.remove(i--);
+ } else
+ tradesIds.add(list.get(i).getTradeId());
+ }
+
LogHelper.test("妫�娴嬪埌浜ゆ槗ID閲嶅闂:" + orderId);
- throw new Exception();
+// throw new Exception();
}
List<TaoBaoOrder> oldOrderList = taoBaoOrderMapper.selectTaoBaoOrderByOrderId(orderId);
--
Gitblit v1.8.0