From 85f63ceeb3f9e5e57b538d56407e94a4b19f6211 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 24 十一月 2023 09:32:15 +0800
Subject: [PATCH] 修改商家添加 新增判断是否是商家判断接口
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 73880de..6bc3eb8 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);
}
@@ -246,10 +245,13 @@
* @return
*/
@ApiOperation(value = "获取商家周围 n(km)的自提点数量")
- @ApiImplicitParams({@ApiImplicitParam(name = "merchantId", value = "商家Id", required = true),
+ @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("distance") Integer distance, @RequestParam("lat") String lat, @RequestParam("lng") String lng) {
+ 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);
}
@@ -427,12 +429,21 @@
@PostMapping("pageRefundOrder")
@ApiOperation(value = "退款订单分页查询 用户", response = ComShopFlowerRefundOrderVO.class)
public R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO) {
+ pageComOrderRefundDTO.setUserId(this.getUserId());
+ return communityService.pageRefundOrder(pageComOrderRefundDTO);
+ }
+
+ /**
+ * 商家 分页查询退款订单
+ *
+ * @param pageComOrderRefundDTO
+ * @return
+ */
+ @PostMapping("pageRefundOrderStore")
+ @ApiOperation(value = "退款订单分页查询 商家", response = ComShopFlowerRefundOrderVO.class)
+ public R pageRefundOrderStore(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- if (null != loginUserInfo.getBackstageType() && 5 == loginUserInfo.getBackstageType()){
- pageComOrderRefundDTO.setStoreId(loginUserInfo.getStoreIdId());
- }else {
- pageComOrderRefundDTO.setUserId(this.getUserId());
- }
+ pageComOrderRefundDTO.setStoreId(loginUserInfo.getStoreIdId());
return communityService.pageRefundOrder(pageComOrderRefundDTO);
}
--
Gitblit v1.7.1