From 39c58fe1a0469b99bd5ef0a24f6b254693826a18 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 24 二月 2023 10:01:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java |    4 ++++
 1 files changed, 4 insertions(+), 0 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..f16be0a 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;
@@ -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