From 3adc08889d2cbf5ea0b7759bfa4b4a19b9d44f4b Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 05 十二月 2022 17:33:00 +0800
Subject: [PATCH] #feat ,,
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
index 368bc3c..ae89b19 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
@@ -53,7 +53,6 @@
@PutMapping("/merchant/put")
public R putMerchant(@RequestBody @Validated(PutGroup.class) ConvenientMerchantDTO convenientMerchantDTO) {
convenientMerchantDTO.setUpdatedBy(this.getUserId());
- convenientMerchantDTO.setCreatedBy(this.getUserId());
return communityService.putMerchant(convenientMerchantDTO);
}
@@ -239,6 +238,22 @@
public R findPointByMerchantId(@RequestParam("merchantId") Long merchantId, @RequestParam("lat") String lat, @RequestParam("lng") String lng) {
return communityService.findPointByMerchantId(merchantId, lat, lng);
}
+ /**
+ * 获取商家周围 n(km)的自提点数量
+ *
+ * @param distance
+ * @return
+ */
+ @ApiOperation(value = "获取商家周围 n(km)的自提点数量")
+ @ApiImplicitParams({@ApiImplicitParam(name = "distance", value = "距离", required = false),
+ @ApiImplicitParam(name = "lat", value = "经度", required = true), @ApiImplicitParam(name = "lng", value = "纬度", required = true)})
+ @GetMapping("/point/findPointNumByDistance")
+ public R findPointNumByDistance(@RequestParam(value = "distance",required = false) Integer distance, @RequestParam("lat") String lat, @RequestParam("lng") String lng) {
+ if (null == distance){
+ return R.ok(0);
+ }
+ return communityService.findPointNumByDistance(distance, lat, lng);
+ }
/**
* 保存评价
@@ -415,7 +430,7 @@
@ApiOperation(value = "退款订单分页查询 用户", response = ComShopFlowerRefundOrderVO.class)
public R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- if (loginUserInfo.getBackstageType() == 5){
+ if (null != loginUserInfo.getBackstageType() && 5 == loginUserInfo.getBackstageType()){
pageComOrderRefundDTO.setStoreId(loginUserInfo.getStoreIdId());
}else {
pageComOrderRefundDTO.setUserId(this.getUserId());
--
Gitblit v1.7.1