20200805 代码提交

xiaoyong931011

2020-08-05 f51f32afcbf123872e746803388616a5fccc27b7

20200805  代码提交

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

@@ -485,6 +485,16 @@
                followFollowerProfitDao.insert(followFollowerProfitEntity);

            }

        } else {

            //更新【跟随者收益】数据

            Map<String, Object> columnMap = new HashMap<>();

            columnMap.put("member_id", memberId);

            List<FollowFollowerProfitEntity> selectByMap = followFollowerProfitDao.selectByMap(columnMap);

            if (CollUtil.isNotEmpty(selectByMap)) {

                FollowFollowerProfitEntity followFollowerProfitEntity = selectByMap.get(0);

                followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_Y);

                followFollowerProfitDao.updateById(followFollowerProfitEntity);

            }

			
            isExistSetting.setSymbols(documentaryOrderSetDto.getSymbols());

            isExistSetting.setFollowType(documentaryOrderSetDto.getFollowType());

            isExistSetting.setFollowCnt(documentaryOrderSetDto.getFollowCnt());

@@ -875,9 +885,9 @@
                    String phone = memberEntity.getPhone();

                    String email = memberEntity.getEmail();

                    if(StrUtil.isNotEmpty(phone)) {

                        myFollowTraderInfoVo.setNickName(phone);

                        myFollowTraderInfoVo.setNickname(phone);

                    }else {

                        myFollowTraderInfoVo.setNickName(email);

                        myFollowTraderInfoVo.setNickname(email);

                    }

                }

                


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

@@ -14,7 +14,7 @@
    private Long id;

    

    @ApiModelProperty("名称")

    private String nickName;

    private String nickname;

    

    @ApiModelProperty(value = "累计跟随本金")

    private BigDecimal totalPrincipal;