From 8e64d903658a8df9eebc873c1c72c68f9b9bda32 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 29 May 2020 20:00:24 +0800
Subject: [PATCH] finish entrust order interface

---
 src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java b/src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java
index 1fa881b..59d3b69 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java
@@ -9,12 +9,10 @@
 import com.xcong.excoin.utils.api.response.Symbol;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
@@ -36,7 +34,7 @@
     @ApiOperation(value = "合约提交委托订单", notes = "提交委托订单")
     @PostMapping(value = "/submitEntrustOrder")
     public Result submitEntrustOrder(@RequestBody @Validated SubmitEntrustDto submitEntrustDto) {
-        if (StrUtil.isBlank(SymbolEnum.getNameByValue(submitEntrustDto.getSymbol()))){
+        if (StrUtil.isBlank(SymbolEnum.getNameByValue(submitEntrustDto.getSymbol()))) {
             return Result.fail("非法币种");
         }
 
@@ -44,6 +42,19 @@
             return Result.fail("非法类型");
         }
 
-        return Result.ok("123");
+        return contractEntrustOrderService.addContractEntrustOrder(submitEntrustDto);
+    }
+
+    @ApiOperation(value = "获取当前委托单列表", notes = "获取当前委托单列表")
+    @GetMapping(value = "/findCurrentEntrustOrderList")
+    public Result findCurrentEntrustOrderList() {
+        return contractEntrustOrderService.findEntrustOrderList();
+    }
+
+
+    @ApiOperation(value = "撤销委托单", notes = "撤销委托单")
+    @GetMapping(value = "/cancelEntrustOrder")
+    public Result cancelEntrustOrder(@ApiParam(name = "id", value = "委托单ID", required = true, example = "1") @RequestParam("id") Long id) {
+        return contractEntrustOrderService.cancelEntrustOrder(id);
     }
 }

--
Gitblit v1.9.1