From 1a5c7cee38f3db0f3ce3bdb9ffe9bc440fbfa3cb Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 26 Jan 2021 18:00:26 +0800 Subject: [PATCH] modify --- src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 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 5edbdec..822744f 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,5 +1,6 @@ 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.parameter.dto.*; import com.xcong.excoin.modules.contract.parameter.vo.ContractMoneyInfoVo; @@ -7,6 +8,7 @@ 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; @@ -115,10 +117,24 @@ return contractHoldOrderService.findOrderDetailById(id); } - @ApiOperation(value = "全仓模式平仓") + @ApiOperation(value = "全仓模式 - 平仓") @PostMapping(value = "/closingOrder") public Result closingOrder(@RequestBody @Validated WholeCloseOrderDto wholeCloseOrderDto) { - return null; + return contractHoldOrderService.cancelHoldOrder(wholeCloseOrderDto); + } + + @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