From bd8213ddfe04f41b7ad0f4c6377afbe39a44b4af Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 18 一月 2019 15:54:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 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 e20361f..b2da8c8 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
@@ -39,7 +39,15 @@
 			@Param("orderState") Integer orderState, @Param("orderNo") String orderNo,
 			@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day);
 
-
+	/**
+	 * 鍒ゆ柇閮ㄥ垎澶辨晥鐘舵��
+	 * @param uid
+	 * @param orderNo
+	 * @return
+	 */
+	CommonOrderVO getBuFenOrderState(@Param("uid") Long uid,  @Param("orderNo") String orderNo);
+	
+	
 	/**
 	 * 鏍规嵁鐢ㄦ埛ID锛岃鍗曠姸鎬佸拰璁㈠崟缁撶畻鏃堕棿缁熻璁㈠崟鐨勬暟閲�
 	 * 

--
Gitblit v1.8.0