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/dao/mybatis/order/CommonOrderMapper.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
index 655c4e9..8d44657 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
@@ -15,6 +15,7 @@
 
 public interface CommonOrderMapper extends BaseMapper<CommonOrder> {
 
+	
 	/**
 	 * 鏌ヨ鐢ㄦ埛璁㈠崟 骞惰鍗曞彿鍒嗙粍
 	 * 
@@ -302,6 +303,15 @@
 	 * @return
 	 */
 	List<CommonOrder> getByOrderNo(@Param("uid") Long uid, @Param("orderNo") String orderNo);
+	
+	/**
+	 * 鏍规嵁璁㈠崟鍙锋煡璇�
+	 * 
+	 * @param orderNO
+	 * @return
+	 */
+	List<CommonOrder> getByOrderNoAndSourceType(@Param("uid") Long uid, @Param("orderNo") String orderNo,
+			@Param("sourceType") int sourceType);
 
 	
 	/**
@@ -423,4 +433,19 @@
 	 */
 	String getNewestOrderNoByTaoBao();
 	
+	/**
+	 * 鏍规嵁璁㈠崟鍙疯繘琛宻ous
+	 * @param orderNo
+	 * @return
+	 */
+	List<CommonOrder> listByOrderNo(@Param("orderNo") String orderNo);
+	
+	
+	/**
+	 * 鑾峰彇棣栦釜璁㈠崟
+	 * @param orderNo
+	 * @return
+	 */
+	CommonOrder getFirstOrder(@Param("uid") Long uid);
+	
 }
\ No newline at end of file

--
Gitblit v1.8.0