From e7920b14a9baab97035a1a529da85d124a2bcacd Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 16 六月 2020 10:54:29 +0800
Subject: [PATCH] 云发单对测试用户显示

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponCountMapper.java |   52 +++++++++++++++++++++++++++-------------------------
 1 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponCountMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponCountMapper.java
index a1f0fa7..90eb18d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponCountMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponCountMapper.java
@@ -5,7 +5,6 @@
 
 import org.apache.ibatis.annotations.Param;
 
-import com.yeshi.fanli.dto.ChartTDO;
 import com.yeshi.fanli.entity.bus.user.UserSystemCouponRecord;
 import com.yeshi.fanli.vo.user.SystemCouponVO;
 import com.yeshi.fanli.vo.user.UserSystemCouponCountVO;
@@ -109,39 +108,42 @@
 	Long countFreeCouponRecord(@Param("key") String key, @Param("keyType") Integer keyType,
 			@Param("state") Integer state);
 	
-	/**
-	 * 濂栧姳鍒镐娇鐢ㄦ暟閲忔洸绾垮浘
-	 * @param dateType
-	 * @param year
-	 * @param startTime
-	 * @param endTime
-	 * @return
-	 */
-	List<ChartTDO> getRebateCouponUsedNumToCharts(@Param("dateType") Integer dateType, @Param("year") String year, 
-			@Param("startTime")String startTime, @Param("endTime")String endTime);
 	
 	
 	/**
-	 * 濂栧姳鍒镐娇鐢ㄦ垚鍔熼噾棰濇洸绾垮浘
-	 * @param dateType
-	 * @param year
-	 * @param startTime
-	 * @param endTime
+	 * 缁熻濂栧姳鍒搁噾棰濇垚鍔熼噾棰�
+	 * @param type
+	 * @param preDay
 	 * @return
 	 */
-	List<ChartTDO> getRebateCouponMoneyToCharts(@Param("dateType") Integer dateType, @Param("year") String year, 
-			@Param("startTime")String startTime, @Param("endTime")String endTime);
+	BigDecimal countRebateMoneyByDay(@Param("preDay") String preDay);
 	
 	
 	/**
-	 * 濂栧姳鍒镐娇鐢ㄦ垚鍔熼噾棰濇洸绾垮浘
-	 * @param dateType
-	 * @param year
-	 * @param startTime
-	 * @param endTime
+	 * 缁熻鍏嶅崟閲戦鎴愬姛閲戦
+	 * @param type
+	 * @param preDay
 	 * @return
 	 */
-	List<ChartTDO> getFreeCouponMoneyToCharts(@Param("dateType") Integer dateType, @Param("year") String year, 
-			@Param("startTime")String startTime, @Param("endTime")String endTime,  @Param("couponType")String couponType);
+	BigDecimal countFreeMoneyByTypeAndDay(@Param("type") String type, @Param("preDay") String preDay);
 	
+	
+	/**
+	 * 缁熻鍒告瘡鏃ユ柊澧炴暟閲�
+	 * @param type
+	 * @param preDay
+	 * @return
+	 */
+	BigDecimal countCouponNumByDay(@Param("type") String type, @Param("preDay") String preDay);
+	
+	
+	/**
+	 * 缁熻鍒告暟閲�
+	 * @param state
+	 * @param activated
+	 * @param list
+	 * @return
+	 */
+	Long countCouponNum(@Param("uid")Long uid,  @Param("state") Integer state, @Param("activated") Integer activated,
+			@Param("list")List<String> list, @Param("listSource")List<String> listSource);
 }
\ No newline at end of file

--
Gitblit v1.8.0