xiaoyong931011
2021-03-04 75077ad781cec8a590f36aceadb27e930d69f48f
20210304   昵称只能修改一次
5 files modified
22 ■■■■■ changed files
src/main/java/com/xcong/excoin/modules/documentary/entity/FollowTraderInfoEntity.java 6 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java 11 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/documentary/vo/TradeSetInfoVo.java 3 ●●●●● 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/entity/FollowTraderInfoEntity.java
@@ -34,6 +34,12 @@
     */
    private String nickname;
    /**
     * 名称是否已修改
     */
    private Integer nicknameState;
    public static final Integer STATE_Y = 1;
    public static final Integer STATE_N = 0;
    /**
     * 宣言
     */
    private String declaration;
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
@@ -773,6 +773,7 @@
        }else {
            followTraderInfoEntity.setNickname(email.replaceAll("(\\w?)(\\w+)(\\w)(@\\w+\\.[a-z]+(\\.[a-z]+)?)","$1****$3$4"));
        }
        followTraderInfoEntity.setNicknameState(FollowTraderInfoEntity.STATE_N);
        followTraderInfoEntity.setDeclaration(FollowTraderInfoEntity.DECLARATION_DEFAULT);
        followTraderInfoEntity.setIsAll(FollowTraderInfoEntity.IS_ALL_N);
        followTraderInfoEntity.setProfitRatio(BigDecimal.ZERO);
@@ -819,6 +820,8 @@
        tradeSetInfoVo.setAvatar(avatar);
        String nickname = followTraderInfoEntity.getNickname();
        tradeSetInfoVo.setNickname(nickname);
        Integer nicknameState = followTraderInfoEntity.getNicknameState();
        tradeSetInfoVo.setNicknameState(nicknameState);
        String declaration = followTraderInfoEntity.getDeclaration();
        tradeSetInfoVo.setDeclaration(declaration);
        Integer isOpen = followTraderInfoEntity.getIsOpen();
@@ -853,6 +856,14 @@
        String declaration = updateTradeSetInfoDto.getDeclaration();
        int isOpen = updateTradeSetInfoDto.getIsOpen();
        String labels = updateTradeSetInfoDto.getLabels();
        Integer nicknameState = followTraderInfoEntity.getNicknameState();
        if(FollowTraderInfoEntity.STATE_Y == nicknameState && !nickname.equals(followTraderInfoEntity.getNickname())) {
            return Result.ok(MessageSourceUtils.getString("member_service_0099"));
        }
        if(!nickname.equals(followTraderInfoEntity.getNickname())) {
            followTraderInfoEntity.setNickname(nickname);
            followTraderInfoEntity.setNicknameState(FollowTraderInfoEntity.STATE_Y);
        }
        followTraderInfoEntity.setLabels(labels);
        followTraderInfoEntity.setAvatar(avatar);
        followTraderInfoEntity.setNickname(nickname);
src/main/java/com/xcong/excoin/modules/documentary/vo/TradeSetInfoVo.java
@@ -18,6 +18,9 @@
    
    @ApiModelProperty("名称")
    private String nickname;
    @ApiModelProperty("名称状态:0:未修改 1:已修改")
    private int nicknameState;
    
    @ApiModelProperty("是否开启带单 1是2否")
    private int isOpen;
src/main/resources/i18n/messages_en_US.properties
@@ -140,6 +140,7 @@
member_service_0096=Transfer fail
member_service_0097=Payment method already exists
member_service_0098=Please select another account
member_service_0099=The nickname can only be modified once
order_service_0001=Wrong parameter value
order_service_0002=Not logged in
src/main/resources/i18n/messages_zh_CN.properties
@@ -140,6 +140,7 @@
member_service_0096=划转失败
member_service_0097=支付方式已存在
member_service_0098=请选择其他账户
member_service_0099=昵称只允许修改一次
order_service_0001=参值有误
order_service_0002=未登录