From 233d60b729866fa1e8786bd6b0067022f6755ad4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 29 May 2020 19:30:48 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin
---
src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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..c770cbd 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;
@@ -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 null;
+ }
+
+
+ @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