From f40fc18d708f4ae6efa8c3c134491d134c3c905d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 25 May 2021 11:14:14 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java |   64 ++++++++++++++++++++++++++++++-
 1 files changed, 61 insertions(+), 3 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 75b6fbe..5f74494 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,12 +1,16 @@
 package com.xcong.excoin.modules.contract.controller;
 
+import com.xcong.excoin.common.LoginUserUtils;
 import com.xcong.excoin.common.response.Result;
+import com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity;
+import com.xcong.excoin.modules.contract.entity.ContractOrderEntity;
 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.modules.member.entity.MemberEntity;
 import com.xcong.excoin.rabbit.producer.OrderProducer;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
@@ -41,9 +45,22 @@
     @ApiResponses({
             @ApiResponse(code = 0, message = "success", response = HoldOrderListVo.class)
     })
+//    @GetMapping(value = "/findHoldOrderList")
+//    public Result findHoldOrderList(@ApiParam(name = "symbol", value = "币种", example = "BTC/USDT") @RequestParam(value = "symbol", required = false) String symbol) {
+//        return contractHoldOrderService.findHoldOrderList(symbol, 1);
+//    }
     @GetMapping(value = "/findHoldOrderList")
-    public Result findHoldOrderList(@ApiParam(name = "symbol", value = "币种", example = "BTC/USDT") @RequestParam(value = "symbol", required = false) String symbol) {
-        return contractHoldOrderService.findHoldOrderList(symbol);
+    public Result findHoldOrderList(@ApiParam(name = "symbol", value = "币种", example = "BTC/USDT") @RequestParam(value = "symbol") String symbol) {
+    	return contractHoldOrderService.findHoldOrderList(symbol, 1);
+    }
+
+    @ApiOperation(value = "查询当前持仓跟单订单列表 -- 轮询")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "success", response = HoldOrderListVo.class)
+    })
+    @GetMapping(value = "/findHoldFollowOrderList")
+    public Result findHoldFollowOrderList(@ApiParam(name = "symbol", value = "币种", example = "BTC/USDT") @RequestParam(value = "symbol", required = false) String symbol) {
+        return contractHoldOrderService.findHoldOrderList(symbol, 2);
     }
 
     @ApiOperation(value = "根据Id查询持仓订单详情")
@@ -61,6 +78,14 @@
     @ApiOperation(value = "一键平仓")
     @PostMapping(value = "/oneKeyClosing")
     public Result oneKeyClosing(@RequestBody SymbolDto symbolDto) {
+        symbolDto.setType(ContractOrderEntity.CONTRACTTYPE_NORMAL);
+        return contractHoldOrderService.cancelHoldOrderBatch(symbolDto);
+    }
+
+    @ApiOperation(value = "带单一键平仓")
+    @PostMapping(value = "/oneKeyClosingForFollow")
+    public Result oneKeyClosingForFollow(@RequestBody SymbolDto symbolDto) {
+        symbolDto.setType(ContractOrderEntity.CONTRACTTYPE_DOCUMENTARY);
         return contractHoldOrderService.cancelHoldOrderBatch(symbolDto);
     }
 
@@ -95,9 +120,42 @@
     }
 
     @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);
+    }
+
+    @ApiOperation(value = "全仓模式 - 平仓")
+    @PostMapping(value = "/closingOrder")
+    public Result closingOrder(@RequestBody @Validated WholeCloseOrderDto wholeCloseOrderDto) {
+        return contractHoldOrderService.cancelHoldOrder(wholeCloseOrderDto);
+    }
+
+    @ApiOperation(value = "全仓模式 - 一键平仓")
+    @PostMapping(value = "/oneKeyClosingForWhole")
+    public Result oneKeyClosingForWhole() {
+        SymbolDto symbolDto = new SymbolDto();
+        return contractHoldOrderService.cancelHoldOrderBatch(symbolDto);
+    }
+
+    @ApiOperation(value = "全仓模式 - 变更仓位类型")
+    @GetMapping(value = "/changePositionType")
+    public Result changePositionType() {
+        return contractHoldOrderService.changePositionType();
+    }
+
+    @GetMapping(value = "/findPositionType")
+    @ApiModelProperty(value = "全仓模式 -- 获取仓位状态")
+    public Result findPositionType() {
+        MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
+
+        return Result.ok("获取成功", memberEntity.getContractPositionType());
+    }
+
 }

--
Gitblit v1.9.1