20200805 代码提交

xiaoyong931011

2020-08-05 727e8c0432452a7bd7e912a11ec3ea43890cd44a

20200805  代码提交

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

@@ -139,9 +139,9 @@
                    Long memberId = user.getId();

                    FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitDao.selectDocumentaryOrderSetInfoBymemberIdAndTradeId(memberId, traderId);

                    if(ObjectUtil.isNotEmpty(followFollowerProfitEntity)) {

                        FollowTraderProfitInfoVo.setDocumentaaryType(followFollowerProfitEntity.getIsFollow());

                        FollowTraderProfitInfoVo.setDocumentaryType(followFollowerProfitEntity.getIsFollow());

                    }else {

                        FollowTraderProfitInfoVo.setDocumentaaryType(2);

                        FollowTraderProfitInfoVo.setDocumentaryType(2);

                    }

                }

                Long traderId = FollowTraderProfitInfoVo.getTraderId();

@@ -579,6 +579,15 @@
        FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(traderId);

        Long memberId = followTraderInfoEntity.getMemberId();

        FollowTraderProfitInfoVo followTraderProfitInfoVo = followTraderProfitInfoDao.selectOneByMemberId(memberId);

        MemberEntity user = LoginUserUtils.getUser();

        if(ObjectUtil.isNotEmpty(user)) {

            FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitDao.selectDocumentaryOrderSetInfoBymemberIdAndTradeId(memberId, traderId);

            if(ObjectUtil.isNotEmpty(followFollowerProfitEntity)) {

                followTraderProfitInfoVo.setDocumentaryType(followFollowerProfitEntity.getIsFollow());

            }else {

                followTraderProfitInfoVo.setDocumentaryType(2);

            }

        }

        String avatar = followTraderInfoEntity.getAvatar();

        String nickname = followTraderInfoEntity.getNickname();

        String declaration = followTraderInfoEntity.getDeclaration();


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

@@ -81,6 +81,6 @@
     * 跟单状态 1：已跟单2：未跟单

     */

    @ApiModelProperty("跟单状态 1：已跟单2：未跟单")

    private Integer documentaaryType;

    private Integer documentaryType;



}