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

财务子单类型整理

This commit is contained in:
kuang.yifei@iwhalecloud.com 2022-07-21 17:28:31 +08:00
parent d9f3143414
commit 13faf66901
1 changed files with 5 additions and 5 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

@ -317,7 +317,7 @@ public class OrderController extends BaseController {
BigDecimal deptTotal = payMoney.multiply(deptRate).add(deptMoney); BigDecimal deptTotal = payMoney.multiply(deptRate).add(deptMoney);
FinancialDetail deptDetail = new FinancialDetail(deptId, financialDetailService.createCode(), FinancialDetail deptDetail = new FinancialDetail(deptId, financialDetailService.createCode(),
financialMaster.getId(), financialMaster.getCode(), deptTotal, 3, null); financialMaster.getId(), financialMaster.getCode(), deptTotal, FinancialDetailType.PLATFORM_FEE.getCode(), null);
financialDetailService.insertFinancialDetail(deptDetail); financialDetailService.insertFinancialDetail(deptDetail);
/* 2 截留扣点 */ /* 2 截留扣点 */
@ -327,7 +327,7 @@ public class OrderController extends BaseController {
BigDecimal retainTotal = payMoney.multiply(retainRate).add(retainMoney); BigDecimal retainTotal = payMoney.multiply(retainRate).add(retainMoney);
FinancialDetail retainDetail = new FinancialDetail(deptId, financialDetailService.createCode(), FinancialDetail retainDetail = new FinancialDetail(deptId, financialDetailService.createCode(),
financialMaster.getId(), financialMaster.getCode(), retainTotal, 2, null); financialMaster.getId(), financialMaster.getCode(), retainTotal, FinancialDetailType.PLATFORM_FEE.getCode(), null);
financialDetailService.insertFinancialDetail(retainDetail); financialDetailService.insertFinancialDetail(retainDetail);
/* 3 分销扣点 */ /* 3 分销扣点 */
@ -341,7 +341,7 @@ public class OrderController extends BaseController {
// 一级分销 // 一级分销
if (customerPlaceId != null) { if (customerPlaceId != null) {
FinancialDetail financialDetail = new FinancialDetail(deptId, financialDetailService.createCode(), FinancialDetail financialDetail = new FinancialDetail(deptId, financialDetailService.createCode(),
financialMaster.getId(), financialMaster.getCode(), onePlaceMoney, 2, customerPlaceId); financialMaster.getId(), financialMaster.getCode(), onePlaceMoney, FinancialDetailType.PLACE_FEE.getCode(), customerPlaceId);
financialDetailService.insertFinancialDetail(financialDetail); financialDetailService.insertFinancialDetail(financialDetail);
} else { } else {
deptPlaceTotal = deptPlaceTotal.add(onePlaceMoney); deptPlaceTotal = deptPlaceTotal.add(onePlaceMoney);
@ -351,7 +351,7 @@ public class OrderController extends BaseController {
Long parentCustomerPlaceId = customer.getParentCustomerPlace(); Long parentCustomerPlaceId = customer.getParentCustomerPlace();
if (parentCustomerPlaceId != null) { if (parentCustomerPlaceId != null) {
FinancialDetail financialDetail = new FinancialDetail(deptId, financialDetailService.createCode(), FinancialDetail financialDetail = new FinancialDetail(deptId, financialDetailService.createCode(),
financialMaster.getId(), financialMaster.getCode(), twoPlaceMoney, 2, parentCustomerPlaceId); financialMaster.getId(), financialMaster.getCode(), twoPlaceMoney, FinancialDetailType.PLACE_FEE.getCode(), parentCustomerPlaceId);
financialDetailService.insertFinancialDetail(financialDetail); financialDetailService.insertFinancialDetail(financialDetail);
} else { } else {
deptPlaceTotal = deptPlaceTotal.add(twoPlaceMoney); deptPlaceTotal = deptPlaceTotal.add(twoPlaceMoney);
@ -360,7 +360,7 @@ public class OrderController extends BaseController {
// 平台分销 // 平台分销
deptPlaceTotal = deptPlaceTotal.add(threePlaceMoney); deptPlaceTotal = deptPlaceTotal.add(threePlaceMoney);
FinancialDetail financialDetail = new FinancialDetail(deptId, financialDetailService.createCode(), FinancialDetail financialDetail = new FinancialDetail(deptId, financialDetailService.createCode(),
financialMaster.getId(), financialMaster.getCode(), deptPlaceTotal, 2, null); financialMaster.getId(), financialMaster.getCode(), deptPlaceTotal, FinancialDetailType.PLACE_FEE.getCode(), null);
financialDetailService.insertFinancialDetail(financialDetail); financialDetailService.insertFinancialDetail(financialDetail);
} }