优化

MrShi

2025-09-15 856f526f823f5dad88c28657d82f971ff66afb1e

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

@@ -9,6 +9,7 @@
import com.doumee.core.utils.Utils;
import com.doumee.core.wx.WxMiniConfig;
import com.doumee.core.wx.WxPayProperties;
import com.doumee.dao.business.GoodsorderMapper;
import com.doumee.dao.business.WxBillDetailMapper;
import com.doumee.dao.business.WxBillMapper;
import com.doumee.dao.business.model.Goodsorder;
@@ -46,6 +47,8 @@

    @Autowired
    private WxBillMapper wxBillMapper;
    @Autowired
    private GoodsorderMapper goodsorderMapper;
    @Autowired
    private WxBillDetailMapper wxBillDetailMapper;
    @Override
@@ -113,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());//退款笔数
@@ -128,11 +132,13 @@
        bill3.setSumRefundCmmsAmt(Constants.formatDecimalNum(bill.getSumRefundCmmsAmt()).add(Constants.formatDecimalNum(bill.getSumCmmsAmt())));//手续费
        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()));
        queryWrapper.lambda().le(param.getEndDate() !=null,WxBillDetail::getPid,DateUtil.getShortDateStr(param.getEndDate()));
        queryWrapper.lambda().ne(WxBillDetail::getAppid, WxMiniConfig.wxPayV2Service.getConfig().getAppId());//非自行车收入统计
        queryWrapper.lambda().ne(WxBillDetail::getAppid, WxMiniConfig.wxPayV2Service.getConfig().getSubAppId());//非自行车收入统计
        queryWrapper.lambda().groupBy(WxBillDetail::getBillStatus);
        queryWrapper.select( "count(id) as sum_bill"
                ,"sum(settlement_total_fee) as settlement_total_fee"
@@ -239,6 +245,7 @@
                ,"sum(total) as total"
                ,"sum(sum_refund_cmms_amt) as sum_refund_cmms_amt"
                ,"sum(bike_fee) as bike_fee"
                ,"sum(discount_fee) as discount_fee"
                );
        WxBill bill = wxBillMapper.selectOne(param.last("limit 1"));
        if(bill == null){
@@ -261,6 +268,12 @@
        bill.setSumRefundCmmsAmt(new BigDecimal(0.00));
        bill.setTotal(new BigDecimal(0.00));
        bill.setBikeFee(new BigDecimal(0.00));
        bill.setDiscountFee(new BigDecimal(0.00));
        bill.setBikeRefundFee(new BigDecimal(0.00));
        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
@@ -279,6 +292,8 @@
//        Date ydate = DateUtil.addDaysToDate(new Date(), -1);
        request.setBillDate(billDate);
        request.setBillType("SUCCESS");
        request.setSubMchId(WxMiniConfig.wxProperties.getSubMchId());

        WxPayBillResult response = null;
        try {
            response = WxMiniConfig.wxPayV2Service.downloadBill(request);
@@ -332,7 +347,22 @@
//        bill.setBikeFee(bill.getSumSuccessFee().subtract(bill.getSumRefundFee()));
        wxBillMapper.insert(bill);
        if(detailList.size()>0){
            wxBillDetailMapper.insertBatch(detailList);
            int sublistSize = 500;
            int startIndex = 0;
            int endIndex = sublistSize;
            while (startIndex < detailList.size()) {
                if (endIndex > detailList.size()) {
                    endIndex = detailList.size();
                }

                List<WxBillDetail> sublist = detailList.subList(startIndex, endIndex);
                if(sublist.size()>0){
//                    wxBillDetailMapper.insertBatch(sublist);
                    wxBillDetailMapper.insert(sublist);
                }
                startIndex = endIndex;
                endIndex += sublistSize;
            }
        }
    }

@@ -408,19 +438,37 @@
                detail.setRefundSuccessDate(DateUtil.getDateFromString2(info.getRefundSuccessTime()));//成功退款时间
                detail.setRefundApplyDate(DateUtil.getDateFromString2(info.getRefundTime())); //申请退款时间
                //计算自行车收入，匹配来自自行车小程序的所有支付成功和退款成功的金额，作为自行车收入（累计收款金额-累计退款成功金额）
                if(StringUtils.equals(detail.getAppid(), WxMiniConfig.wxPayV2Service.getConfig().getAppId())){
                    //自行车收入累计收款金额(支付成功总金额-退款总金额）
                    if(StringUtils.equals(info.getTradeState(),"SUCCESS")){
                        //如果是交易
                        bill.setBikeFee(bill.getBikeFee().add(detail.getSettlementTotalFee()));
                        bill.setBikeFee(bill.getBikeFee().subtract(detail.getCmmsAmt()) );
                    }else  if(StringUtils.equals(info.getTradeState(),"REFUND" ) || StringUtils.equals(info.getTradeState(),"REVOKED" )){
                        //如果退款成功，扣除退款金额
                        bill.setBikeFee(bill.getBikeFee().subtract(detail.getRefundFee()) );
                        bill.setBikeFee(bill.getBikeFee().subtract(detail.getCmmsAmt()) );
                if(StringUtils.equals(detail.getAppid(), WxMiniConfig.wxPayV2Service.getConfig().getSubAppId())){
                    Goodsorder order = goodsorderMapper.selectOne(new QueryWrapper<Goodsorder>().lambda()
                            .eq(Goodsorder::getId,info.getOutTradeNo()));
                    if(Constants.equalsInteger(order.getType(),Constants.ZERO)){
                        //自行车收入累计收款金额(支付成功总金额-退款总金额）
                        if(StringUtils.equals(info.getTradeState(),"SUCCESS")){
                            //如果是交易（包含手续费）
                            bill.setBikeFee(bill.getBikeFee().add(detail.getSettlementTotalFee()));
//                        bill.setBikeFee(bill.getBikeFee().subtract(detail.getCmmsAmt()) );
                        }else  if(StringUtils.equals(info.getTradeState(),"REFUND" ) || StringUtils.equals(info.getTradeState(),"REVOKED" )){
                            //如果退款成功，扣除退款金额(包含手续费）
                            bill.setBikeFee(bill.getBikeFee().subtract(detail.getRefundFee()) );
                            bill.setBikeRefundFee(bill.getBikeRefundFee().add(detail.getRefundFee()) );
                            bill.setBikeRefundCmmsAmt(bill.getBikeRefundCmmsAmt().add(detail.getCmmsAmt()) );
//                        bill.setBikeFee(bill.getBikeFee().subtract(detail.getCmmsAmt()) );
                        }
                    }else{
                        //自行车收入累计收款金额(支付成功总金额-退款总金额）
                        if(StringUtils.equals(info.getTradeState(),"SUCCESS")){
                            //如果是交易（包含手续费）
                            bill.setDiscountFee(bill.getDiscountFee().add(detail.getSettlementTotalFee()));
//                        bill.setBikeFee(bill.getBikeFee().subtract(detail.getCmmsAmt()) );
                        }else  if(StringUtils.equals(info.getTradeState(),"REFUND" ) || StringUtils.equals(info.getTradeState(),"REVOKED" )){
                            //如果退款成功，扣除退款金额(包含手续费）
                            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()) );
                        }
                    }
                }

                detailList.add(detail);
            }
        }