From ecef817ae72967e5ffd935d730871ad049db679a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Mar 2021 17:28:47 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java | 2 +-
src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java | 10 ++++++++++
src/main/java/com/xcong/excoin/modules/contract/parameter/dto/SymbolDto.java | 3 +++
3 files changed, 14 insertions(+), 1 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 d31b1b2..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
@@ -2,6 +2,8 @@
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;
@@ -76,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);
}
diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/dto/SymbolDto.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/dto/SymbolDto.java
index 4319d46..253f01c 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/parameter/dto/SymbolDto.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/dto/SymbolDto.java
@@ -14,4 +14,7 @@
@ApiModelProperty(value = "币种", example = "BTC/USDT")
private String symbol;
+
+ @ApiModelProperty(hidden = true)
+ private Integer type;
}
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
index c8e82ea..a64317f 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
@@ -652,7 +652,7 @@
return Result.loading("loading_type");
}
- List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbol(memberEntity.getId(), symbolDto.getSymbol(), null);
+ List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbol(memberEntity.getId(), symbolDto.getSymbol(), symbolDto.getType());
if (CollUtil.isEmpty(holdOrderEntities)) {
return Result.fail("订单不存在");
}
--
Gitblit v1.9.1