代码提交

无关风月

2024-08-22 d30048d36b99678f8087b2c78d6478e51c89be6a

代码提交

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java

@@ -64,6 +64,8 @@
    
    @Resource
    private AppUserCarClient appUserCarClient;
    @Resource
    private AppUserClient appUserClient;
    
    @Resource
    private TChargingOrderAccountingStrategyService chargingOrderAccountingStrategyService;
@@ -77,9 +79,7 @@
    @Resource
    private ChargingPileClient chargingPileClient;
    
    @Resource
    private AppUserClient appUserClient;
	

    @Resource
    private AppUserVipDetailClient appUserVipDetailClient;
    
@@ -409,6 +409,13 @@
            endTime1 = split[0];
            endTime2 = split[1];
        }
        if (StringUtils.hasLength(dto.getPhone())){
            List<Long> data = appUserClient.getUserIdsByPhone(dto.getPhone()).getData();
            if (data.isEmpty()){
                data.add(0L);
            }
            dto.setUserIds(data);
        }
        PageInfo<ChargingOrderVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
        List<ChargingOrderVO> list = this.baseMapper.chargingOrder(pageInfo,dto,startTime1,startTime2,endTime1,endTime2);
        pageInfo.setRecords(list);