20200730 代码提交

xiaoyong931011

2020-07-30 fc5d2e8c20e82550eaf0e7ff1dc19f85d73a41bd

20200730  代码提交

 src/main/java/com/xcong/excoin/modules/documentary/dto/FollowRecordsDto.java

@@ -21,7 +21,7 @@
    private int pageSize;

    

    @NotNull

    @ApiModelProperty(value = "会员ID", example = "12543")

    private Long tradeMemberId;

    @ApiModelProperty(value = "交易员ID", example = "12543")

    private Long tradeId;



}


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

@@ -164,18 +164,24 @@
    @Override

    public Result getFollowRecords(@Valid FollowRecordsDto followRecordsDto) {

        

        FollowTraderInfoEntity followTraderInfoEn = followTraderInfoDao.selectById(followRecordsDto.getTradeId());

        Long memberId = followTraderInfoEn.getMemberId();

		
        Page<FollowRecordsVo> page = new Page<>(followRecordsDto.getPageNum(), followRecordsDto.getPageSize());

        IPage<FollowRecordsVo> historyOrderRecordsVoList = followFollowerProfitDao.selectFollowRecords(page, followRecordsDto.getTradeMemberId());

        IPage<FollowRecordsVo> historyOrderRecordsVoList = followFollowerProfitDao.selectFollowRecords(page, memberId);

        

        List<FollowRecordsVo> records = historyOrderRecordsVoList.getRecords();

        if(CollUtil.isNotEmpty(records)) {

            for(FollowRecordsVo followRecordsVo : records) {

                Long tradeId = followRecordsVo.getTradeId();

                FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(tradeId);

                String avatar = followTraderInfoEntity.getAvatar();

                followRecordsVo.setAvatar(avatar);

                String nickname = followTraderInfoEntity.getNickname();

                followRecordsVo.setNickname(nickname);

                Long memberIds = followRecordsVo.getMemberId();

                MemberEntity MemberEntity = memberDao.selectById(memberIds);

                String phone = MemberEntity.getPhone();

                String email = MemberEntity.getEmail();

                if(StrUtil.isNotEmpty(phone)) {

                    followRecordsVo.setNickname(phone);

                }else {

                    followRecordsVo.setNickname(email);

                }

            }

        }

        return Result.ok(historyOrderRecordsVoList);


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

@@ -23,14 +23,10 @@
     */

    @ApiModelProperty(value = "主键ID")

    private Long id;

    /**

     * 跟随者ID

     */

    
    @ApiModelProperty(value = "跟随者ID")

    private Long memberId;

    /**

     * 跟随者ID

     */

    
    @ApiModelProperty(value = "交易者ID")

    private Long tradeId;