From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/tb/TaoBaoOrderServiceImpl.java | 12 +++++++++++-
1 files changed, 11 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 028f526..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);
@@ -177,6 +186,7 @@
// 鎻愪氦浜嬪姟
transactionManager.commit(transactionStatus);
} catch (Exception e) {
+ e.printStackTrace();
transactionManager.rollback(transactionStatus);
}
}
--
Gitblit v1.8.0