Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-19 60f70f7409ec1ece8905e088fb43e0cb0258a70b

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopClient.java

@@ -6,11 +6,13 @@
import com.ruoyi.other.api.domain.Shop;
import com.ruoyi.other.api.factory.ShopClientFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.List;
import java.util.Set;

/**
 * @author zhibing.pu
@@ -27,7 +29,9 @@
    */
   @PostMapping("/shop/getShopById")
   R<Shop> getShopById(@RequestParam("id") Integer id);
	

   @PostMapping("/shop/getShopByUserId")
   R<List<Shop>> getShopByUserId(@RequestParam("id") Long id);
   
   /**
    * 根据店铺管理员电话获取门店数据
@@ -39,4 +43,7 @@

   @PostMapping("/getShopByUserIds")
   public R<List<Shop>> getShopByUserIds(@RequestBody List<Long> userIds);

   @GetMapping("/getShopIdByName")
    R<Set<Integer>> getShopIdByName(String shopName);
}