From e40d1c22c7202aac843c66f9ee9cc000744f9e10 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 六月 2020 15:52:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |   20 ++++++++++++++++++--
 1 files changed, 18 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 2c634b0..2419668 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
@@ -444,10 +444,10 @@
 	 */
 	public List<CommonOrderVO> getOrderList(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type,
 			Integer orderState, String orderNo, String startTime, String endTime, Integer dateType,
-			List<Integer> listSource, boolean notBackSuVip) throws CommonOrderException, Exception;
+			List<Integer> listSource) throws CommonOrderException, Exception;
 
 	long countOrderList(Long uid, Integer state, Integer type, Integer orderState, String orderNo, String startTime,
-			String endTime, Integer dateType, List<Integer> listSource, boolean notBackSuVip) throws CommonOrderException;
+			String endTime, Integer dateType, List<Integer> listSource);
 
 	/**
 	 * 缁存潈閲戦璁＄畻
@@ -480,4 +480,20 @@
 	 */
 	public List<CommonOrder> listByOrderNo(String orderNo);
 
+	/**
+	 * 鏍规嵁璁㈠崟绫诲瀷+ 璁㈠崟鍙锋煡璇�
+	 * @param uid
+	 * @param orderNO
+	 * @param sourceType
+	 * @return
+	 */
+	public List<CommonOrder> getByOrderNoAndSourceType(Long uid, String orderNO, int sourceType);
+
+	/**
+	 * 棣栧崟
+	 * @param uid
+	 * @return
+	 */
+	public CommonOrder getFirstOrder(Long uid);
+
 }

--
Gitblit v1.8.0