From 6a47350594a4843f6cc36e5c94902d6fa97a6d4a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 15 六月 2020 16:33:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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 96cfd0a..8a44fad 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
@@ -144,16 +144,29 @@
@Param("type")Integer type);
/**
- * 娉細1绗斾笖浠樻鎬婚噾棰濅笉灏忎簬 payment 鍏冿紙閫�娆句负澶辨晥
+ * 缁熻宸插埌璐﹁鍗曟暟閲�
* @param uid
- * @param payment
+ * @param payment -浠樻閲戦
+ * @param type -绫诲瀷锛� 1鑷喘 2鍒嗕韩 3閭�璇� 4鑷喘+鍒嗕韩
+ * @param dateType 1鏈湀
* @return
*/
- Long countMyDirectOrderByCashNotArrival(@Param("uid") Long uid, @Param("payment") BigDecimal payment,
- @Param("type")Integer type);
+ Long countOrderByCashArrival(@Param("uid") Long uid, @Param("payment") BigDecimal payment,
+ @Param("type")Integer type, @Param("dateType")Integer dateType);
/**
+ * 缁熻鏈埌璐﹁鍗曟暟閲�
+ * @param uid
+ * @param payment -浠樻閲戦
+ * @param type -绫诲瀷锛� 1鑷喘 2鍒嗕韩 3閭�璇� 4鑷喘+鍒嗕韩
+ * @param dateType 1鏈湀
+ * @return
+ */
+ Long countOrderByCashNotArrival(@Param("uid") Long uid, @Param("payment") BigDecimal payment,
+ @Param("type")Integer type, @Param("dateType")Integer dateType);
+
+ /**
* 鏌ヨ鐢ㄦ埛涓被鍨嬮璁″閲�
* @param uid
* @param dateType 鏃ユ湡绫诲瀷
--
Gitblit v1.8.0