From 06c8ec846e8a8ebb113eea8bc73a3d75be4dba4e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 04 十二月 2024 12:06:43 +0800
Subject: [PATCH] 修改启动异常
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java | 2 +-
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SystemConfigController.java | 2 +-
ruoyi-api/ruoyi-api-other/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 3 ++-
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/TechnicianClient.java | 4 ++--
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java | 2 +-
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/SeckillActivityInfoMapper.xml | 2 +-
ruoyi-api/ruoyi-api-order/src/main/java/factory/RemoteOrderGoodsFallbackFactory.java | 4 ++--
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/RemoteVipSettingClient.java | 2 +-
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java | 2 +-
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java | 4 ++--
10 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
index 3d49960..6d11bd2 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
@@ -25,7 +25,7 @@
* @param id
* @return
*/
- @PostMapping("/appUser/getAppUserById")
+ @PostMapping("/app-user/getAppUserById")
AppUser getAppUserById(@RequestParam("id") Long id);
/**
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/factory/RemoteOrderGoodsFallbackFactory.java b/ruoyi-api/ruoyi-api-order/src/main/java/factory/RemoteOrderGoodsFallbackFactory.java
index d270ee6..aa39026 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/factory/RemoteOrderGoodsFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/factory/RemoteOrderGoodsFallbackFactory.java
@@ -3,7 +3,7 @@
import com.ruoyi.common.core.domain.R;
import feignClient.RemoteOrderGoodsClient;
import lombok.extern.slf4j.Slf4j;
-import model.OrderGood;
+import model.Order;
import org.springframework.cloud.openfeign.FallbackFactory;
import java.util.List;
@@ -14,7 +14,7 @@
public RemoteOrderGoodsClient create(Throwable cause) {
return new RemoteOrderGoodsClient(){
@Override
- public R<List<OrderGood>> goodsOrder(List<Long> goodsIds) {
+ public R<List<Order>> goodsOrder(List<Long> goodsIds) {
log.error("编辑用户信息失败：{}", cause.getMessage());
throw new RuntimeException("编辑用户信息失败");
}
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/RemoteVipSettingClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/RemoteVipSettingClient.java
index 99f46f9..e8aae85 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/RemoteVipSettingClient.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/RemoteVipSettingClient.java
@@ -11,6 +11,6 @@
@FeignClient(contextId = "RemoteOrderGoodsClient", value = ServiceNameConstants.OTHER_SERVICE, fallbackFactory = RemoteVipSettingFallbackFactory.class)
public interface RemoteVipSettingClient {
- @GetMapping("/vip-setting/getVipSettingById")
+ @GetMapping("/vip-setting/getVipSettingById")
R<VipSetting> getVipSettingById(@RequestParam(value = "id",required = true) Integer id);
}
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/TechnicianClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/TechnicianClient.java
index d340d35..da8b289 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/TechnicianClient.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/TechnicianClient.java
@@ -13,8 +13,8 @@
public interface TechnicianClient {
@PostMapping("/technician/shop/detail")
- R<Technician> shopdetail(@RequestParam Integer techId);
+ R<Technician> shopdetail(@RequestParam("techId") Integer techId);
@PutMapping("/technician-subscribe/updateStatus")
- R<Void> updateStatus(@RequestParam Integer status, @RequestParam Integer subscribeId);
+ R<Void> updateStatus(@RequestParam("status") Integer status, @RequestParam("subscribeId") Integer subscribeId);
}
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 f665d51..1790609 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
@@ -11,4 +11,5 @@
com.ruoyi.other.api.factory.CouponInfoClientFallbackFactory
com.ruoyi.other.api.factory.SystemConfigClientFallbackFactory
com.ruoyi.other.api.factory.StoreFallbackFactory
-com.ruoyi.other.api.factory.CouponClientFallbackFactory
\ No newline at end of file
+com.ruoyi.other.api.factory.CouponClientFallbackFactory
+com.ruoyi.other.api.factory.TechnicianClientFallbackFactory
\ No newline at end of file
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java
index 5fe3a69..bb53a14 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java
@@ -32,8 +32,8 @@
@ApiOperation(value = "banner列表", tags = {"小程序-banner"})
public R<List<Banner>> list(String name, Integer jumpType, Integer position){
List<Banner> list = bannerService.lambdaQuery().like(StringUtils.isNotEmpty(name), Banner::getName, name)
- .eq(Banner::getJumpType, jumpType)
- .eq(Banner::getPosition, position)
+ .eq(jumpType!=null,Banner::getJumpType, jumpType)
+ .eq(position!=null,Banner::getPosition, position)
.list();
return R.ok(list);
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
index 3f1dfcc..a63bd12 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
@@ -34,7 +34,7 @@
@Resource
private GoodsCategoryService goodsCategoryService;
- @PostMapping("/index/list")
+ @GetMapping("/index/list")
@ApiOperation(value = "商品分类", tags = {"小程序-首页"})
public R<List<GoodsCategory>> indexlist(){
List<GoodsCategory> indexlist = goodsCategoryService.lambdaQuery()
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SystemConfigController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SystemConfigController.java
index 53ff538..78d3303 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SystemConfigController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SystemConfigController.java
@@ -40,7 +40,7 @@
systemConfigService.save(systemConfig);
return R.ok();
}
- @PostMapping("/index/detail")
+ @GetMapping("/index/detail")
@ApiOperation(value = "宣传图片-公司简介", tags = {"后台-广告管理-首页配置","小程序-首页"})
public R<IndexConfigSetDto> detail(){
SystemConfig one = systemConfigService.lambdaQuery().eq(SystemConfig::getType, 2).one();
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java
index 46cb833..3a37e7b 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java
@@ -33,7 +33,7 @@
public class VipSettingController {
@Resource
private VipSettingService vipSettingService;
- @PostMapping("/info")
+ @GetMapping("/info")
@ApiOperation(value = "获取各级会员信息", tags = {"小程序-个人中心首页"})
public R<List<VipSetting>> info(){
List<VipSetting> list = vipSettingService.list();
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/SeckillActivityInfoMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/SeckillActivityInfoMapper.xml
index 1bf04b5..0703c40 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/SeckillActivityInfoMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/SeckillActivityInfoMapper.xml
@@ -17,7 +17,7 @@
LEFT JOIN t_goods tg ON tsai.good_id = tg.id
LEFT JOIN t_goods_seckill tgs ON tgs.seckill_activity_info_id = tsai.id
WHERE tsai.end_time >= NOW()
- <if test="goodsName != null and goodsName != ''">
+ <if test="name != null and name != ''">
AND tg.`name` LIKE concat('%',#{goodsName},'%')
</if>
<if test="goodsCategoryId != null">
--
Gitblit v1.7.1