优化

MrShi

2025-09-15 856f526f823f5dad88c28657d82f971ff66afb1e

 server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java

@@ -116,6 +116,7 @@
        bill1.setSumTotalFee(bill.getSumTotalFee());//交易金额
        bill1.setSumCmmsAmt(bill.getSumCmmsAmt());//交易手续费
        bill1.setSumSuccessFee(bill.getSumSuccessFee());//成功交易金额
        bill1.setDiscountFee(bill.getDiscountFee());//成功交易金额

        WxBill bill2 = initBillData();//记录退款统计数据
        bill2.setSumRefundBill(bill.getSumRefundBill());//退款笔数
@@ -132,6 +133,7 @@
        bill3.setSumRefundFee(bill.getSumRefundFee());//退款金额
        bill3.setTotal(bill.getTotal());
        bill3.setBikeFee(bill.getBikeFee());
        bill3.setDiscountFee(bill.getDiscountFee());//成功交易金额

        QueryWrapper<WxBillDetail> queryWrapper = new QueryWrapper<>();
        queryWrapper.lambda().ge(param.getStartDate() !=null,WxBillDetail::getPid,DateUtil.getShortDateStr(param.getStartDate()));
@@ -271,6 +273,7 @@
        bill.setDiscountRefundFee(new BigDecimal(0.00));
        bill.setDiscountRefundCmmsAmt(new BigDecimal(0.00));
        bill.setBikeRefundCmmsAmt(new BigDecimal(0.00));
        bill.setDiscountFee(new BigDecimal(0.00));
        return bill;
    }
    @Override
@@ -462,7 +465,7 @@
                            bill.setDiscountFee(bill.getDiscountFee().subtract(detail.getRefundFee()) );
                            bill.setDiscountRefundFee(bill.getDiscountRefundFee().add(detail.getRefundFee()) );
                            bill.setDiscountRefundCmmsAmt(bill.getDiscountRefundCmmsAmt().add(detail.getCmmsAmt()) );
//                        bill.setBikeFee(bill.getBikeFee().subtract(detail.getCmmsAmt()) );
//                          bill.setBikeFee(bill.getBikeFee().subtract(detail.getCmmsAmt()) );
                        }
                    }
                }