From e1a02e26dc24303bb6c8f5ab73eebd0c1e766874 Mon Sep 17 00:00:00 2001 From: Derran Date: Sat, 12 Oct 2024 16:05:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=82=AC=E8=B5=8F=E6=8B=9B=E4=BA=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ora/OrderRefundApplicationApplicationService.java | 2 +- .../application/service/order/OrderApplicationService.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/ora/OrderRefundApplicationApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/ora/OrderRefundApplicationApplicationService.java index 5ff4093..1ccdaeb 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/ora/OrderRefundApplicationApplicationService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/ora/OrderRefundApplicationApplicationService.java @@ -39,7 +39,7 @@ public class OrderRefundApplicationApplicationService extends BaseApplicationSer throw new BizException("不能发起退款"); } OrderRefundApplication application = OrderRefundApplication.build(order, RefundOrderTypeEnum.MARRIAGE_BOUNTY, - preRefundInfoVo.getRefundableMeetingFee().add(preRefundInfoVo.getRefundableResultGift()), preRefundInfoVo.getRewardAmount()); + preRefundInfoVo.getRefundableMeetingFee().add(preRefundInfoVo.getRefundableResultGift()), preRefundInfoVo.getPaidMount()); application.setStatus(OrderRefundApplicationStatus.UNAUDITED); orderRefundApplicationAggregate.create(application); } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java index f2e130c..1f6baee 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java @@ -323,7 +323,7 @@ public class OrderApplicationService extends BaseApplicationService { orderItem.setSubCategory(product.getSubCategory()); orderItem.setProductTitle(product.getProductTitle()); orderItem.setProductDesc(product.getProductDesc()); - orderItem.setOriginalAmount(productSpec.getUnitSellingPrice()); + orderItem.setUnitOriginalPrice(productSpec.getUnitSellingPrice()); orderItem.setUnitSettlementPrice(productSpec.getUnitSellingPrice()); orderItem.setQuantity(1); if (ProductSubCategoryEnum.MARRIAGE_BOUNTY_MEETING_FEE.equals(product.getSubCategory())) { @@ -360,7 +360,7 @@ public class OrderApplicationService extends BaseApplicationService { orderItem.setSubCategory(product.getSubCategory()); orderItem.setProductTitle(product.getProductTitle()); orderItem.setProductDesc(product.getProductDesc()); - orderItem.setOriginalAmount(unitSettlementPrice); + orderItem.setUnitOriginalPrice(unitSettlementPrice); orderItem.setUnitSettlementPrice(unitSettlementPrice); orderItem.setQuantity(quantity); orderItemList.add(orderItem);