From 94277bce220b981850d82760ee48efb5df5b9cdc Mon Sep 17 00:00:00 2001 From: Yifei Kuang Date: Sun, 3 Nov 2024 21:24:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E9=99=A9=E9=87=91=E9=A2=9D=E5=BD=92?= =?UTF-8?q?=E5=B1=9E=E7=BB=99=E5=B9=B3=E5=8F=B0,=E4=B8=8D=E5=BA=94?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=BB=99=E5=AE=A2=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ghy/web/controller/order/OrderController.java | 10 ++++++++-- .../web/controller/order/OrderMasterController.java | 1 + 2 files changed, 9 insertions(+), 2 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 3a2a5405..d875ce8c 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 @@ -548,12 +548,14 @@ public class OrderController extends BaseController { // TODO 优惠金额不知道咋算 暂时先给0 BigDecimal discountMoney = BigDecimal.ZERO; BigDecimal payMoney = totalPay.subtract(discountMoney); + BigDecimal insuranceMoney = BigDecimal.ZERO; // 保险金额 if(appOrderRequest.getInsuranceId() != null){ InsuranceManager manager = insuranceManagerService.selectInsuranceManagerById(appOrderRequest.getInsuranceId()); if(manager != null){ payMoney = payMoney.add(manager.getInsuranceAmount()); + insuranceMoney = insuranceMoney.add(manager.getInsuranceAmount()); orderMaster.setInsuranceId(manager.getId()); } } @@ -574,7 +576,7 @@ public class OrderController extends BaseController { // createFinancialDetail(goodsList.get(0).getDeptGoodsCategoryId(), deptId, customer, payMoney, financialMaster); //生成财务子单 - createFinancialDetail(appGoodsList, deptId, customer, payMoney, financialMaster); + createFinancialDetail(appGoodsList, deptId, customer, payMoney, financialMaster, insuranceMoney); // 生成商品订单 Map goodsMap = goodsList.stream().filter(Objects::nonNull) @@ -605,7 +607,8 @@ public class OrderController extends BaseController { return AjaxResult.success(orderMaster); } - private void createFinancialDetail(List appGoodsList, Long deptId, Customer customer, BigDecimal serverMoney, FinancialMaster financialMaster) { + private void createFinancialDetail(List appGoodsList, Long deptId, Customer customer, + BigDecimal serverMoney, FinancialMaster financialMaster, BigDecimal insuranceMoney) { // 平台 BigDecimal deptMoney = BigDecimal.ZERO; // 一级分销 @@ -638,6 +641,9 @@ public class OrderController extends BaseController { .add(goodsStandard.getGoodsPrice().multiply(BigDecimal.valueOf(Double.parseDouble(deptGoodsCategory.getRetainRate())))); } } + // 平台扣除保险 -- + deptMoney = deptMoney.add(insuranceMoney); + // 平台扣点记录 FinancialDetail deptDetail = new FinancialDetail(deptId, financialDetailService.createCode(), financialMaster.getId(), financialMaster.getCode(), deptMoney, FinancialDetailType.PLATFORM_FEE.getCode(), null); diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index 4161f73a..7e189ac9 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -1372,6 +1372,7 @@ public class OrderMasterController extends BaseController { */ @PostMapping("/editOrderMaster") @ResponseBody + @Transactional(rollbackFor = Exception.class) public AjaxResult editOrderMaster(@RequestBody OrderMaster orderMaster) { try { int result = orderMasterService.updateOrderMaster(orderMaster);