Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-10 fb6eee80334ae23a2eca8c37baeef05e86c919ed

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

@@ -1,18 +1,22 @@
package com.ruoyi.other.api.feignClient;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
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.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.List;

/**
 * @author zhibing.pu
 * @Date 2024/11/29 10:28
 */
@FeignClient(contextId = "ShopClient", value = ServiceNameConstants.ORDER_SERVICE, fallbackFactory = ShopClientFallbackFactory.class)
@FeignClient(contextId = "ShopClient", value = ServiceNameConstants.OTHER_SERVICE, fallbackFactory = ShopClientFallbackFactory.class)
public interface ShopClient {
   
   
@@ -32,4 +36,7 @@
    */
   @PostMapping("/shop/getShopByPhone")
   R<Shop> getShopByPhone(@RequestParam("phone") String phone);

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