From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 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..59cc845 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,35 @@
}
}
+ @Override
+ public TaoBaoOrder selectByTradeId(String tradeId) {
+ return taoBaoOrderMapper.selectTaoBaoOrderByTradeId(tradeId);
+ }
+
+ @Override
+ public List<TaoBaoOrder> listAllOrder(int page, int pageSize) {
+ return taoBaoOrderMapper.listAllOrder(null, (page - 1) * pageSize, pageSize);
+ }
+
+ @Override
+ public long countAllOrder() {
+ return taoBaoOrderMapper.countAllOrder(null);
+ }
+
+ @Override
+ public TaoBaoOrder selectByPrimaryKey(Long id) {
+ return taoBaoOrderMapper.selectByPrimaryKey(id);
+ }
+
+ @Override
+ public List<TaoBaoOrder> listBySettlementTime(Long minTime, Long maxTime, int page, int pageSize) {
+
+ return taoBaoOrderMapper.listBySettlementTime(minTime, maxTime, (page - 1) * pageSize, pageSize);
+ }
+
+ @Override
+ public Long countBySettlementTime(Long minTime, Long maxTime) {
+ return taoBaoOrderMapper.countBySettlementTime(minTime, maxTime);
+ }
+
}
--
Gitblit v1.8.0