From 26b5b1a6bbbb5ff64dc2ec73cf8b11f1aa61c1c5 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:03:25 +0800
Subject: [PATCH] Merge branch 'div_8'

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java
index 51927ec..923f122 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java
@@ -1,5 +1,6 @@
 package com.yeshi.fanli.dao.mybatis.order;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -25,4 +26,30 @@
 	List<Map<String, Object>> countOrderNumber( @Param("dateType") Integer dateType, @Param("year") String year, 
 			@Param("startTime")String startTime, @Param("endTime")String endTime);
 
+	
+	/**
+	 * 濂栭噾缁熻
+	 * 
+	 * @param uid
+	 * @return
+	 */
+	Map<String, Object> countOrderNumberBySettleTime(@Param("uid")Long uid, @Param("state")Integer state,
+			@Param("day")Integer day);
+	
+	
+	/**
+	 *   缁熻鑷喘銆佸垎浜湁鏁堣鍗曟暟閲�
+	 * 
+	 * @param uid
+	 * @return
+	 */
+	long countValidOrder(@Param("uid")Long uid);
+	
+	/**
+	 * 鏍规嵁璁㈠崟鍙� 鏌ヨ閲戦
+	 * @param orderNo
+	 * @return
+	 */
+	BigDecimal getMoneyByOrderNo(@Param("orderNo")String orderNo);
+	
 }
\ No newline at end of file

--
Gitblit v1.8.0