From 2fa4850f1197b17c9ed1882a4a88e09581f95bac Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 07 二月 2025 17:02:03 +0800
Subject: [PATCH] bug修改
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/VipClient.java | 3 ++-
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java | 4 ++++
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserCarClient.java | 2 ++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserCarController.java | 4 ++++
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/VipFallbackFactory.java | 5 +++++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java | 16 ++++++++--------
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserCarFallbackFactory.java | 5 +++++
7 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserCarFallbackFactory.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserCarFallbackFactory.java
index e15cc67..611230d 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserCarFallbackFactory.java
+++ b/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());
}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserCarClient.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserCarClient.java
index 344c06a..e9d2efe 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserCarClient.java
+++ b/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);
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/VipFallbackFactory.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/VipFallbackFactory.java
index 7326756..9c460b8 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/VipFallbackFactory.java
+++ b/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;
+ }
};
}
}
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/VipClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/VipClient.java
index c0a07e8..6ac6918 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/VipClient.java
+++ b/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);
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserCarController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserCarController.java
index 67ff1d8..10c1eaa 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserCarController.java
+++ b/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());
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
index 6fce279..c10320a 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
+++ b/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("是");
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
index 700ba9e..27ccbfa 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
+++ b/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());
+ }
--
Gitblit v1.7.1