合并代码

puzhibing

2024-12-26 e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5

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

@@ -4,6 +4,7 @@
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.domain.ShopBalanceStatement;
import com.ruoyi.other.api.factory.ShopClientFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
@@ -42,8 +43,18 @@
   R<Shop> getShopByPhone(@RequestParam("phone") String phone);

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

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

   @PostMapping("/shop-balance-statement/getList")
   R<List<ShopBalanceStatement>> getShopBalanceStatementList(@RequestBody ShopBalanceStatement shopBalanceStatement);
	
   /**
    * 编辑门店
    * @param shop
    */
   @PostMapping("/shop-balance-statement/updateShop")
   void updateShop(Shop shop);
}