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);