From 0d9ac58dc11f54351e5e18dba8e950717d78019f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 09 九月 2019 14:55:24 +0800
Subject: [PATCH] 搜索发现

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java |   56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 55 insertions(+), 1 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..0181087 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,14 @@
 package com.yeshi.fanli.service.impl.taobao;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 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;
 
@@ -33,6 +38,13 @@
 	@Resource
 	private TaoBaoOrderTradeMapMapper taoBaoOrderTradeMapMapper;
 
+	/**
+	 * 鑾峰彇璁㈠崟鐨勫搱甯屽��
+	 * 
+	 * @param list
+	 * @return
+	 */
+
 	@Override
 	public void addTaoBaoOrderList(List<TaoBaoOrder> list) {
 		if (list == null || list.size() == 0)
@@ -41,7 +53,7 @@
 		Iterator<String> its = map.keySet().iterator();
 		while (its.hasNext()) {
 			String orderId = its.next();
-			String key = "addorder-" + orderId;
+			String key = "addorder-" + TaoBaoOrderUtil.getOrderDataHashCode(map.get(orderId));
 			// redis鍋氶鐜囬檺鍒�
 			try {
 				if (Constant.IS_OUTNET) {
@@ -95,6 +107,17 @@
 				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);
@@ -160,4 +183,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