From 09c68ce0ddbaebde08d0d370b5bb4ab0b1532a73 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 28 十一月 2022 15:03:02 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java | 7 +++++--
1 files changed, 5 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 0da1529..93d37d7 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
@@ -232,7 +232,7 @@
* @param merchantId
* @return
*/
- @ApiOperation(value = "获取自提点")
+ @ApiOperation(value = "获取自提点",response = ConvenientElevatingPointVO.class)
@ApiImplicitParams({@ApiImplicitParam(name = "merchantId", value = "商家Id", required = true),
@ApiImplicitParam(name = "lat", value = "经度", required = true), @ApiImplicitParam(name = "lng", value = "纬度", required = true)})
@GetMapping("/point/findPointByMerchantId")
@@ -414,7 +414,10 @@
@PostMapping("pageRefundOrder")
@ApiOperation(value = "退款订单分页查询 用户", response = ComShopFlowerRefundOrderVO.class)
public R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO) {
- if (null == pageComOrderRefundDTO.getStoreId()){
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (null != loginUserInfo.getBackstageType() && 5 == loginUserInfo.getBackstageType()){
+ pageComOrderRefundDTO.setStoreId(loginUserInfo.getStoreIdId());
+ }else {
pageComOrderRefundDTO.setUserId(this.getUserId());
}
return communityService.pageRefundOrder(pageComOrderRefundDTO);
--
Gitblit v1.7.1