From 01e64fe75bb1914c00ac2da749511296c6588f96 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 24 二月 2023 18:25:51 +0800
Subject: [PATCH] 司机管理完善，佣金管理完成
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 43f9696..e1535ec 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.base.tips.SuccessTip;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.modular.system.controller.req.CouponSendReq;
import com.stylefeng.guns.modular.system.enums.CouponStatusEnum;
@@ -69,7 +70,7 @@
*/
@RequestMapping(value = "/list")
@ResponseBody
- public Object list(Integer couponType,Integer couponServiceType,String createtime) {
+ public Object list(Integer couponType,Integer couponServiceType,String createTime) {
EntityWrapper<TCoupon> wrapper = new EntityWrapper<>();
if(Objects.nonNull(couponType)){
wrapper.eq("coupon_type",couponType);
@@ -78,13 +79,13 @@
wrapper.eq("coupon_service_type",couponServiceType);
}
// 开始，结束时间
- if(StringUtils.hasLength(createtime)){
- String[] split = createtime.split(" - ");
+ 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.between("create_time",startTime,endTime);
}
- wrapper.orderBy(true,"createtime",false);
+ wrapper.orderBy(true,"create_time",false);
wrapper.groupBy(true,"coupon_name");
wrapper.groupBy(true,"coupon_type");
return tCouponService.selectList(wrapper);
@@ -107,6 +108,9 @@
public Object add(TCoupon tCoupon) {
// 校验是否添加的是同类型同名称的优惠券
Boolean isExit = tCouponService.isExit(tCoupon);
+ if(isExit){
+ return new SuccessTip(500,"该优惠券名称与类型已存在!");
+ }
tCouponService.insert(tCoupon);
return SUCCESS_TIP;
}
--
Gitblit v1.7.1