Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-28 06f455915bb9d11caa8829942f9007809ee9ae3d

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

@@ -1,8 +1,13 @@
package com.ruoyi.other.controller;


import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.GoodsShop;
import com.ruoyi.other.service.GoodsShopService;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * <p>
@@ -16,5 +21,23 @@
@RequestMapping("/goods-shop")
public class GoodsShopController {

   @Resource
   private GoodsShopService goodsShopService;
	
	
   /**
    * 获取商品门店关系数据
    * @param goodsShop
    * @return
    */
   @ResponseBody
   @PostMapping("/getGoodsShop")
   public R<GoodsShop> getGoodsShop(@RequestBody GoodsShop goodsShop){
      GoodsShop one = goodsShopService.getOne(new LambdaQueryWrapper<GoodsShop>().eq(GoodsShop::getGoodsId, goodsShop.getGoodsId())
            .eq(GoodsShop::getShopId, goodsShop.getShopId()));
      return R.ok(one);
   }
	
	
}