Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole...

Helius

2021-03-04 55de682ea7666c8bc03aa1a3414e9df78ea75ac6

Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole_new

 src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java

@@ -622,8 +622,11 @@
        documentaryOrderSetInfoVo.setFollowCnt(followCnt);

        

        Integer maxFollowCnt = followFollowerSettingEntity.getMaxFollowCnt();

        documentaryOrderSetInfoVo.setMaxFollowCnt(maxFollowCnt);

        
        if(maxFollowCnt == 0){

            documentaryOrderSetInfoVo.setMaxFollowCnt(null);

        }

        documentaryOrderSetInfoVo.setMaxFollowCnt(maxFollowCnt.toString());

        log.info(memberId + "-最大持仓张数-"+maxFollowCnt.toString());

        return Result.ok(documentaryOrderSetInfoVo);

    }




 src/main/java/com/xcong/excoin/modules/documentary/vo/DocumentaryOrderSetInfoVo.java

@@ -32,7 +32,7 @@
    private Integer followCnt;

    

    @ApiModelProperty(value = "跟单最大持仓张数数量", example = "2")

    private int maxFollowCnt;

    private String maxFollowCnt;



    public BigDecimal getProfit() {

        return profit.multiply(BigDecimal.valueOf(1));