From f3c041998735ef49cf73c8c01144894cde2397e8 Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Thu, 5 Oct 2023 02:23:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=8F=91=E5=8D=95=E6=89=A3?= =?UTF-8?q?=E7=82=B9=E4=B8=8D=E5=AF=B9=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ghy/web/controller/order/OrderController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index b3469d4b..1edd6457 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -297,11 +297,11 @@ public class OrderController extends BaseController { // 扣点设置类目 DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(goodsStandard.getDeptGoodsCategoryId()); // 平台扣点 = 平台金额 + 商品单价 * 扣点比例 - deptMoney = deptMoney.add(deptGoodsCategory.getDeptMoney()) - .add(financialMaster.getPayMoney().multiply(BigDecimal.valueOf(Double.parseDouble(deptGoodsCategory.getDeptRate())))); + deptMoney = deptMoney.add(deptGoodsCategory.getPcDeptMoney()) + .add(financialMaster.getPayMoney().multiply(BigDecimal.valueOf(Double.parseDouble(deptGoodsCategory.getPcDeptRate())))); // 截流扣点 = 截流金额 + 商品单价 * 扣点比例 - specialMoney = specialMoney.add(deptGoodsCategory.getRetainMoney()) - .add(financialMaster.getPayMoney().multiply(BigDecimal.valueOf(Double.parseDouble(deptGoodsCategory.getRetainRate())))); + specialMoney = specialMoney.add(deptGoodsCategory.getPcRetainMoney()) + .add(financialMaster.getPayMoney().multiply(BigDecimal.valueOf(Double.parseDouble(deptGoodsCategory.getPcRetainRate())))); // 平台扣点记录 FinancialDetail deptDetail = new FinancialDetail(deptId, financialDetailService.createCode(), financialMaster.getId(), financialMaster.getCode(), deptMoney, FinancialDetailType.PLATFORM_FEE.getCode(), null);