From 772a2589061f58549c8bbf1490fdc153bedb584a Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 06 十二月 2022 15:04:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
index bde477a..cfe1606 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
@@ -423,6 +423,17 @@
}
/**
+ * 获取用户便民服务商家详情
+ *
+ * @param account 商家绑定账号
+ * @return
+ */
+ @GetMapping("/getMerchantInfoByAccount")
+ public R<ConvenientMerchantVO> getMerchantInfoByAccount(@RequestParam("account") String account) {
+ return convenientMerchantService.getMerchantInfoByAccount(account);
+ }
+
+ /**
* 获取商便民服务商家信息
*
* @param userId
@@ -851,4 +862,16 @@
public R findPointByMerchantId(@RequestParam("merchantId") Long merchantId, @RequestParam("lat") String lat, @RequestParam("lng") String lng) {
return convenientElevatingPointService.findPointByMerchantId(merchantId, lat, lng);
}
+
+
+ /**
+ * 获取商家周围 n(km)的自提点数量
+ *
+ * @param distance
+ * @return
+ */
+ @GetMapping("/point/findPointNumByDistance")
+ public R findPointNumByDistance(@RequestParam("distance") Integer distance, @RequestParam("lat") String lat, @RequestParam("lng") String lng) {
+ return convenientElevatingPointService.findPointNumByDistance(distance, lat, lng);
+ }
}
--
Gitblit v1.7.1