From afe61a27c4f77db65df66b0ff5dc93cbd3e0014b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 六月 2020 17:49:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 6b0ac36..96cfd0a 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
@@ -140,8 +140,17 @@
* @param payment
* @return
*/
- Long countMyDirectOrderByCashArrival(@Param("uid") Long uid, @Param("payment") BigDecimal payment);
+ Long countMyDirectOrderByCashArrival(@Param("uid") Long uid, @Param("payment") BigDecimal payment,
+ @Param("type")Integer type);
+ /**
+ * 娉細1绗斾笖浠樻鎬婚噾棰濅笉灏忎簬 payment 鍏冿紙閫�娆句负澶辨晥
+ * @param uid
+ * @param payment
+ * @return
+ */
+ Long countMyDirectOrderByCashNotArrival(@Param("uid") Long uid, @Param("payment") BigDecimal payment,
+ @Param("type")Integer type);
/**
@@ -154,7 +163,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