From dbee929294fc8b3bb8ff7c721023de4f57c89996 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Thu, 20 May 2021 17:48:24 +0800 Subject: [PATCH] modify --- src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java | 39 ++++++++++++++++++++++++++++++++------- 1 files changed, 32 insertions(+), 7 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..ef94ab0 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,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.xcong.excoin.common.response.Result; +import com.xcong.excoin.modules.otc.dto.HasPayDto; import com.xcong.excoin.modules.otc.dto.OrderAddDto; import com.xcong.excoin.modules.otc.dto.OrderListDto; 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 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; @@ -46,15 +51,35 @@ 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("操作成功"); } } -- Gitblit v1.9.1