From 00e122b6b32c07839b944ea47d1775f5793020ba Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 17 二月 2023 18:28:05 +0800
Subject: [PATCH] 用户信息模块，登录功能,优惠券
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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 b7814cb..43f9696 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.modular.system.controller.req.CouponSendReq;
import com.stylefeng.guns.modular.system.enums.CouponStatusEnum;
import io.swagger.annotations.ApiOperation;
@@ -19,9 +20,7 @@
import com.stylefeng.guns.modular.system.model.TCoupon;
import com.stylefeng.guns.modular.system.service.ITCouponService;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
/**
* 控制器
@@ -70,12 +69,24 @@
*/
@RequestMapping(value = "/list")
@ResponseBody
- public Object list(String condition) {
+ public Object list(Integer couponType,Integer couponServiceType,String createtime) {
EntityWrapper<TCoupon> wrapper = new EntityWrapper<>();
- if(StringUtils.hasLength(condition)){
- wrapper.like("coupon_name",condition);
+ if(Objects.nonNull(couponType)){
+ wrapper.eq("coupon_type",couponType);
}
+ if(Objects.nonNull(couponServiceType)){
+ wrapper.eq("coupon_service_type",couponServiceType);
+ }
+ // 开始，结束时间
+ if(StringUtils.hasLength(createtime)){
+ String[] split = createtime.split(" - ");
+ Date startTime = DateUtil.getDate_str4(split[0]);
+ Date endTime = DateUtil.getDate_str4(split[1]);
+ wrapper.between("createtime",startTime,endTime);
+ }
+ wrapper.orderBy(true,"createtime",false);
wrapper.groupBy(true,"coupon_name");
+ wrapper.groupBy(true,"coupon_type");
return tCouponService.selectList(wrapper);
}
@@ -94,6 +105,8 @@
@RequestMapping(value = "/add")
@ResponseBody
public Object add(TCoupon tCoupon) {
+ // 校验是否添加的是同类型同名称的优惠券
+ Boolean isExit = tCouponService.isExit(tCoupon);
tCouponService.insert(tCoupon);
return SUCCESS_TIP;
}
--
Gitblit v1.7.1