From 1b6ec86cbd1dba77f665426dbcd4851ee4ea8ed8 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 28 十一月 2022 14:30:38 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 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 6127ca3..0534d39 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
@@ -8,6 +8,7 @@
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointOrderVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientServiceCategoryVO;
@@ -175,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 = "取消订单")
@@ -223,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")
@@ -352,7 +361,7 @@
* @param pageComFlowerOrderListDTO
* @return
*/
- @ApiOperation(value = "未配送-开始配送-订单列表", response = ComShopFlowerOrderPageVO.class)
+ @ApiOperation(value = "未配送-开始配送-订单列表", response = ConvenientElevatingPointOrderVO.class)
@PostMapping("pageNoDeliveryOrderList")
public R pageNoDeliveryOrderList(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
return communityService.pageNoDeliveryOrderList(pageComFlowerOrderListDTO);
@@ -512,4 +521,28 @@
return communityService.refundOrderDetail(id);
}
+ /**
+ * 清点商品 确认送达详情
+ * @param pageComFlowerOrderListDTO
+ * @return
+ */
+ @PostMapping("pageOrderByDeliveryNo")
+ @ApiOperation(value = "清点商品 确认送达详情",response = ComShopFlowerOrderDeliveryNoListVO.class)
+ public R pageOrderByDeliveryNo(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO){
+ return communityService.pageOrderByDeliveryNo(pageComFlowerOrderListDTO);
+ }
+
+
+ /**
+ * 订单发货
+ *
+ * @param orderShipDTO 发货信息
+ * @return 发货结果
+ */
+ @PostMapping("/shipOrderFlower")
+ @ApiOperation(value = "订单发货")
+ public R shipOrderFlower(@RequestBody ComShopOrderShipDTO orderShipDTO) {
+ orderShipDTO.setOperUserAccount(this.getLoginUserInfo().getAccount());
+ return communityService.shipOrderFlower(orderShipDTO);
+ }
}
--
Gitblit v1.7.1