From c31c769b7c5864be9973d8dd7e11d9ff8e2ac3e9 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 10:36:18 +0800
Subject: [PATCH] 1
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java
index f981d59..5c71417 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java
@@ -8,6 +8,8 @@
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.other.api.domain.Goods;
+import com.ruoyi.other.api.domain.VipSetting;
+import com.ruoyi.other.api.feignClient.VipSettingClient;
import com.ruoyi.other.service.GoodsService;
import com.ruoyi.other.vo.GoodsVO;
import io.swagger.annotations.Api;
@@ -32,6 +34,8 @@
public class GoodsController extends BaseController {
@Resource
private GoodsService goodsService;
+ @Resource
+ private VipSettingClient settingClient;
/**
* 添加商品
@@ -81,6 +85,15 @@
public R<Void> manageGoodsDelete(@PathVariable("goodsId") Long goodsId){
goodsService.removeById(goodsId);
return R.ok();
+ }
+
+ /**
+ * 获取会员等级信息
+ */
+ @GetMapping("/getVipSetting")
+ @ApiOperation(value = "会员等级信息", tags = {"管理后台-商品管理"})
+ public R<List<VipSetting>> getVipSetting(){
+ return settingClient.info();
}
@@ -145,7 +158,7 @@
@ResponseBody
@PostMapping("/getGoodsByIds")
public R<List<Goods>> getGoodsByIds(@RequestParam("ids") String [] ids){
- List<Goods> goods = goodsService.lambdaQuery().in(Goods::getId, ids).eq(Goods::getStatus, 0).list();
+ List<Goods> goods = goodsService.lambdaQuery().in(Goods::getId, ids).list();
return R.ok(goods);
}
--
Gitblit v1.7.1