From f5560820431163db68ccea4c850fb90a0eebf467 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 20 四月 2026 21:42:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpCouponController.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpCouponController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpCouponController.java
index 02f393e..29a0460 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpCouponController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpCouponController.java
@@ -2,17 +2,15 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xiaopeng.api.feignClient.account.XpAppUserCouponClient;
import com.xiaopeng.api.model.operation.XpCoupon;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.operation.query.XpCouponListQuery;
import com.xiaopeng.operation.service.IXpCouponService;
-import com.xiaopeng.operation.vo.XpBannerListVo;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
+import javax.annotation.Resource;
/**
* <p>
@@ -75,14 +73,23 @@
}
+
+ @Resource XpAppUserCouponClient xpAppUserCouponClient;
+
/**
* 删除优惠券
*/
@DeleteMapping("/v1/api/xp-coupon/deleteById")
@ApiOperation(value = "删除优惠券",tags = {"管理后台-优惠券"},response = XpCoupon.class)
public R<?> deleteById(@RequestParam Long id){
- xpCouponService.removeById(id);
- return R.ok();
+
+ if (!xpAppUserCouponClient.isHolding(id)){
+ xpCouponService.removeById(id);
+ return R.ok();
+ }
+ else{
+ return R.fail("该优惠券已有用户使用，无法作废 / 删除");
+ }
}
}
--
Gitblit v1.7.1