Merge remote-tracking branch 'origin/whole_new' into whole_new

zainali5120

2021-02-25 9219e18a9b2fb06b95b5c881b057d3fde7270ca3

 src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java

@@ -1,11 +1,14 @@
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;
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;
@@ -40,9 +43,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查询持仓订单详情")
@@ -75,10 +91,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 +110,35 @@
    }

    @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 = "全仓模式 - 变更仓位类型")
    @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());
    }

}