xiaoyong931011
2021-03-22 2e6bd9c6265fdae521acfb4fd36ed7a292d33274
20210322 平仓禁用操作(平仓,一键平仓,止盈止损)
5 files modified
44 ■■■■■ changed files
src/main/java/com/xcong/excoin/common/response/Result.java 9 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java 25 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java 6 ●●●● patch | view | raw | blame | history
src/main/resources/i18n/messages_en_US.properties 2 ●●●●● patch | view | raw | blame | history
src/main/resources/i18n/messages_zh_CN.properties 2 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/common/response/Result.java
@@ -24,6 +24,8 @@
    private static final int FAIL = -1;
    private static final int LOGIN_FAIL = -2;
    private static final int LOADING = -4;
    @ApiModelProperty(value = "状态码", example = "0")
    private int code;
@@ -77,4 +79,11 @@
        result.msg = msg;
        return result;
    }
    public static Result loading(String msg) {
        Result result = new Result();
        result.code = LOADING;
        result.msg = msg;
        return result;
    }
}
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
@@ -550,6 +550,15 @@
    @Override
    public Result cancelHoldOrder(Long id) {
        MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
        //查询是否可以点击平仓按钮
        Long memberIdLong = memberEntity.getId();
        MemberEntity selectById = memberDao.selectById(memberIdLong);
        Integer pcState = selectById.getPcState();
        if(memberEntity.PCSTATE_N == pcState) {
            return Result.loading("loading_type");
        }
        ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectHoldOrderByMemberIdAndId(memberEntity.getId(), id);
        if (holdOrderEntity == null) {
            // 订单不存在
@@ -616,6 +625,14 @@
    @Override
    public Result cancelHoldOrderBatch(SymbolDto symbolDto) {
        MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
        //查询是否可以点击平仓按钮
        Long memberIdLong = memberEntity.getId();
        MemberEntity selectById = memberDao.selectById(memberIdLong);
        Integer pcState = selectById.getPcState();
        if(memberEntity.PCSTATE_N == pcState) {
            return Result.loading("loading_type");
        }
        List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbol(memberEntity.getId(), symbolDto.getSymbol(), 1);
        if (CollUtil.isEmpty(holdOrderEntities)) {
            return Result.fail("订单不存在");
@@ -633,6 +650,14 @@
    @Override
    public Result setTargetProfitOrLess(ProfitOrLessDto profitOrLessDto) {
        MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
        //查询是否可以点击平仓按钮
        Long memberIdLong = memberEntity.getId();
        MemberEntity selectById = memberDao.selectById(memberIdLong);
        Integer pcState = selectById.getPcState();
        if(memberEntity.PCSTATE_N == pcState) {
            return Result.loading("loading_type");
        }
        ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectHoldOrderByMemberIdAndId(memberEntity.getId(), profitOrLessDto.getId());
        if (holdOrderEntity == null) {
            return Result.fail("订单不存在");
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
@@ -185,7 +185,11 @@
    private Integer fingerprintState;
    
    /**
     * 是否可平仓   1:是   0:否
     * 是否可平仓   1:否   0:是
     */
    private Integer pcState;
    public static final Integer PCSTATE_Y = 0;
    public static final Integer PCSTATE_N = 1;
}
src/main/resources/i18n/messages_en_US.properties
@@ -261,3 +261,5 @@
unknown_type=Unknown type
loading_type=loading
src/main/resources/i18n/messages_zh_CN.properties
@@ -260,3 +260,5 @@
submit_repeat=请勿重复提交
unknown_type=未知类型
loading_type=加载中