From f4548a3ee46afe45da4ee2a42dc169c575deee9f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 31 七月 2019 11:57:36 +0800
Subject: [PATCH] 动态v2兼容
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java | 63 ++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 10 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 48ae268..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;
@@ -81,23 +83,33 @@
@Transactional
@Override
public void addTaoBaoOrder(String orderId, List<TaoBaoOrder> list) {
+ LogHelper.test("璁㈠崟鍙蜂笌璁㈠崟鏁伴噺:" + orderId + "-" + list.size());
// 楠岃瘉orderby鏄惁姝ｇ‘
- if (list != null && list.size() > 0)
- {
- int maxOrderBy=list.get(0).getOrderBy();
- if(list.size()>1)
- for(TaoBaoOrder order:list)
- {
- if(order.getOrderBy()>maxOrderBy)
- maxOrderBy=order.getOrderBy();
+ if (list != null && list.size() > 0) {
+ int maxOrderBy = list.get(0).getOrderBy();
+ if (list.size() > 1)
+ for (TaoBaoOrder order : list) {
+ if (order.getOrderBy() > maxOrderBy)
+ maxOrderBy = order.getOrderBy();
}
-
+
if (list.size() != maxOrderBy) {
LogHelper.test("鎹曟崏鍒版帓搴忓�奸敊璇�:" + orderId);
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) {
for (TaoBaoOrder taoBaoOrder : list) {
@@ -161,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