From 575d082e2e00d75fd350f1ca61a97160333c3dc5 Mon Sep 17 00:00:00 2001
From: "kuang.yife" <clunt@vip.163.com>
Date: Wed, 19 Apr 2023 20:55:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=98=AF=E5=90=A6=E8=A6=81?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=EF=BC=8C=E9=9C=80=E8=A6=81=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=98=AF=E5=88=B0=E4=BB=98=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ghy/order/service/impl/OrderMasterServiceImpl.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
index da1e4bfa..9396739f 100644
--- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
+++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
@@ -309,8 +309,11 @@ public class OrderMasterServiceImpl implements OrderMasterService {
                 update.setOrderMasterId(orderMasterId);
                 update.setOrderStatus(OrderStatus.CANCEL.code());
                 orderDetailService.updateByOrderMasterId(update);
-                // 发起退款
-                refund(orderMaster);
+                // 发起退款 -- 如果是未付款的单，不需要退款
+                FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(orderMasterId);
+                if(PayStatus.PAID.getCode().equals(financialMaster.getPayStatus())){
+                    refund(orderMaster);
+                }
                 break;
             case 2: // 待上门状态需要师傅同意才能取消
                 updateStatus(orderMasterId, OrderStatus.GOING_CANCEL.code());