From 40044e4ffb0b3e0c53a3d8b43bf048b7c5408c12 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 16 八月 2024 15:43:54 +0800
Subject: [PATCH] 修改启动异常
---
ruoyi-api/ruoyi-api-other/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 4 +++-
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderEvaluate.java | 2 +-
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java | 5 +++++
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 | 2 +-
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserIntegralChangeClient.java | 4 ++++
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserCarFallbackFactory.java | 2 +-
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java | 7 -------
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java | 2 +-
9 files changed, 17 insertions(+), 13 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 7a5d7e1..7c406e4 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
@@ -28,7 +28,7 @@
return new AppUserCarClient() {
@Override
- public R<List<TAppUserCar>> getCarByIds(List<Integer> carIds) {
+ public R<List<TAppUserCar>> getCarByIds(List<Long> carIds) {
return R.fail("根据用户车辆id查询车辆信息失败:"+throwable.getMessage());
}
};
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java
index ca9289e..e89e3b6 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java
@@ -36,6 +36,11 @@
}
@Override
+ public R updateAppUser(TAppUser appUser) {
+ return R.fail("修改用户失败:"+throwable.getMessage());
+ }
+
+ @Override
public R<List<TAppUser>> getUserByIds(List<Long> appUserIds) {
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 82bb2c5..27f3229 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
@@ -27,5 +27,5 @@
* @return
*/
@PostMapping(value = "/t-app-user-car/getCarByIds")
- public R<List<TAppUserCar>> getCarByIds(@RequestBody List<Integer> carIds);
+ public R<List<TAppUserCar>> getCarByIds(@RequestBody List<Long> carIds);
}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserIntegralChangeClient.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserIntegralChangeClient.java
index dfc2d19..2c86199 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserIntegralChangeClient.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserIntegralChangeClient.java
@@ -1,13 +1,17 @@
package com.ruoyi.account.api.feignClient;
+import com.ruoyi.account.api.factory.AppUserIntegralChangeFallbackFactory;
import com.ruoyi.account.api.model.TAppUserIntegralChange;
+import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
+import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
/**
* @author zhibing.pu
* @Date 2024/8/16 11:01
*/
+@FeignClient(contextId = "AppUserIntegralChangeClient", value = ServiceNameConstants.ACCOUNT_SERVICE, fallbackFactory = AppUserIntegralChangeFallbackFactory.class)
public interface AppUserIntegralChangeClient {
/**
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderEvaluate.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderEvaluate.java
index c44dd0e..4ebe265 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderEvaluate.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderEvaluate.java
@@ -45,7 +45,7 @@
@ApiModelProperty(value = "充电车辆 id")
@TableField("app_user_car_id")
- private Integer appUserCarId;
+ private Long appUserCarId;
@ApiModelProperty(value = "评分")
@TableField("mark")
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java
index 4e7777b..87a0230 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java
@@ -107,13 +107,6 @@
@TableField("explain")
private String explain;
- @ApiModelProperty(value = "封面图")
- @TableField("cover_picture")
- private String coverPicture;
- @ApiModelProperty(value = "详情图片")
- @TableField("details_picture")
- private String detailsPicture;
-
@ApiModelProperty(value = "说明")
@TableField("remark")
private String remark;
diff --git a/ruoyi-api/ruoyi-api-other/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-api/ruoyi-api-other/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 3398b1d..8ca6c74 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/ruoyi-api/ruoyi-api-other/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -3,4 +3,6 @@
com.ruoyi.other.api.factory.RoleSiteFallbackFactory
com.ruoyi.other.api.factory.TEvaluationTagFallbackFactory
com.ruoyi.other.api.factory.VipFallbackFactory
-com.ruoyi.other.api.factory.IntegralRuleFallbackFactory
\ No newline at end of file
+com.ruoyi.other.api.factory.IntegralRuleFallbackFactory
+com.ruoyi.other.api.factory.GoodsFallbackFactory
+com.ruoyi.other.api.factory.CouponFallbackFactory
\ No newline at end of file
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 7a4479f..d438eb7 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
@@ -34,7 +34,7 @@
* @return
*/
@PostMapping(value = "/t-app-user-car/getCarByIds")
- public R<List<TAppUserCar>> getCarByIds(@RequestBody List<Integer> carIds){
+ public R<List<TAppUserCar>> getCarByIds(@RequestBody List<Long> carIds){
return R.ok(appUserCarService.list(Wrappers.lambdaQuery(TAppUserCar.class).in(TAppUserCar::getId,carIds)));
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
index 212b792..fda8e8f 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
@@ -420,7 +420,7 @@
Integer id = gunMonitoring.getId();
//根据订单数据查询车牌号
TChargingOrder chargingOrder = chargingOrderClient.getOrderDetailByGunId(id).getData();
- Integer appUserCarId = chargingOrder.getAppUserCarId();
+ Long appUserCarId = chargingOrder.getAppUserCarId();
if(null != appUserCarId){
TAppUserCar tAppUserCar = appUserCarClient.getCarByIds(Arrays.asList(appUserCarId)).getData().get(0);
gunMonitoring.setLicensePlate(tAppUserCar.getLicensePlate());
--
Gitblit v1.7.1