From bc073414d2ce6a4326782e9defb6f16642e4afd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Mon, 11 Nov 2024 17:10:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BC=98=E6=83=A0=E5=88=B8=E6=8A=B5=E6=89=A3?=
 =?UTF-8?q?=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java    | 1 +
 .../cashier/service/impl/shopimpl/TbShopTableServiceImpl.java | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java
index 7df190e6..d33d9489 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java
@@ -129,6 +129,7 @@ public class TbOrderDetail implements Serializable {
     private String returnNum;
 
     private BigDecimal memberPrice;
+    private Integer userCouponId;
 
     public void copy(TbOrderDetail source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
index 5ced0406..93806721 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
@@ -1476,6 +1476,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                 orderDetail.setProductSkuName(productSku.getSpecSnap());
             }
 
+            orderDetail.setUserCouponId(cashierCart.getUserCouponId());
             orderDetail.setMemberPrice(cashierCart.getMemberPrice());
             orderDetail.setNote(cashierCart.getNote());
             orderDetail.setCreateTime(DateUtil.date().toTimestamp());
@@ -2546,6 +2547,9 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         BigDecimal saleAmount = BigDecimal.ZERO;
         ArrayList<TbOrderDetail> remainOrderDetailList = new ArrayList<>();
         for (TbOrderDetail orderDetail : detailList) {
+            if (orderDetail.getUserCouponId() != null) {
+                throw new BadRequestException("选择了优惠券抵扣商品，无法退款");
+            }
             Integer returnNum = returnNumMap.get(orderDetail.getId().toString());
             int remainNum = orderDetail.getNum() - returnNum;
             if (remainNum < 0) {