From fae05b7ffe899ab996f7a9c31b4c96df7964a0de Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 07 Jul 2020 21:20:55 +0800
Subject: [PATCH] add dingtalk

---
 src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java |   44 +++++++++++++++++++++++++++++---------------
 1 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java b/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java
index 1449ba9..0be9cc1 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java
@@ -1,11 +1,10 @@
 package com.xcong.excoin.modules.contract.controller;
 
 import com.xcong.excoin.common.response.Result;
-import com.xcong.excoin.modules.contract.parameter.dto.ChangeBondDto;
-import com.xcong.excoin.modules.contract.parameter.dto.ProfitOrLessDto;
-import com.xcong.excoin.modules.contract.parameter.dto.SubmitOrderDto;
+import com.xcong.excoin.modules.contract.parameter.dto.*;
 import com.xcong.excoin.modules.contract.parameter.vo.ContractMoneyInfoVo;
 import com.xcong.excoin.modules.contract.parameter.vo.HoldOrderListVo;
+import com.xcong.excoin.modules.contract.parameter.vo.OrderListVo;
 import com.xcong.excoin.modules.contract.service.ContractHoldOrderService;
 import com.xcong.excoin.modules.contract.service.ContractOrderService;
 import com.xcong.excoin.rabbit.producer.OrderProducer;
@@ -43,14 +42,14 @@
             @ApiResponse(code = 0, message = "success", response = HoldOrderListVo.class)
     })
     @GetMapping(value = "/findHoldOrderList")
-    public Result findHoldOrderList() {
-        return contractHoldOrderService.findHoldOrderList();
+    public Result findHoldOrderList(@ApiParam(name = "symbol", value = "币种", example = "BTC/USDT") @RequestParam(value = "symbol", required = false) String symbol) {
+        return contractHoldOrderService.findHoldOrderList(symbol);
     }
 
-    @ApiOperation(value = "未完成--根据Id查询订单详情")
+    @ApiOperation(value = "根据Id查询持仓订单详情")
     @GetMapping(value = "/findHoldOrderDetail")
     public Result findHoldOrderDetail(@ApiParam(name = "id", value = "持仓ID", required = true, example = "1") @RequestParam(value = "id") Long id) {
-        return null;
+        return contractHoldOrderService.findHoldOrderDetailById(id);
     }
 
     @ApiOperation(value = "根据Id平仓")
@@ -60,9 +59,9 @@
     }
 
     @ApiOperation(value = "一键平仓")
-    @GetMapping(value = "/oneKeyClosing")
-    public Result oneKeyClosing() {
-        return contractHoldOrderService.cancelHoldOrderBatch();
+    @PostMapping(value = "/oneKeyClosing")
+    public Result oneKeyClosing(@RequestBody SymbolDto symbolDto) {
+        return contractHoldOrderService.cancelHoldOrderBatch(symbolDto);
     }
 
     @ApiOperation(value = "设置止盈止损")
@@ -73,14 +72,17 @@
 
     @ApiOperation(value = "调整保证金")
     @PostMapping(value = "/changeBond")
-    public Result changeBond(ChangeBondDto changeBondDto) {
+    public Result changeBond(@RequestBody @Validated ChangeBondDto changeBondDto) {
         return contractHoldOrderService.changeBond(changeBondDto);
     }
 
-    @ApiOperation(value = "未完成--分页查询历史订单列表")
-    @GetMapping(value = "/findHistoryOrderList")
-    public Result findHistoryOrderList() {
-        return null;
+    @ApiOperation(value = "分页查询历史订单列表")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "success", response = OrderListVo.class)
+    })
+    @PostMapping(value = "/findHistoryOrderList")
+    public Result findHistoryOrderList(@RequestBody @Validated OrderListDto orderListDto) {
+        return contractHoldOrderService.findOrderList(orderListDto);
     }
 
     @ApiOperation(value = "获取合约页面资产信息")
@@ -92,4 +94,16 @@
         return contractHoldOrderService.findContractMoneyInfo(symbol);
     }
 
+    @ApiOperation(value = "调整杠杆")
+    @PostMapping(value = "/changeLeverRate")
+    public Result changeLeverRate(@RequestBody @Validated ChangeLeverRateDto changeLeverRateDto) {
+        return contractHoldOrderService.changeLeverRate(changeLeverRateDto);
+    }
+
+    @ApiOperation(value = "查询历史委托订单详情")
+    @GetMapping(value = "/findOrderDetailById")
+    public Result findOrderDetailById(@ApiParam(name = "id", value = "订单id", required = true, example = "1") @RequestParam(value = "id") Long id) {
+        return contractHoldOrderService.findOrderDetailById(id);
+    }
+
 }

--
Gitblit v1.9.1