clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

保险金额归属给平台,不应展示给客户

This commit is contained in:
Yifei Kuang 2024-11-03 21:24:55 +08:00
parent 1a18fbb03b
commit 94277bce22
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -548,12 +548,14 @@ public class OrderController extends BaseController {
// TODO 优惠金额不知道咋算 暂时先给0 // TODO 优惠金额不知道咋算 暂时先给0
BigDecimal discountMoney = BigDecimal.ZERO; BigDecimal discountMoney = BigDecimal.ZERO;
BigDecimal payMoney = totalPay.subtract(discountMoney); BigDecimal payMoney = totalPay.subtract(discountMoney);
BigDecimal insuranceMoney = BigDecimal.ZERO;
// 保险金额 // 保险金额
if(appOrderRequest.getInsuranceId() != null){ if(appOrderRequest.getInsuranceId() != null){
InsuranceManager manager = insuranceManagerService.selectInsuranceManagerById(appOrderRequest.getInsuranceId()); InsuranceManager manager = insuranceManagerService.selectInsuranceManagerById(appOrderRequest.getInsuranceId());
if(manager != null){ if(manager != null){
payMoney = payMoney.add(manager.getInsuranceAmount()); payMoney = payMoney.add(manager.getInsuranceAmount());
insuranceMoney = insuranceMoney.add(manager.getInsuranceAmount());
orderMaster.setInsuranceId(manager.getId()); orderMaster.setInsuranceId(manager.getId());
} }
} }
@ -574,7 +576,7 @@ public class OrderController extends BaseController {
// createFinancialDetail(goodsList.get(0).getDeptGoodsCategoryId(), deptId, customer, payMoney, financialMaster); // createFinancialDetail(goodsList.get(0).getDeptGoodsCategoryId(), deptId, customer, payMoney, financialMaster);
//生成财务子单 //生成财务子单
createFinancialDetail(appGoodsList, deptId, customer, payMoney, financialMaster); createFinancialDetail(appGoodsList, deptId, customer, payMoney, financialMaster, insuranceMoney);
// 生成商品订单 // 生成商品订单
Map<Long, GoodsStandard> goodsMap = goodsList.stream().filter(Objects::nonNull) Map<Long, GoodsStandard> goodsMap = goodsList.stream().filter(Objects::nonNull)
@ -605,7 +607,8 @@ public class OrderController extends BaseController {
return AjaxResult.success(orderMaster); return AjaxResult.success(orderMaster);
} }
private void createFinancialDetail(List<AppGoodsRequest> appGoodsList, Long deptId, Customer customer, BigDecimal serverMoney, FinancialMaster financialMaster) { private void createFinancialDetail(List<AppGoodsRequest> appGoodsList, Long deptId, Customer customer,
BigDecimal serverMoney, FinancialMaster financialMaster, BigDecimal insuranceMoney) {
// 平台 // 平台
BigDecimal deptMoney = BigDecimal.ZERO; BigDecimal deptMoney = BigDecimal.ZERO;
// 一级分销 // 一级分销
@ -638,6 +641,9 @@ public class OrderController extends BaseController {
.add(goodsStandard.getGoodsPrice().multiply(BigDecimal.valueOf(Double.parseDouble(deptGoodsCategory.getRetainRate())))); .add(goodsStandard.getGoodsPrice().multiply(BigDecimal.valueOf(Double.parseDouble(deptGoodsCategory.getRetainRate()))));
} }
} }
// 平台扣除保险 --
deptMoney = deptMoney.add(insuranceMoney);
// 平台扣点记录 // 平台扣点记录
FinancialDetail deptDetail = new FinancialDetail(deptId, financialDetailService.createCode(), FinancialDetail deptDetail = new FinancialDetail(deptId, financialDetailService.createCode(),
financialMaster.getId(), financialMaster.getCode(), deptMoney, FinancialDetailType.PLATFORM_FEE.getCode(), null); financialMaster.getId(), financialMaster.getCode(), deptMoney, FinancialDetailType.PLATFORM_FEE.getCode(), null);

1
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -1372,6 +1372,7 @@ public class OrderMasterController extends BaseController {
*/ */
@PostMapping("/editOrderMaster") @PostMapping("/editOrderMaster")
@ResponseBody @ResponseBody
@Transactional(rollbackFor = Exception.class)
public AjaxResult editOrderMaster(@RequestBody OrderMaster orderMaster) { public AjaxResult editOrderMaster(@RequestBody OrderMaster orderMaster) {
try { try {
int result = orderMasterService.updateOrderMaster(orderMaster); int result = orderMasterService.updateOrderMaster(orderMaster);