合并代码

puzhibing

2024-12-26 e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5

 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;

    /**
     * 添加商品
@@ -74,6 +78,18 @@
    }

    /**
     * 更新上/下架状态
     */
    @PutMapping("/manageGoodsStatus/{goodsId}/{status}")
    @ApiOperation(value = "商品上/下架", tags = {"管理后台-商品管理"})
    public R<Void> manageGoodsStatus(@PathVariable("goodsId") Long goodsId,
                                     @PathVariable("status") Integer status){
        goodsService.lambdaUpdate().eq(Goods::getId, goodsId).set(Goods::getStatus, status).update();
        return R.ok();
    }


    /**
     * 后台商品删除
     */
    @DeleteMapping("/manageGoodsDelete/{goodsId}")
@@ -81,6 +97,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 +170,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);
    }