From 236ee756261300273a2e98087c014745dea1acea Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 28 十一月 2022 14:13:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 117710e..0da1529 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
@@ -176,7 +176,15 @@
@GetMapping("orderDetail")
@ApiImplicitParam(name = "orderId", value = "订单id", required = true)
public R orderDetail(@RequestParam("orderId") Long orderId) {
- return communityService.orderDetailFlower(orderId);
+ return communityService.orderDetailFlower(orderId,null);
+ }
+
+ @ApiOperation(value = "自提点查询订单详情", response = ComShopFlowerOrderPageVO.class)
+ @GetMapping("pointOrderDetail")
+ @ApiImplicitParam(name = "orderId", value = "订单id", required = true)
+ public R pointOrderDetail(@RequestParam("orderId") Long orderId) {
+ String phone = this.getLoginUserInfo().getPhone();
+ return communityService.orderDetailFlower(orderId,phone);
}
@ApiOperation(value = "取消订单")
@@ -534,6 +542,7 @@
@PostMapping("/shipOrderFlower")
@ApiOperation(value = "订单发货")
public R shipOrderFlower(@RequestBody ComShopOrderShipDTO orderShipDTO) {
+ orderShipDTO.setOperUserAccount(this.getLoginUserInfo().getAccount());
return communityService.shipOrderFlower(orderShipDTO);
}
}
--
Gitblit v1.7.1