From 0e5c33fc0bc6c3b70ccf649f14ca1ac3fa4431d6 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 22 六月 2020 17:57:49 +0800
Subject: [PATCH] 云发单匹配群 bug
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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 51c6b40..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,14 +144,27 @@
@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);
/**
* 鏌ヨ鐢ㄦ埛涓被鍨嬮璁″閲�
@@ -163,7 +176,8 @@
BigDecimal getRewardMoneyByDate(@Param("uid") Long uid, @Param("day")Integer dateType,
@Param("type") Integer hbType, @Param("orderState") Integer orderState,
@Param("orderNo") String orderNo, @Param("moneyState") Integer moneyState,
- @Param("startTime") String startTime, @Param("endTime") String endTime,@Param("listSource") List<Integer> listSource);
+ @Param("startTime") String startTime, @Param("endTime") String endTime,
+ @Param("listSource") List<Integer> listSource);
/**
* 缁熻鍚勪釜璁㈠崟绫诲瀷 鏈夋晥涓暟
--
Gitblit v1.8.0