合并代码

puzhibing

2024-12-26 e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5

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

@@ -3,11 +3,19 @@

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;
import com.ruoyi.other.service.GoodsShopService;
import com.ruoyi.other.vo.ShopGoodsList;
import com.ruoyi.other.vo.ShopGoodsListVo;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -19,7 +27,7 @@
 */
@RestController
@RequestMapping("/goods-shop")
public class GoodsShopController {
public class GoodsShopController extends BaseController {

   @Resource
   private GoodsShopService goodsShopService;
@@ -39,5 +47,32 @@
   }
   
   
   /**
    * 根据商品id集合和门店id查询数据
    * @param goodsIds
    * @return
    */
   @ResponseBody
   @PostMapping("/getGoodsShopByGoodsIds")
   public R<List<GoodsShop>> getGoodsShopByGoodsIds(@RequestBody GetGoodsShopByGoodsIds goodsIds) {
      List<GoodsShop> list = goodsShopService.list(new LambdaQueryWrapper<GoodsShop>()
            .eq(goodsIds.getShopId() != null,GoodsShop::getShopId, goodsIds.getShopId())
            .in(goodsIds.getGoodsIds() !=null ,GoodsShop::getGoodsId, goodsIds.getGoodsIds()));
      return R.ok(list);
   }
	
	
	
   @ResponseBody
   @GetMapping("/getShopGoodsList")
   @ApiOperation(value = "获取商品管理列表", tags = {"门店后台-商品管理"})
   public R<PageInfo<ShopGoodsList>> getShopGoodsList(ShopGoodsListVo shopGoodsListVo){
      PageInfo<ShopGoodsList> shopGoodsList = goodsShopService.getShopGoodsList(shopGoodsListVo);
      return R.ok(shopGoodsList);
   }
	
	

	
}