From 0a82851e2c3005a109ea4a1da16de244d15de837 Mon Sep 17 00:00:00 2001 From: Hawking Date: Thu, 20 Apr 2023 21:50:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E6=94=AF=E4=BB=98=E7=8A=B6=E6=80=81?= =?UTF-8?q?=20=E5=A6=82=E6=9E=9C=E6=98=AF=E5=B7=B2=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=94=B9=E9=80=80=E6=AC=BE=E4=B8=AD=20=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=98=AF=E6=9C=AA=E6=94=AF=E4=BB=98=E6=94=B9=E4=B8=BA=E5=8F=96?= =?UTF-8?q?=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ghy/order/service/impl/OrderDetailServiceImpl.java | 6 +++--- .../ghy/order/service/impl/OrderMasterServiceImpl.java | 10 +++++----- 2 files changed, 8 insertions(+), 8 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 2600d6cf..9979c682 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 @@ -315,7 +315,7 @@ public class OrderDetailServiceImpl implements OrderDetailService { if (BigDecimal.ZERO.compareTo(detailMoney) > -1) { logger.info("子订单[{}]不需要退款 payMoney={}元", orderDetail.getId(), detailMoney); // 更新子财务单金额和状态 - financialDetail.setPayStatus(PayStatus.REFUND.getCode()); + financialDetail.setPayStatus(paid ? PayStatus.REFUND.getCode() : PayStatus.CANCEL.getCode()); financialDetail.setPayMoney(detailMoney); financialDetailService.updateFinancialDetail(financialDetail); @@ -325,9 +325,9 @@ public class OrderDetailServiceImpl implements OrderDetailService { return; } - // 更新子财务单金额和状态 + // 更新子财务单金额和状态 如果是已支付改退款中 如果是未支付改为取消 financialDetail.setPayMoney(detailMoney); - financialDetail.setPayStatus(PayStatus.REFUNDING.getCode()); + financialDetail.setPayStatus(paid ? PayStatus.REVERSING.getCode() : PayStatus.CANCEL.getCode()); financialDetailService.updateFinancialDetail(financialDetail); // 更新主财务单金额 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 02def3c7..f5f4fd02 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 @@ -376,12 +376,12 @@ public class OrderMasterServiceImpl implements OrderMasterService { boolean paid = PayStatus.PAID.getCode().equals(financialMaster.getPayStatus()) || PayStatus.PAYED_ADD.getCode().equals(financialMaster.getPayStatus()); - // 改主订单的支付状态 - updatePayStatus(orderMasterId, PayStatus.REFUND.getCode()); + // 改支付状态 如果是已支付改退款中 如果是未支付改为取消 + updatePayStatus(orderMasterId, paid ? PayStatus.REVERSING.getCode() : PayStatus.CANCEL.getCode()); // 改子订单的支付状态 OrderDetail odUpdate = new OrderDetail(); odUpdate.setOrderMasterId(orderMasterId); - odUpdate.setPayStatus(PayStatus.REFUND.getCode()); + odUpdate.setPayStatus(paid ? PayStatus.REVERSING.getCode() : PayStatus.CANCEL.getCode()); orderDetailService.updateByOrderMasterId(odUpdate); // 主订单金额=订单原价+加价 @@ -395,12 +395,12 @@ public class OrderMasterServiceImpl implements OrderMasterService { } // 修改主财务单状态 - financialMasterService.updatePayStatus(financialMaster.getId(), PayStatus.REVERSING.getCode()); + financialMasterService.updatePayStatus(financialMaster.getId(), paid ? PayStatus.REVERSING.getCode() : PayStatus.CANCEL.getCode()); // 修改子财务单状态 List fdList = financialDetailService.selectByFinancialMasterId(financialMaster.getId()); for (FinancialDetail fd : fdList) { if (PayStatus.PAID.getCode().equals(fd.getPayStatus())) { - financialDetailService.updatePayStatus(fd.getId(), PayStatus.REFUND.getCode()); + financialDetailService.updatePayStatus(fd.getId(), paid ? PayStatus.REVERSING.getCode() : PayStatus.CANCEL.getCode()); } }