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

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 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 c7bbf51..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
@@ -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