From e2dfdd057eb2e067ce30fca27fc7c344c7562401 Mon Sep 17 00:00:00 2001 From: Hawking Date: Thu, 20 Apr 2023 21:40:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E6=94=AF=E4=BB=98=E7=9A=84=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8F=AF=E4=BB=A5=E5=8F=96=E6=B6=88=EF=BC=8C=E8=B7=B3?= =?UTF-8?q?=E8=BF=87=E9=80=80=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ghy/order/service/impl/OrderDetailServiceImpl.java | 6 ++---- .../com/ghy/order/service/impl/OrderMasterServiceImpl.java | 7 ++----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java index daa79e11..2600d6cf 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java @@ -259,10 +259,8 @@ public class OrderDetailServiceImpl implements OrderDetailService { // 判断是否是已付款的订单,未付款不需要退款 FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(orderDetail.getOrderMasterId()); Assert.notNull(financialMaster, "找不到对应的财务单"); - if (PayStatus.PAID.getCode().equals(financialMaster.getPayStatus())) { - // 发起退款 - refund(orderDetail); - } + // 发起退款 + refund(orderDetail); // 如果除了这个子订单以外 没有其它未取消的订单 boolean allCancel = true; for (OrderDetail od : orderDetails) { 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 81d658d0..02def3c7 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,11 +309,8 @@ public class OrderMasterServiceImpl implements OrderMasterService { update.setOrderMasterId(orderMasterId); update.setOrderStatus(OrderStatus.CANCEL.code()); orderDetailService.updateByOrderMasterId(update); - // 发起退款 -- 如果是未付款的单，不需要退款 - FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(orderMasterId); - if (PayStatus.PAID.getCode().equals(financialMaster.getPayStatus())) { - refund(orderMaster); - } + // 发起退款 + refund(orderMaster); break; case 2: // 待上门状态需要师傅同意才能取消 updateStatus(orderMasterId, OrderStatus.GOING_CANCEL.code());