From baacd1378b33c4a84ee7a4998fb08fd9979ee4e1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 09 一月 2019 11:02:52 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 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 f92fb29..d4cf9b6 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
@@ -1,6 +1,7 @@
package com.yeshi.fanli.dao.mybatis.order;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -38,7 +39,6 @@
@Param("orderState") Integer orderState, @Param("orderNo") String orderNo,
@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day);
-
/**
* 缁熻宸插埌璐﹂噾棰� 浠ュ強璁㈠崟鏁伴噺
*
@@ -48,8 +48,21 @@
* @return
*/
- Map<String, Object> countMoneyGroupOrderNoByUid(@Param("uid") Long uid, @Param("type") Integer type, @Param("orderNo") String orderNo,
- @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day);
+ Map<String, Object> countMoneyGroupOrderNoByUid(@Param("uid") Long uid, @Param("type") Integer type,
+ @Param("orderNo") String orderNo, @Param("startTime") String startTime, @Param("endTime") String endTime,
+ @Param("day") Integer day);
+
+ /**
+ * 鏍规嵁鐢ㄦ埛ID锛岃鍗曠姸鎬佸拰璁㈠崟缁撶畻鏃堕棿缁熻璁㈠崟鐨勬暟閲�
+ *
+ * @param uid
+ * @param state
+ * @param minDate
+ * @param maxDate
+ * @return
+ */
+ long countByUidAndOrderStateWithOrderBalanceTime(@Param("uid")Long uid, @Param("state")int state,@Param("minDate") Date minDate,@Param("maxDate") Date maxDate);
+
/**
* 鏍规嵁璁㈠崟鍙枫�佽鍗曠被鍨嬫煡璇㈠晢鍝�
*
--
Gitblit v1.8.0