From e1a62ec62e7331d97af9302e90e1ce44af8235eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 一月 2021 15:26:55 +0800
Subject: [PATCH] 拼多多授权绑定

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountCouponServiceImpl.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountCouponServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountCouponServiceImpl.java
index 6c29c8a..b42b1dc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountCouponServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountCouponServiceImpl.java
@@ -12,11 +12,12 @@
 import com.yeshi.fanli.dao.user.count.DailyCountCouponDao;
 import com.yeshi.fanli.entity.admin.count.DailyCountCoupon;
 import com.yeshi.fanli.entity.admin.count.DailyCountCoupon.DailyCountCouponEnum;
+import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
 import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
 import com.yeshi.fanli.service.inter.count.DailyCountCouponService;
 import com.yeshi.fanli.service.inter.count.UserSystemCouponCountService;
 import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TimeUtil;
+import org.yeshi.utils.TimeUtil;
 
 @Service
 public class DailyCountCouponServiceImpl implements DailyCountCouponService {
@@ -150,6 +151,10 @@
 			total = userSystemCouponCountService.countCouponNumByDay(CouponTypeEnum.rebatePercentCoupon, preDay);
 		} else if (DailyCountCouponEnum.rebateCouponMoney == typeEnum) {
 			total = userSystemCouponCountService.countRebateMoneyByDay(preDay);
+		} else if (DailyCountCouponEnum.pullNewCouponNum == typeEnum) {
+			total = userSystemCouponCountService.countCouponNumByDay(CouponTypeEnum.freeCoupon, preDay, UserSystemCoupon.SOURCE_PULL_NEW);
+		} else if (DailyCountCouponEnum.pullNewCouponMoney == typeEnum) {
+			total = userSystemCouponCountService.countFreeMoneyByTypeAndDay(CouponTypeEnum.freeCoupon, preDay, UserSystemCoupon.SOURCE_PULL_NEW);
 		}
 
 		if (total == null) {

--
Gitblit v1.8.0