Merge branch 'master' into whole

Helius

2020-08-14 9e8a8a68126721ac336b1bbc77e1f11d85a538cb

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

@@ -43,7 +43,16 @@
    })
    @GetMapping(value = "/findHoldOrderList")
    public Result findHoldOrderList(@ApiParam(name = "symbol", value = "币种", example = "BTC/USDT") @RequestParam(value = "symbol", required = false) String symbol) {
        return contractHoldOrderService.findHoldOrderList(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查询持仓订单详情")
@@ -95,9 +104,27 @@
    }

    @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 Result.ok("平仓成功");
    }

    @ApiOperation(value = "全仓模式 - 变更仓位类型")
    @GetMapping(value = "/changePositionType")
    public Result changePositionType() {
        return contractHoldOrderService.changePositionType();
    }

}