From c7068f1d535ee2b89e29ba90a04d1523ca4d4c65 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期日, 29 九月 2024 10:07:34 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCouponServiceImpl.java | 7 +++++++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java | 10 ++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
index 16b02cc..e174a7d 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
@@ -70,8 +70,14 @@
@PostMapping("/addVipOrder")
@ApiOperation(value = "添加会员订单", tags = {"管理后台-会员订单"})
public R<Long> addVipOrder(@RequestBody TVipOrder dto) {
- List<TVipOrder> list = vipOrderService.lambdaQuery().eq(TVipOrder::getCode, dto.getCode()).list();
- if (!list.isEmpty())return R.fail("订单编号已存在");
+ if (dto.getId()!=null){
+ List<TVipOrder> list = vipOrderService.lambdaQuery().eq(TVipOrder::getCode, dto.getCode())
+ .ne(TVipOrder::getId, dto.getId()).list();
+ if (!list.isEmpty())return R.fail("订单编号已存在");
+ }else{
+ List<TVipOrder> list = vipOrderService.lambdaQuery().eq(TVipOrder::getCode, dto.getCode()).list();
+ if (!list.isEmpty())return R.fail("订单编号已存在");
+ }
vipOrderService.saveOrUpdate(dto);
return R.ok(dto.getId());
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCouponServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCouponServiceImpl.java
index 9b29460..c08b27b 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCouponServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCouponServiceImpl.java
@@ -34,6 +34,13 @@
StringBuilder couponIds = new StringBuilder();
for (TCoupon tCoupon : list) {
couponIds.append(tCoupon.getId()).append(",");
+ // 如果优惠券库存为0 那么将优惠券状态改为下架 不启用
+ if (tCoupon.getInventoryQuantity()==0){
+ tCoupon.setStatus(2);
+ this.baseMapper.updateById(tCoupon);
+
+ }
+
}
if (!list.isEmpty()){
if (StringUtils.hasLength(couponIds)){
--
Gitblit v1.7.1