From 4b1453e19306592f703aa794e238bd028f67d320 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:20:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/other/StoreClient.java | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 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 35bad4d..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,8 +1,10 @@
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.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -11,21 +13,32 @@
@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("/base/protocol/storeDetail/courseOfSto")
@@ -35,7 +48,16 @@
@PostMapping("/base/protocol/storeDetail/nearbyStore")
List<StoreInfo> getAllNearbyStoreList(@RequestBody GetAllNearbyStoreList getAllNearbyStoreList);
+ @PostMapping("/base/protocol/storeDetail/citycodeLoLa")
+ List<StoreDetailList> getQueryStoreList(@RequestBody StoreOfCitycodeResp citycodeResp);
- @PostMapping("/base/protocol/storeDetail/storeOfLonLat")
- List<StoreLonLatList> getAllStoreLonLats(@RequestBody GetAllNearbyStoreList getAllNearbyStoreList);
+ /**
+ * 根据门店id获取门店信息
+ *
+ * @param id
+ * @return
+ */
+ @PostMapping("/store/queryStoreById")
+ Store queryStoreById(Integer id);
+
}
--
Gitblit v1.7.1