From 7ae247471b8e1465c68bee9c5f56e94eb9f28fb8 Mon Sep 17 00:00:00 2001
From: taozi <9108791@qq.com>
Date: Mon, 14 Jun 2021 23:41:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E5=B7=B2?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=EF=BC=8C=E5=90=8E=E5=8F=B0=E8=BF=98=E8=83=BD?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/order/service/impl/YxStoreOrderServiceImpl.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
index aacdb9d7..3d2b289e 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
@@ -749,6 +749,10 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
             throw new YshopException("订单状态错误");
         }
 
+        if(!OrderInfoEnum.REFUND_STATUS_0.getValue().equals(orderQueryVo.getRefundStatus())){
+            throw new YshopException("订单退款中或已退款");
+        }
+
         YxExpress expressQueryVo = expressService.getOne(new LambdaQueryWrapper<YxExpress>().eq(YxExpress::getName,deliveryName));
         if(ObjectUtil.isNull(expressQueryVo)) {
             throw new YshopException("请后台先添加快递公司");