From 1f9889666aef211599087ce6dcc4cd6cff3496ad Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期四, 22 四月 2021 13:38:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
index f18bf7e..b2434a2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
@@ -444,8 +444,7 @@
*/
@PostMapping("/deliverOrder")
R deliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO){
- Long orderId = deliverDTO.getOrderId();
- return comShopOrderService.deliverOrder(orderId);
+ return comShopOrderService.deliverOrder(deliverDTO);
}
/**
* 订单配送
@@ -454,8 +453,7 @@
*/
@PostMapping("/finishDeliverOrder")
R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO){
- Long orderId = deliverDTO.getOrderId();
- return comShopOrderService.finishDeliverOrder(orderId);
+ return comShopOrderService.finishDeliverOrder(deliverDTO);
}
/**
--
Gitblit v1.7.1