From 75a2180d5c8d6bab949e13da561a126c5c4e0d92 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 14 Aug 2020 15:27:09 +0800 Subject: [PATCH] add entrust close order interface --- src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java | 7 +++++++ src/main/java/com/xcong/excoin/modules/contract/parameter/dto/SubmitCloseEntrustDto.java | 34 ++++++++++++++++++++++++++++++++++ src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 4 +--- 3 files changed, 42 insertions(+), 3 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 7d1430b..c7fa80c 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 @@ -3,6 +3,7 @@ import cn.hutool.core.util.StrUtil; import com.xcong.excoin.common.enumerates.SymbolEnum; import com.xcong.excoin.common.response.Result; +import com.xcong.excoin.modules.contract.parameter.dto.SubmitCloseEntrustDto; import com.xcong.excoin.modules.contract.parameter.dto.SubmitEntrustDto; import com.xcong.excoin.modules.contract.parameter.vo.ContractEntrustVo; import com.xcong.excoin.modules.contract.service.ContractEntrustOrderService; @@ -60,4 +61,10 @@ public Result cancelEntrustOrder(@ApiParam(name = "id", value = "委托单ID", required = true, example = "1") @RequestParam("id") Long id) { return contractEntrustOrderService.cancelEntrustOrder(id); } + + @ApiOperation(value = "全仓模式 -- 提交平仓委托单", notes = "平仓委托单") + @PostMapping(value = "/submitCloseEntrustOrder") + public Result submitCloseEntrustOrder(@RequestBody SubmitCloseEntrustDto submitCloseEntrustDto) { + return Result.ok("提交成功"); + } } diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/dto/SubmitCloseEntrustDto.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/dto/SubmitCloseEntrustDto.java new file mode 100644 index 0000000..7c03c3c --- /dev/null +++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/dto/SubmitCloseEntrustDto.java @@ -0,0 +1,34 @@ +package com.xcong.excoin.modules.contract.parameter.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; + +/** + * @author wzy + * @date 2020-08-14 + **/ +@Data +@ApiModel(value = "SubmitCloseEntrustDto", description = "提交委托平仓参数接收类") +public class SubmitCloseEntrustDto { + + @NotNull + @ApiModelProperty(value = "持仓订单ID", example = "1") + private Long id; + + @NotNull() + @Min(1) + @ApiModelProperty(value = "委托价", example = "9000.00") + private BigDecimal entrustPrice; + + @NotNull + @Min(1) + @ApiModelProperty(value = "币种数量", example = "1") + private int symbolCnt; + +} diff --git a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java index 2a6192d..1a4500d 100644 --- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java +++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java @@ -88,7 +88,7 @@ * * @return */ - public static BigDecimal getForceSetPriceForWhole(@NotNull String symbol, @NotNull MemberEntity memberEntity) { + public static void getForceSetPriceForWhole(@NotNull String symbol, @NotNull MemberEntity memberEntity) { ContractHoldOrderDao holdOrderDao = SpringContextHolder.getBean(ContractHoldOrderDao.class); MemberWalletContractDao walletContractDao = SpringContextHolder.getBean(MemberWalletContractDao.class); CacheSettingUtils cacheSettingUtils = SpringContextHolder.getBean(CacheSettingUtils.class); @@ -156,8 +156,6 @@ } else { throw new GlobalException("强平价异常"); } - - return null; } private static void sendOrderBombMsg(Long id, int type, BigDecimal forceClosingPrice, String symbol, int operateNo) { -- Gitblit v1.9.1