From d9ca3c9af0e2c1520b2163ca658febdd0a4e69f2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 20 May 2021 11:55:02 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java
index ee3a454..22b2ac7 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java
@@ -46,15 +46,23 @@
         return Result.ok(page.getRecords());
     }
 
-    @ApiOperation(value = "已付款,请放币")
-    @PostMapping(value = "/hasPay/{id}")
-    public Result hasPay(@PathVariable("id") Long id) {
+    @ApiOperation(value = "订单详情")
+    @GetMapping(value = "/orderDetail/{id}")
+    public Result orderDetail(@PathVariable("id") Long id) {
         return null;
     }
 
-    @ApiOperation(value = "完成订单")
-    @PostMapping(value = "/finishSalesOrder/{id}")
+    @ApiOperation(value = "已付款,请放币")
+    @PostMapping(value = "/hasPay/{id}")
+    public Result hasPay(@PathVariable("id") Long id) {
+        otcOrderService.hasPay(id);
+        return Result.ok("操作成功");
+    }
+
+    @ApiOperation(value = "确认收款")
+    @PostMapping(value = "/finishOrder/{id}")
     public Result finishOrder(@PathVariable("id") Long id) {
-        return null;
+        otcOrderService.finishOrder(id);
+        return Result.ok("操作成功");
     }
 }

--
Gitblit v1.9.1