From 13faf6690128018e33e706959ae43a03b8d4688e Mon Sep 17 00:00:00 2001 From: "kuang.yifei@iwhalecloud.com" Date: Thu, 21 Jul 2022 17:28:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E5=AD=90=E5=8D=95=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ghy/web/controller/order/OrderController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 6202b7d4..064fa195 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 @@ -317,7 +317,7 @@ public class OrderController extends BaseController { BigDecimal deptTotal = payMoney.multiply(deptRate).add(deptMoney); 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); /* 2 截留扣点 */ @@ -327,7 +327,7 @@ public class OrderController extends BaseController { BigDecimal retainTotal = payMoney.multiply(retainRate).add(retainMoney); 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); /* 3 分销扣点 */ @@ -341,7 +341,7 @@ public class OrderController extends BaseController { // 一级分销 if (customerPlaceId != null) { 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); } else { deptPlaceTotal = deptPlaceTotal.add(onePlaceMoney); @@ -351,7 +351,7 @@ public class OrderController extends BaseController { Long parentCustomerPlaceId = customer.getParentCustomerPlace(); if (parentCustomerPlaceId != null) { 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); } else { deptPlaceTotal = deptPlaceTotal.add(twoPlaceMoney); @@ -360,7 +360,7 @@ public class OrderController extends BaseController { // 平台分销 deptPlaceTotal = deptPlaceTotal.add(threePlaceMoney); 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); }