From cd4d7c2ff85d68aebec276073020224b5de56415 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 05 十一月 2019 10:29:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
index 713aa4c..4ca7ae7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
@@ -223,11 +223,13 @@
 	 */
 
 	public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state,
-			Integer type, Integer orderState, String startTime, String endTime, Integer source)
+			Integer type, Integer orderState, String startTime, String endTime, Integer source,
+			List<Long> listShopId, List<Long> listGoodsId, Date minTime, BigDecimal money)
 			throws CommonOrderException;
 
 	public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,
-			String startTime, String endTime, Integer source) throws CommonOrderException;
+			String startTime, String endTime, Integer source, 
+			List<Long> listShopId, List<Long> listGoodsId,Date minTime, BigDecimal money) throws CommonOrderException;
 
 	/**
 	 * 鏌ヨ璁㈠崟
@@ -303,5 +305,29 @@
 	 * @return
 	 */
 	public CommonOrder selectLatestValidByUid(Long uid);
+	
+	/**
+	 * 鏌ヨ棣栫瑪鏈夋晥璁㈠崟
+	 * @param uid  
+	 * @return
+	 */
+	public CommonOrderVO firstValidOrderByUid(Long uid);
+	
+
+	/**
+	 * 鏌ヨ棣栫瑪鏈夋晥璁㈠崟
+	 * @param uid  
+	 * @param type 绫诲瀷锛� 1鑷喘  2鍒嗕韩 3閭�璇�
+	 * @return
+	 */
+	public CommonOrderVO firstValidOrderByUidAndType(Long uid, Integer type);
+
+	/**
+	 * 鏌ヨ鏄惁涓婃湀鍒拌处璁㈠崟
+	 * @param uid
+	 * @param type 绫诲瀷锛� 1鑷喘  2鍒嗕韩 3閭�璇�
+	 * @return
+	 */
+	public CommonOrderVO firstValidOrderLastMonthByUidAndType(Long uid, Integer type);
 
 }

--
Gitblit v1.8.0