ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsShopController.java
@@ -4,6 +4,7 @@ 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.GoodsShop; import com.ruoyi.other.api.vo.GetGoodsShopByGoodsIds; @@ -65,10 +66,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); }
@@ -1,6 +1,7 @@ package com.ruoyi.other.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.common.core.web.page.PageInfo; import com.ruoyi.other.api.domain.GoodsShop; import com.ruoyi.other.vo.ShopGoodsList; import com.ruoyi.other.vo.ShopGoodsListVo; @@ -27,7 +28,7 @@ * @param goodsCategoryId * @return */ List<ShopGoodsList> getShopGoodsList(@Param("shopId") Integer shopId, @Param("goodsId") String goodsId, List<ShopGoodsList> getShopGoodsList(PageInfo<ShopGoodsList> pageInfo, @Param("shopId") Integer shopId, @Param("goodsId") String goodsId, @Param("goodsName") String goodsName, @Param("goodsCategoryId") Integer goodsCategoryId); } ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GoodsShopService.java
@@ -1,6 +1,7 @@ package com.ruoyi.other.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.web.page.PageInfo; import com.ruoyi.other.api.domain.GoodsShop; import com.ruoyi.other.vo.ShopGoodsList; import com.ruoyi.other.vo.ShopGoodsListVo; @@ -22,5 +23,5 @@ * @param shopGoodsListVo * @return */ List<ShopGoodsList> getShopGoodsList(ShopGoodsListVo shopGoodsListVo); PageInfo<ShopGoodsList> getShopGoodsList(ShopGoodsListVo shopGoodsListVo); } ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsShopServiceImpl.java
@@ -1,6 +1,7 @@ package com.ruoyi.other.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.web.page.PageInfo; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.other.mapper.GoodsShopMapper; import com.ruoyi.other.api.domain.GoodsShop; @@ -39,10 +40,11 @@ * @return */ @Override public List<ShopGoodsList> getShopGoodsList(ShopGoodsListVo shopGoodsListVo) { public PageInfo<ShopGoodsList> getShopGoodsList(ShopGoodsListVo shopGoodsListVo) { PageInfo<ShopGoodsList> pageInfo = new PageInfo(shopGoodsListVo.getPageCurr(), shopGoodsListVo.getPageSize()); Long userid = tokenService.getLoginUser().getUserid(); SysUser sysUser = sysUserClient.getSysUser(userid).getData(); List<ShopGoodsList> shopGoodsList = this.baseMapper.getShopGoodsList(sysUser.getObjectId(), shopGoodsListVo.getId(), shopGoodsListVo.getName(), shopGoodsListVo.getGoodsCategoryId()); return shopGoodsList; List<ShopGoodsList> shopGoodsList = this.baseMapper.getShopGoodsList(pageInfo, sysUser.getObjectId(), shopGoodsListVo.getId(), shopGoodsListVo.getName(), shopGoodsListVo.getGoodsCategoryId()); return pageInfo.setRecords(shopGoodsList); } }
