From 43aaede0b659b8f0b3b0d5e281027533914d4093 Mon Sep 17 00:00:00 2001 From: Hawking Date: Thu, 20 Apr 2023 23:05:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E5=8D=95=E5=94=AE=E5=90=8E=E9=80=80?= =?UTF-8?q?=E9=94=99=E9=92=B1=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/AfterServiceRecordServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java index cb094931..2e385f66 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java @@ -175,13 +175,15 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService } else { refundMoney = afterServiceRecord.getRefund(); } - + log.info("AfterServiceRecord[{}].refundMoney: {}", afterServiceRecord.getId(), refundMoney); // 是不是大师傅的子单 boolean isMaster = orderMaster.getWorkerId().equals(orderDetail.getWorkerId()); + log.info("isMaster: {}", isMaster); if (isMaster) { // 如果这是大师傅的子单 退款金额最大可以等于主单服务金额 // 判断退款金额 >= 主单服务金额 boolean refundAll = refundMoney.compareTo(financialMaster.getServerMoney()) > -1; + log.info("refundAll: {}", refundAll); List orderDetails = orderDetailService.selectByOrderMasterId(orderMaster.getId()); // 判断是否有派单给子师傅 boolean noneSubWorker = true; @@ -191,6 +193,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService break; } } + log.info("noneSubWorker: {}", noneSubWorker); if (refundAll && noneSubWorker) { // 如果退款金额 >= 主单服务金额 并且 没有派单给子师傅 则退整个主单 orderMasterService.cancelAgree(orderMaster.getId(), 1); @@ -238,7 +241,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService // 发起支付撤销 if (payReverse) { - String reverseAmt = AdapayUtils.bigDecimalToString(financialMaster.getServerMoney()); + String reverseAmt = AdapayUtils.bigDecimalToString(refundMoney); payReverse(orderMaster.getDeptId(), financialMaster.getPaymentId(), reverseAmt); }