From 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 29 四月 2019 08:59:47 +0800
Subject: [PATCH] Merge branch 'div_develop' into master_develop
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java
index bb972ea..c7493f6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java
@@ -1,9 +1,11 @@
package com.yeshi.fanli.service.impl.taobao;
import java.util.Date;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import javax.annotation.Resource;
@@ -96,6 +98,17 @@
return;
}
}
+ // 楠岃瘉tradeId闂
+ Set<String> tradesIds = new HashSet<>();
+ for (TaoBaoOrder order : list) {
+ tradesIds.add(order.getTradeId());
+ }
+
+ // 鏈夐噸澶嶇殑浜ゆ槗ID涓嶅鐞�
+ if (tradesIds.size() != list.size()) {
+ LogHelper.test("妫�娴嬪埌浜ゆ槗ID閲嶅闂:" + orderId);
+ return;
+ }
List<TaoBaoOrder> oldOrderList = taoBaoOrderMapper.selectTaoBaoOrderByOrderId(orderId);
if (oldOrderList == null || oldOrderList.size() == 0) {
@@ -160,4 +173,9 @@
}
}
+ @Override
+ public TaoBaoOrder selectByTradeId(String tradeId) {
+ return taoBaoOrderMapper.selectTaoBaoOrderByTradeId(tradeId);
+ }
+
}
--
Gitblit v1.8.0