修改bug

Pu Zhibing

5 天以前 8461d90c8ba36e2de2c14569b31ab148a673cb81

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java

@@ -27,10 +27,7 @@
import com.ruoyi.order.api.vo.ChargingOrderTimeVO;
import com.ruoyi.order.api.vo.SettlementTotalVO;
import com.ruoyi.order.export.TChargingOrderExport;
import com.ruoyi.order.service.AccountingStrategyOrderService;
import com.ruoyi.order.service.TChargingOrderAccountingStrategyService;
import com.ruoyi.order.service.TChargingOrderService;
import com.ruoyi.order.service.TSettlementConfirmService;
import com.ruoyi.order.service.*;
import com.ruoyi.order.vo.ChargingOrderListInfoVO;
import com.ruoyi.other.api.domain.TVip;
import com.ruoyi.other.api.feignClient.VipClient;
@@ -69,6 +66,9 @@

    @Resource
    private TChargingOrderService chargingOrderService;
    @Resource
    private TChargingOrderRefundService chargingOrderRefundService;
    
    @Resource
    private TSettlementConfirmService tSettlementConfirmService;
    @Resource
@@ -121,8 +121,7 @@
        List<Partner> data7 = siteClient.getAllPartner().getData();
        List<AccountingStrategyOrder> listAll = accountingStrategyOrderService.lambdaQuery()
                .list();
        List<TChargingOrderAccountingStrategy> stageCostAll = tChargingOrderAccountingStrategyService.list(
                );
        List<TChargingOrderAccountingStrategy> stageCostAll = tChargingOrderAccountingStrategyService.list();
        List<TVip> data5 = vipClient.getAllVip().getData();
        List<TAppUserCar> data8 = appUserCarClient.getAllCar().getData();
        for (ChargingOrderListVO chargingOrderListVO : exportList) {
@@ -230,6 +229,8 @@
                long between = ChronoUnit.SECONDS.between(startTime, endTime);
                tChargingOrderExport.setCumulativeChargingTime((between*60)+"");
            }
            tChargingOrderExport.setRechargeAmount(chargingOrderListVO.getRechargeAmount().toString());
            tChargingOrderExport.setRefundAmount(chargingOrderListVO.getRefundAmount().toString());
            tChargingOrderExport.setStartSoc(chargingOrderListVO.getStartSoc());
            tChargingOrderExport.setEndtSoc(chargingOrderListVO.getEndSoc());
            tChargingOrderExport.setIsSoc("否");