From af4d4321fe866bfc6c5d2c54b264c5e6a305e567 Mon Sep 17 00:00:00 2001 From: Hawking Date: Mon, 24 Apr 2023 23:46:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ghy/order/service/impl/AfterServiceRecordServiceImpl.java | 4 +++- .../com/ghy/order/service/impl/OrderDetailServiceImpl.java | 1 + .../com/ghy/order/service/impl/OrderMasterServiceImpl.java | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) 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 2e385f66..2d7d0836 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 @@ -203,7 +203,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService afterServiceRecord.setOriginalRefund(financialMaster.getServerMoney()); // 退款金额就是主单服务金额 String reverseAmt = AdapayUtils.bigDecimalToString(financialMaster.getServerMoney()); - + log.info("大师傅子单[{}]退款 refundMoney: {}", orderDetail.getId(), reverseAmt); // 更新主财务单 PayMoney=PayMoney-ServerMoney ，ServerMoney=0 financialMaster.setPayMoney(financialMaster.getPayMoney().subtract(financialMaster.getServerMoney())); financialMaster.setServerMoney(BigDecimal.ZERO); @@ -215,6 +215,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService } } else { // 如果退款金额 < 主单服务金额 + log.info("大师傅子单[{}]退款 refundMoney: {}", orderDetail.getId(), refundMoney); afterServiceRecord.setOriginalRefund(refundMoney); financialMaster.setPayMoney(financialMaster.getPayMoney().subtract(refundMoney)); financialMaster.setServerMoney(financialMaster.getServerMoney().subtract(refundMoney)); @@ -232,6 +233,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService orderDetailService.cancelAgree(orderDetail.getId(), 1); afterServiceRecord.setOriginalRefund(financialDetail.getPayMoney()); } else { + log.info("小师傅子单[{}]退款 refundMoney = {}", orderDetail.getId(), refundMoney); afterServiceRecord.setOriginalRefund(refundMoney); financialDetail.setPayMoney(financialDetail.getPayMoney().subtract(refundMoney)); financialMaster.setPayMoney(financialMaster.getPayMoney().subtract(refundMoney)); 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 b0c7ce24..10cae95f 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 @@ -245,6 +245,7 @@ public class OrderDetailServiceImpl implements OrderDetailService { */ @Transactional(rollbackFor = Exception.class) public void cancel(long orderDetailId) throws BaseAdaPayException { + logger.info("子订单取消 orderDetailId = {}", orderDetailId); OrderDetail orderDetail = selectById(orderDetailId); Assert.notNull(orderDetail, "找不到对应的子订单"); if (OrderStatus.FINISH.code() == orderDetail.getOrderStatus() || OrderStatus.CANCEL.code() == orderDetail.getOrderStatus()) { 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 d01d6ef7..255146ce 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 @@ -330,6 +330,7 @@ public class OrderMasterServiceImpl implements OrderMasterService { logger.info("订单[id={}]状态不正确，orderStatus={}", orderMasterId, orderMaster.getOrderStatus()); return; } + logger.info("主订单取消 orderMasterId = {}", orderMasterId); // 把主订单状态设置为已取消 updateStatus(orderMasterId, OrderStatus.CANCEL.code()); // 把所有子订单状态设置为已取消