修改bug

puzhibing

2025-01-13 acccff9860b271d55c55dc87486f7c20b9896e6c

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsShopController.java

@@ -4,9 +4,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.other.api.domain.Goods;
import com.ruoyi.other.api.domain.GoodsShop;
import com.ruoyi.other.api.vo.GetGoodsShopByGoodsIds;
import com.ruoyi.other.service.GoodsService;
import com.ruoyi.other.service.GoodsShopService;
import com.ruoyi.other.vo.ShopGoodsList;
import com.ruoyi.other.vo.ShopGoodsListVo;
@@ -30,6 +33,9 @@

   @Resource
   private GoodsShopService goodsShopService;

   @Resource
   private GoodsService goodsService;
   
   
   /**
@@ -65,10 +71,9 @@
   @ResponseBody
   @GetMapping("/getShopGoodsList")
   @ApiOperation(value = "获取商品管理列表", tags = {"门店后台-商品管理"})
   public TableDataInfo<ShopGoodsList> getShopGoodsList(ShopGoodsListVo shopGoodsListVo){
      startPage();
      List<ShopGoodsList> shopGoodsList = goodsShopService.getShopGoodsList(shopGoodsListVo);
      return getDataTable(shopGoodsList);
   public R<PageInfo<ShopGoodsList>> getShopGoodsList(ShopGoodsListVo shopGoodsListVo){
      PageInfo<ShopGoodsList> shopGoodsList = goodsShopService.getShopGoodsList(shopGoodsListVo);
      return R.ok(shopGoodsList);
   }