From b56c7f8fa63e0150f621b02f425053ce0d48c2f1 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 01 十一月 2019 11:40:05 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java |   10 ++++++++++
 1 files changed, 10 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 ea15e8c..624e1bd 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
@@ -300,4 +300,14 @@
 	 */
 	List<CommonOrder> listByUid(@Param("uid")Long uid,@Param("stateList") List<Integer> stateList,@Param("start") long start,@Param("count") int count);
 
+	
+	/**
+	 * 鏌ヨ棣栫瑪鏈夋晥鍒拌处璁㈠崟
+	 * @param uid  
+	 * @param type 绫诲瀷锛� 1鑷喘  2鍒嗕韩 3閭�璇�
+	 * @return
+	 */
+	CommonOrderVO firstValidOrderByUid(@Param("uid") Long uid, @Param("typeHB") Integer typeHB,
+			@Param("typeDate") Integer typeDate);
+	
 }
\ No newline at end of file

--
Gitblit v1.8.0