From 1798c91f6b0782d1970a8a4fdcaf4a174e68cb61 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 16 五月 2023 10:45:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java
index 1fd7164..f815215 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.base.tips.SuccessTip;
+import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.modular.system.controller.req.CouponSendReq;
import com.stylefeng.guns.modular.system.enums.CouponStatusEnum;
@@ -90,8 +91,8 @@
// 开始，结束时间
if(StringUtils.hasLength(createTime)){
String[] split = createTime.split(" - ");
- Date startTime = DateUtil.getDate_str4(split[0]);
- Date endTime = DateUtil.getDate_str4(split[1]);
+ Date startTime = DateUtil.getDate_str3(split[0]+" 00:00:00");
+ Date endTime = DateUtil.getDate_str3(split[1]+" 23:59:59");
wrapper.between("create_time",startTime,endTime);
}
wrapper.ne("status", StatusEnum.DELETE.getCode());
@@ -134,6 +135,16 @@
Boolean isExit = tCouponService.isExit(tCoupon);
if(isExit){
return new SuccessTip(500,"该优惠券名称与类型已存在!");
+ }
+ // 如果是新人优惠券，查询是否存在已启用的新人优惠券
+ if(tCoupon.getCouponType() == 2){
+ int count = tCouponService.selectCount(new EntityWrapper<TCoupon>()
+ .eq("coupon_type", 2)
+ .eq("coupon_state", 1)
+ .eq("status", true));
+ if(count>0){
+ return new SuccessTip(500,"已存在已启用的新人优惠券!");
+ }
}
tCouponService.insert(tCoupon);
return SUCCESS_TIP;
@@ -221,8 +232,12 @@
tUserToCoupon.setCouponTotal(1);
tUserToCoupon.setValidCount(1);
Date expireTime = Date.from(LocalDate.now().plusDays(tCoupon.getCouponValidity()).atStartOfDay().atZone(ZoneId.systemDefault()).toInstant());
- System.err.println(expireTime);
tUserToCoupon.setExpireTime(expireTime);
+
+ // 添加发放人id和类型
+ tUserToCoupon.setObjectId(ShiroKit.getUser().getObjectId());
+ tUserToCoupon.setRoleType(ShiroKit.getUser().getRoleType());
+
tUserToCoupons.add(tUserToCoupon);
}
tUserToCouponService.insertBatch(tUserToCoupons);
--
Gitblit v1.7.1