xiaoyong931011
2021-03-03 1bee4bd57b5630ee778cb3a464635f4665a1e642
20210303   跟随者跟单成功后,产生持仓中跟单合约后,不能踢出
3 files modified
14 ■■■■■ changed files
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java 12 ●●●●● patch | view | raw | blame | history
src/main/resources/i18n/messages_en_US.properties 1 ●●●● patch | view | raw | blame | history
src/main/resources/i18n/messages_zh_CN.properties 1 ●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
@@ -1069,6 +1069,18 @@
        long id = outFollowInfoDto.getId();
        //获取【跟随者收益】
        FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitDao.selectById(id);
        //当前有跟单合约不允许移除
        //获取【跟随者-订单关联表】
        Map<String, Object> selectColumnMap = new HashMap<>();
        selectColumnMap.put("member_id", followFollowerProfitEntity.getMemberId());
        selectColumnMap.put("trade_member_id", memberId);
        selectColumnMap.put("order_type", FollowFollowerOrderRelationEntity.ORDER_TYPE_HOLD);
        List<FollowFollowerOrderRelationEntity> followFollowerOrderRelationEntitys = followFollowerOrderRelationDao.selectByMap(selectColumnMap);
        if(CollUtil.isNotEmpty(followFollowerOrderRelationEntitys)) {
            return Result.fail(MessageSourceUtils.getString("documentary_service_0019"));
        }
        followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_N);
        followFollowerProfitDao.updateById(followFollowerProfitEntity);
src/main/resources/i18n/messages_en_US.properties
@@ -230,6 +230,7 @@
documentary_service_0016=The trader has been set not to follow orders
documentary_service_0017=Please change the contract to separate margin mode
documentary_service_0018=In documentary, cannot adjust to full position margin mode
documentary_service_0019=The follower has a documentary contract and cannot kick out
uploadFile_controller_0001=Upload failed
src/main/resources/i18n/messages_zh_CN.properties
@@ -230,6 +230,7 @@
documentary_service_0016=该交易员已设置不能跟单
documentary_service_0017=请将合约修改为分仓保证金模式
documentary_service_0018=正在跟单中,无法调整为全仓保证金模式
documentary_service_0019=跟随者拥有跟单合约,无法踢出
uploadFile_controller_0001=上传失败