From c326372b71da84c449b6097af5e281cd6fb46e2c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 08 Jun 2020 15:41:35 +0800
Subject: [PATCH] 20200608  代码提交

---
 src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 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 4593860..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
@@ -4,6 +4,7 @@
 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;
@@ -75,10 +76,13 @@
         return contractHoldOrderService.changeBond(changeBondDto);
     }
 
-    @ApiOperation(value = "未完成--分页查询历史订单列表")
-    @GetMapping(value = "/findHistoryOrderList")
+    @ApiOperation(value = "分页查询历史订单列表")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "success", response = OrderListVo.class)
+    })
+    @PostMapping(value = "/findHistoryOrderList")
     public Result findHistoryOrderList(@RequestBody @Validated OrderListDto orderListDto) {
-        return null;
+        return contractHoldOrderService.findOrderList(orderListDto);
     }
 
     @ApiOperation(value = "获取合约页面资产信息")
@@ -91,9 +95,15 @@
     }
 
     @ApiOperation(value = "调整杠杆")
-    @GetMapping(value = "/changeLeverRate")
+    @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