From 010760fd974453a70948fef465284d8c817314f5 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 25 三月 2020 11:27:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div-1
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
index 8e8aec4..adccd27 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
@@ -211,6 +211,18 @@
@Param("payment") BigDecimal payment);
+
+ /**
+ * 娉細1绗斾笖浠樻鎬婚噾棰濅笉灏忎簬 payment 鍏冿紙閫�娆句负澶辨晥
+ * @param uid
+ * @param list 绫诲瀷
+ * @return
+ */
+ Long counOrderByUidAndOrderType(@Param("uid") Long uid, @Param("payment") BigDecimal payment,
+ @Param("type") int type);
+
+
+
/**
* 鏌ヨ鐢ㄦ埛涓被鍨嬮璁″閲�
* @param uid
@@ -229,7 +241,7 @@
* @param preDay
* @return
*/
- Integer countOrderByTypeAndDate(@Param("orderType") Integer orderType, @Param("preDay") String preDay);
+ Long countOrderByTypeAndDate(@Param("orderType") Integer orderType, @Param("preDay") String preDay);
}
\ No newline at end of file
--
Gitblit v1.8.0