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());