From 7dc398717ae762e34a93ab90a678ee6451fbd157 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 13 Aug 2023 20:27:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=EF=BC=9A=201=E3=80=81?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/app/order/AppTradeOrderController.java  |  6 +++---
 .../trade/service/order/TradeOrderServiceImpl.java     | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
index c8a3abb6d..e84450bdb 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
@@ -135,11 +135,11 @@ public class AppTradeOrderController {
         return success(orderCount);
     }
 
-    @PutMapping("/take")
+    @PutMapping("/receive")
     @Operation(summary = "确认交易订单收货")
     @Parameter(name = "id", description = "交易订单编号")
-    public CommonResult<Boolean> takeOrder(@RequestParam("id") Long id) {
-        // TODO @芋艿：未实现，mock 用
+    public CommonResult<Boolean> receiveOrder(@RequestParam("id") Long id) {
+        tradeOrderService.receiveOrder(getLoginUserId(), id);
         return success(true);
     }
 
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
index 39eedffb2..434417168 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
@@ -489,11 +489,6 @@ public class TradeOrderServiceImpl implements TradeOrderService {
         // TODO 芋艿：lili 发送商品被购买完成的数据
     }
 
-    @Override
-    public TradeOrderDO getOrder(Long id) {
-        return tradeOrderMapper.selectById(id);
-    }
-
     /**
      * 校验交易订单满足可售货的条件
      *
@@ -516,6 +511,11 @@ public class TradeOrderServiceImpl implements TradeOrderService {
         return order;
     }
 
+    @Override
+    public TradeOrderDO getOrder(Long id) {
+        return tradeOrderMapper.selectById(id);
+    }
+
     @Override
     public TradeOrderDO getOrder(Long userId, Long id) {
         TradeOrderDO order = tradeOrderMapper.selectById(id);