Merge branch 'follow' into whole

Helius

2020-08-11 5ba662f26b836b7e9bc4e483bfe1cded5315b034

Merge branch 'follow' into whole

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

@@ -1001,7 +1001,7 @@
        FollowTraderInfoEntity traderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);



        if (traderInfoEntity != null) {

            LogRecordUtils.insertFollowerNotice(memberId, NoticeConstant.STOP_FOLLOW_TITLE, StrUtil.format(NoticeConstant.STOP_FOLLOW_CONTENT, traderInfoEntity.getNickname()));

            LogRecordUtils.insertFollowerNotice(followMemberId, NoticeConstant.STOP_FOLLOW_TITLE, StrUtil.format(NoticeConstant.STOP_FOLLOW_CONTENT, traderInfoEntity.getNickname()));

        }

        return Result.ok(MessageSourceUtils.getString("member_service_0026"));

    }


 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java

@@ -156,6 +156,7 @@
        member.setIsProfit(0);
        member.setSpread(BigDecimal.ONE);
        member.setClosingSpread(BigDecimal.ONE);
        member.setForceParam(BigDecimal.valueOf(0.0015));
        memberDao.insert(member);

        String inviteId = ShareCodeUtil.toSerialCode(member.getId());