From 0918083443d3920335c5b09a5d28e4f8d1bb3f45 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 27 May 2021 16:59:28 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java |   69 +++++++++++++++++++++++++++-------
 1 files changed, 55 insertions(+), 14 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..3065e30 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
@@ -3,12 +3,19 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.xcong.excoin.common.response.Result;
-import com.xcong.excoin.modules.otc.dto.OrderAddDto;
+import com.xcong.excoin.modules.otc.dto.HasPayDto;
+import com.xcong.excoin.modules.otc.dto.OrderApealDto;
 import com.xcong.excoin.modules.otc.dto.OrderListDto;
+import com.xcong.excoin.modules.otc.dto.OtcOrderAddDto;
 import com.xcong.excoin.modules.otc.service.OtcOrderService;
+import com.xcong.excoin.modules.otc.vo.BuyOrderDetailVo;
 import com.xcong.excoin.modules.otc.vo.OrderListVo;
+import com.xcong.excoin.modules.otc.vo.SaleOrderDetailVo;
+import com.xcong.excoin.utils.RedisUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.annotations.Param;
@@ -27,34 +34,68 @@
 
     @ApiOperation(value = "我要购买")
     @PostMapping(value = "/buy")
-    public Result buy(@RequestBody OrderAddDto orderAddDto) {
-        otcOrderService.buyOrder(orderAddDto);
-        return Result.ok("购买成功");
+    public Result buy(@RequestBody OtcOrderAddDto orderAddDto) {
+        return otcOrderService.buyOrder(orderAddDto);
     }
 
     @ApiOperation(value = "我要出售")
     @PostMapping(value = "/sale")
-    public Result sale(@RequestBody OrderAddDto orderAddDto) {
-        otcOrderService.saleOrder(orderAddDto);
-        return Result.ok("出售成功");
+    public Result sale(@RequestBody OtcOrderAddDto orderAddDto) {
+        return otcOrderService.saleOrder(orderAddDto);
     }
 
     @ApiOperation(value = "用户订单列表")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "success", response = OrderListVo.class)
+    })
     @PostMapping(value = "/orderList")
     public Result orderList(@RequestBody OrderListDto orderListDto) {
         IPage<OrderListVo> page = otcOrderService.findOrderListInPage(orderListDto);
         return Result.ok(page.getRecords());
     }
 
-    @ApiOperation(value = "已付款，请放币")
-    @PostMapping(value = "/hasPay/{id}")
-    public Result hasPay(@PathVariable("id") Long id) {
-        return null;
+    @ApiOperation(value = "买单 - 订单详情")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "success", response = BuyOrderDetailVo.class)
+    })
+    @GetMapping(value = "/buyOrderDetail/{id}")
+    public Result buyOrderDetail(@PathVariable("id") Long id) {
+        return otcOrderService.findBuyOrderDetail(id);
     }
 
-    @ApiOperation(value = "完成订单")
-    @PostMapping(value = "/finishSalesOrder/{id}")
+    @ApiOperation(value = "卖单 - 订单详情")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "success", response = SaleOrderDetailVo.class)
+    })
+    @GetMapping(value = "/saleOrderDetail/{id}")
+    public Result saleOrderDetail(@PathVariable("id") Long id) {
+        return otcOrderService.findSaleOrderDetail(id);
+    }
+
+    @ApiOperation(value = "已付款，请放币")
+    @PostMapping(value = "/hasPay")
+    public Result hasPay(@RequestBody HasPayDto hasPayDto) {
+        otcOrderService.hasPay(hasPayDto);
+        return Result.ok("操作成功");
+    }
+
+    @ApiOperation(value = "确认收款")
+    @PostMapping(value = "/finishOrder/{id}")
     public Result finishOrder(@PathVariable("id") Long id) {
-        return null;
+        otcOrderService.finishOrder(id);
+        return Result.ok("操作成功");
+    }
+
+    @ApiOperation(value = "取消订单")
+    @PostMapping(value = "/cancelUserOrder/{id}")
+    public Result cancelUserOrder(@PathVariable("id") Long id) {
+        otcOrderService.cancelOrder(id);
+        return Result.ok("操作成功");
+    }
+
+    @ApiOperation(value = "申诉")
+    @PostMapping(value = "/orderApeal")
+    public Result orderApeal(@RequestBody OrderApealDto orderApealDto) {
+        return otcOrderService.orderApeal(orderApealDto);
     }
 }

--
Gitblit v1.9.1