xiaoyong931011
2020-08-06 568d033e0cca67b0ceb8d4106850c97dbd36f373
20200806  代码提交
4 files modified
23 ■■■■■ changed files
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java 10 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/documentary/vo/TradeHistoryOrderInfoVo.java 9 ●●●●● 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/modules/documentary/service/impl/DocumentaryServiceImpl.java
@@ -638,6 +638,16 @@
        if(MemberEntity.CERTIFY_STATUS_Y != certifyStatus) {
            return Result.fail(MessageSourceUtils.getString("member_controller_0009"));
        }
        //不可以处于跟单状态
        Map<String, Object> columnMaps = new HashMap<>();
        columnMaps.put("member_id", memberId);
        columnMaps.put("is_follow", 1);
        List<FollowFollowerProfitEntity> followFollowerProfitEntitys = followFollowerProfitDao.selectByMap(columnMaps);
        if(CollUtil.isNotEmpty(followFollowerProfitEntitys)) {
            return Result.fail(MessageSourceUtils.getString("documentary_service_0015"));
        }
        Map<String, Object> columnMap = new HashMap<>();
        columnMap.put("member_id", memberId);
        List<FollowTraderInfoEntity> selectByMap = followTraderInfoDao.selectByMap(columnMap);
src/main/java/com/xcong/excoin/modules/documentary/vo/TradeHistoryOrderInfoVo.java
@@ -58,5 +58,14 @@
    
    @ApiModelProperty("交易员")
    private String nickname;
    @ApiModelProperty("带单收益")
    private BigDecimal followerRewardAmount;
    @ApiModelProperty("带单收益率")
    private BigDecimal followerRewardRatio;
    @ApiModelProperty("跟随人数")
    private int followerNumber;
}
src/main/resources/i18n/messages_en_US.properties
@@ -223,6 +223,8 @@
home_service_0013=Modification succeeded, please log in
home_service_0014=The mobile number does not exist, please register and log in
documentary_service_0015=Please cancel and apply again
uploadFile_controller_0001=Upload failed
result_success_msg=Operation success
src/main/resources/i18n/messages_zh_CN.properties
@@ -223,6 +223,8 @@
home_service_0013=修改成功,请登录
home_service_0014=不存在该手机号码,请进行注册登录
documentary_service_0015=当前有跟单,请取消再申请
uploadFile_controller_0001=上传失败
result_success_msg=操作成功