bug修改

无关风月

2025-02-07 2fa4850f1197b17c9ed1882a4a88e09581f95bac

bug修改

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserCarFallbackFactory.java

@@ -33,6 +33,11 @@
            }

            @Override
            public R<List<TAppUserCar>> getAllCar() {
                return null;
            }

            @Override
            public R<TAppUserCar> getCarById(String id) {
                return R.fail("根据用户车辆id查询车辆信息失败:"+throwable.getMessage());
            }

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserCarClient.java

@@ -29,6 +29,8 @@
     */
    @PostMapping(value = "/t-app-user-car/t-app-user-car/getCarByIds")
    public R<List<TAppUserCar>> getCarByIds(@RequestBody List<Long> carIds);
    @PostMapping(value = "/t-app-user-car/t-app-user-car/getAllCar")
    public R<List<TAppUserCar>> getAllCar();
    @PostMapping(value = "/t-app-user-car/t-app-user-car/getCarById/{id}")
    public R<TAppUserCar> getCarById(@PathVariable("id") String id);
    

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/VipFallbackFactory.java

@@ -51,6 +51,11 @@
            public R<TVip> getInfo1(Integer id) {
                return R.fail("根据会员id 获取会员信息:" + throwable.getMessage());
            }

            @Override
            public R<List<TVip>> getAllVip() {
                return null;
            }
        };
    }
}

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/VipClient.java

@@ -37,7 +37,8 @@
    @PostMapping("/vip/getInfo1")
    R<TVip> getInfo1(@RequestParam("id") Integer id);


    @PostMapping("/vip/getAllVip")
    R<List<TVip>> getAllVip();
    @PostMapping(value = "/vip/getInfo")
    R<TVip> getInfo(@RequestParam("id") Integer id);


 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserCarController.java

@@ -36,6 +36,10 @@
    public R<List<TAppUserCar>> getCarByIds(@RequestBody List<Long> carIds){
        return R.ok(appUserCarService.list(Wrappers.lambdaQuery(TAppUserCar.class).in(TAppUserCar::getId,carIds)));
    }
    @PostMapping(value = "/t-app-user-car/getAllCar")
    public R<List<TAppUserCar>> getAllCar(){
        return R.ok(appUserCarService.list());
    }
    @PostMapping(value = "/t-app-user-car/getCarById/{id}")
    public R<TAppUserCar> getCarById(@PathVariable("id")String id){
        return R.ok(appUserCarService.lambdaQuery().eq(TAppUserCar::getId,id).one());

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

@@ -140,6 +140,8 @@
                .list();
        List<TChargingOrderAccountingStrategy> stageCostAll = tChargingOrderAccountingStrategyService.list(
                );
        List<TVip> data5 = vipClient.getAllVip().getData();
        List<TAppUserCar> data8 = appUserCarClient.getAllCar().getData();
        for (ChargingOrderListVO chargingOrderListVO : exportList) {
            TChargingOrderExport tChargingOrderExport = new TChargingOrderExport();
            Site site = data9.stream().filter(e -> e.getId().equals(chargingOrderListVO.getSiteId())).findFirst().orElse(null);
@@ -238,7 +240,7 @@
            tChargingOrderExport.setIsSocNum("0");
            tChargingOrderExport.setUserType("普通个人用户");
            if (data3!=null&&data3.getVipId()!=null){
                TVip data1 = vipClient.getInfo1(data3.getVipId()).getData();
                TVip data1 = data5.stream().filter(e->e.getId().equals(data3.getVipId())).findFirst().orElse(null);
                if (data1!=null){
                    tChargingOrderExport.setVipType(data1.getName());
                }
@@ -253,13 +255,11 @@
                tChargingOrderExport.setDeviceCode(data4.getCode());
            }
            tChargingOrderExport.setAccountType("个人");
            List<TAppUserCar> data1 = appUserCarClient.getCarByIds(Arrays.asList(chargingOrderListVO.getAppUserCarId())).getData();
            if (data1!=null&&(!data1.isEmpty())){
                tChargingOrderExport.setCarNumber(data1.get(0).getLicensePlate());
                tChargingOrderExport.setCarType(data1.get(0).getVehicleModel());
                tChargingOrderExport.setCarBrand(data1.get(0).getVehicleBrand());


            TAppUserCar tAppUserCar = data8.stream().filter(e -> e.getId().equals(chargingOrderListVO.getAppUserId())).findFirst().orElse(null);
            if (tAppUserCar!=null){
                tChargingOrderExport.setCarNumber(tAppUserCar.getLicensePlate());
                tChargingOrderExport.setCarType(tAppUserCar.getVehicleModel());
                tChargingOrderExport.setCarBrand(tAppUserCar.getVehicleBrand());
            }
            tChargingOrderExport.setOrderCode(chargingOrderListVO.getCode());
            tChargingOrderExport.setIsSingle("是");

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java

@@ -121,6 +121,10 @@
    public R<TVip> getInfo1(@RequestParam("id")Integer id) {
        return R.ok(vipService.getById(id));
    }
    @PostMapping("/getAllVip")
    R<List<TVip>> getAllVip() {
        return R.ok(vipService.list());
    }