From 4cd56a5d6c9a7d386ed6a11bd46061e8ed2dc39a Mon Sep 17 00:00:00 2001 From: qjq <1766193529@qq.com> Date: Thu, 19 Dec 2024 16:38:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=AA=E7=A9=BA=E8=88=B1=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E5=92=8C=E6=89=A3=E6=AC=BE=E6=A0=B9=E6=8D=AE=E9=97=A8=E5=BA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orderspacecapsule/OrderSpaceCapsuleServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderspacecapsule/OrderSpaceCapsuleServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderspacecapsule/OrderSpaceCapsuleServiceImpl.java index d5ea4f3a..3f819513 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderspacecapsule/OrderSpaceCapsuleServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderspacecapsule/OrderSpaceCapsuleServiceImpl.java @@ -109,7 +109,9 @@ public class OrderSpaceCapsuleServiceImpl implements OrderSpaceCapsuleService { throw exception(ORDER_SPACE_CAPSULE_ERREO); } // 判断是否需要更新状态 - Integer currentStatus = orderSpaceCapsuleMapper.selectById(updateObj.getId()).getStatus(); + OrderSpaceCapsuleDO orderSpaceCapsuleDO = orderSpaceCapsuleMapper.selectById(updateObj.getId()); + updateObj.setCarteenId(orderSpaceCapsuleDO.getCarteenId()); + Integer currentStatus = orderSpaceCapsuleDO.getStatus(); if (currentStatus.equals(updateObj.getStatus())) { return; // 状态一致，无需更新 } @@ -154,7 +156,7 @@ public class OrderSpaceCapsuleServiceImpl implements OrderSpaceCapsuleService { BigDecimal refundAmount = calculateRefundAmount(updateObj, currentStatus); updateObj.setRefundMoney(refundAmount); // 进行余额退款 - deductionService.reduction(updateObj.getUserId(), refundAmount, BigDecimal.ZERO, refundAmount, BigDecimal.ZERO, null); + deductionService.reduction(updateObj.getUserId(), refundAmount, BigDecimal.ZERO, refundAmount, BigDecimal.ZERO,updateObj.getCarteenId()); // 设置变动后的余额 updateObj.setEndMoney(startMoney.add(refundAmount)); }