From 496c2842240eae09bb56e98e1fae71540a85befa Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 23 七月 2019 14:38:28 +0800
Subject: [PATCH] 大淘客叮咚呛数据缓存

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index 3bb5112..ade2bea 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -775,8 +775,14 @@
 			commonOrder.setCommonOrderGoods(goods);
 		}
 
-		CommonOrder oldCommonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(commonOrder.getOrderNo(),
-				commonOrder.getSourceType(), commonOrder.getOrderBy());
+		CommonOrder oldCommonOrder = null;
+
+		if (!StringUtil.isNullOrEmpty(commonOrder.getTradeId()))
+			oldCommonOrder = commonOrderMapper.selectBySourceTypeAndTradeId(commonOrder.getSourceType(),
+					commonOrder.getTradeId());
+		else
+			oldCommonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(commonOrder.getOrderNo(),
+					commonOrder.getSourceType(), commonOrder.getOrderBy());
 
 		if (oldCommonOrder == null)// 鏂板
 		{
@@ -1204,4 +1210,11 @@
 		return commonOrderMapper.listBySourceTypeAndTradeId(sourceType, tradeId);
 	}
 
+	@Override
+	public List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(int sourceType, Integer state, Long minTime,
+			Long maxTime, int page, int pageSize) {
+		return commonOrderMapper.listBySourceTypeAndStateAndThirdCrateTime(sourceType, state, minTime, maxTime,
+				(page - 1) * pageSize, pageSize);
+	}
+
 }

--
Gitblit v1.8.0