From 8f2abbbda6c87c59d0c2c5da9979e78ea38e74db Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 21 一月 2025 18:15:00 +0800 Subject: [PATCH] 合并代码 --- cloud-server-account/src/main/java/com/dsh/account/feignclient/other/StoreClient.java | 51 ++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 36 insertions(+), 15 deletions(-) diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/StoreClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/StoreClient.java index a3469b0..ab30047 100644 --- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/StoreClient.java +++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/StoreClient.java @@ -1,42 +1,63 @@ package com.dsh.account.feignclient.other; +import com.dsh.account.entity.OperatorUser; import com.dsh.account.feignclient.course.model.QueryStoreList; import com.dsh.account.feignclient.other.model.*; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; - -import java.util.List; - -/** - * @author zhibing.pu - * @date 2023/6/24 15:54 - */ -import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import java.util.List; + @FeignClient(value = "mb-cloud-other") public interface StoreClient { + /** + * 根据运营商id获取对应运营商分账比例 返回格式: 微信分账比例,支付宝分账比例 + * @return + */ + @PostMapping("/base/getProportionByOperatorId/{id}") + String getProportionByOperatorId(@PathVariable("id") Integer id); + /** + * 根据运营商id获取对应运营商支付宝商户号 + * @return + */ + @PostMapping("/base/getSMIDByOperatorId") + String getSMIDByOperatorId(Integer id); + // 根据运营商id获取微信商户号 + @PostMapping("/base/getmerchantNumberByOperatorId/{id}") + String getmerchantNumberByOperatorId(@PathVariable("id")Integer id); + @PostMapping("/store/queryByStoreId") + OperatorUser queryByStoreId(Integer storeId); /** * 获取门店列表 + * * @return */ @PostMapping("/store/queryStoreList") List<Store> queryStoreList(QueryStoreList queryStoreList); - @PostMapping("/storeDetail/courseOfSto") - StoreDetailOfCourse getCourseOfStore(@RequestBody Integer storeId); + @PostMapping("/base/protocol/storeDetail/courseOfSto") + public StoreDetailOfCourse getCourseOfStore(@RequestBody Integer storeId); - @PostMapping("/storeDetail/nearbyStore") - List<StoreInfo> getAllNearbyStoreList(GetAllNearbyStoreList getAllNearbyStoreList); + @PostMapping("/base/protocol/storeDetail/nearbyStore") + List<StoreInfo> getAllNearbyStoreList(@RequestBody GetAllNearbyStoreList getAllNearbyStoreList); + @PostMapping("/base/protocol/storeDetail/citycodeLoLa") + List<StoreDetailList> getQueryStoreList(@RequestBody StoreOfCitycodeResp citycodeResp); - @PostMapping("/storeDetail/storeOfLonLat") - List<StoreLonLatList> getAllStoreLonLats(GetAllNearbyStoreList getAllNearbyStoreList); + /** + * 根据门店id获取门店信息 + * + * @param id + * @return + */ + @PostMapping("/store/queryStoreById") + Store queryStoreById(Integer id); + } -- Gitblit v1.7.1