diff --git a/ghy-common/src/main/java/com/ghy/common/enums/FinancialDetailType.java b/ghy-common/src/main/java/com/ghy/common/enums/FinancialDetailType.java index 40605ec0..ff13cfcb 100644 --- a/ghy-common/src/main/java/com/ghy/common/enums/FinancialDetailType.java +++ b/ghy-common/src/main/java/com/ghy/common/enums/FinancialDetailType.java @@ -12,7 +12,8 @@ public enum FinancialDetailType { PLATFORM_FEE(2, "平台提成金额"), PLACE_FEE(3, "分销金额,可能存在多级"), RETURN_FEE(4, "退款金额"), - FINE_FEE(5, "超时罚金"); + FINE_FEE(5, "超时罚金"), + COMMISSION_FEE(6,"手续费"); private final Integer code; private final String desc; diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java index 425de594..6974d601 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java @@ -533,7 +533,7 @@ public class OrderDetailServiceImpl implements OrderDetailService { FinancialDetail fdUpdate = new FinancialDetail(); fdUpdate.setId(platformFeeFD.getId()); BigDecimal payCommissionMoney= BigDecimal.valueOf(0.01); - payCommissionMoney=payMoney.multiply(payCommissionMoney).setScale(2, RoundingMode.UP); + payCommissionMoney=payMoney.multiply(payCommissionMoney); payMoney=payMoney.subtract(payCommissionMoney); fdUpdate.setPayMoney(payMoney); logger.info("平台的抽成减去承担手续费后的金额{},平台手续费{}", payMoney,payCommissionMoney); @@ -667,6 +667,13 @@ public class OrderDetailServiceImpl implements OrderDetailService { divMembers.add(new DivMember("0", MoneyUtil.toS(payCommissionMoney), true)); financialDetailService.updateFinancialDetail(fdUpdate); odMoney=odMoney.add(payCommissionMoney); + // 增加手续费财务子单 + FinancialDetail financialDetail1=new FinancialDetail(); + financialDetail1.setOrderDetailId(orderDetailId); + financialDetail1.setFinancialDetailType(6); + financialDetail1.setPayMoney(payCommissionMoney); + financialDetail1.setPayTime(new Date()); + financialDetailService.insertFinancialDetail(financialDetail1); } logger.info("子单的罚金处理后的总额{}",dtx); String orderNo = "OD_" + orderDetailId + "_" + System.currentTimeMillis();