From 52bc8ff0de3c7538d1401423c1cba9615c0c2082 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 18 六月 2020 17:22:24 +0800
Subject: [PATCH] 发圈商品来源修改 + 云发单规则调整
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponCountMapper.java | 45 ++++++++++-----------------------------------
1 files changed, 10 insertions(+), 35 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 ff03226..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,40 +108,6 @@
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
- * @return
- */
- List<ChartTDO> getRebateCouponMoneyToCharts(@Param("dateType") Integer dateType, @Param("year") String year,
- @Param("startTime")String startTime, @Param("endTime")String endTime);
-
-
- /**
- * 濂栧姳鍒镐娇鐢ㄦ垚鍔熼噾棰濇洸绾垮浘
- * @param dateType
- * @param year
- * @param startTime
- * @param endTime
- * @return
- */
- List<ChartTDO> getFreeCouponMoneyToCharts(@Param("dateType") Integer dateType, @Param("year") String year,
- @Param("startTime")String startTime, @Param("endTime")String endTime, @Param("couponType")String couponType);
/**
@@ -171,4 +136,14 @@
*/
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