From d344e2b6d98c9942bdb9febf5d36886f6acadb0c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 07 Jul 2020 10:04:22 +0800
Subject: [PATCH] modify closing newprice

---
 src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 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 c770cbd..a71f393 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
@@ -4,12 +4,11 @@
 import com.xcong.excoin.common.enumerates.SymbolEnum;
 import com.xcong.excoin.common.response.Result;
 import com.xcong.excoin.modules.contract.parameter.dto.SubmitEntrustDto;
+import com.xcong.excoin.modules.contract.parameter.vo.ContractEntrustVo;
 import com.xcong.excoin.modules.contract.service.ContractEntrustOrderService;
 import com.xcong.excoin.utils.TypeJudgeUtils;
 import com.xcong.excoin.utils.api.response.Symbol;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -34,7 +33,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("非法币种");
         }
 
@@ -46,15 +45,18 @@
     }
 
     @ApiOperation(value = "获取当前委托单列表", notes = "获取当前委托单列表")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "success", response = ContractEntrustVo.class)
+    })
     @GetMapping(value = "/findCurrentEntrustOrderList")
-    public Result findCurrentEntrustOrderList() {
-        return null;
+    public Result findCurrentEntrustOrderList(@ApiParam(name = "symbol", value = "币种",  example = "BTC/USDT") @RequestParam(value = "symbol", required = false) String symbol) {
+        return contractEntrustOrderService.findEntrustOrderList(symbol);
     }
 
 
     @ApiOperation(value = "撤销委托单", notes = "撤销委托单")
     @GetMapping(value = "/cancelEntrustOrder")
-    public Result cancelEntrustOrder(@ApiParam(name = "id", value="委托单ID", required = true, example = "1") @RequestParam("id") Long id) {
+    public Result cancelEntrustOrder(@ApiParam(name = "id", value = "委托单ID", required = true, example = "1") @RequestParam("id") Long id) {
         return contractEntrustOrderService.cancelEntrustOrder(id);
     }
 }

--
Gitblit v1.9.1