conflict

Helius

2020-08-06 ad4774eff562d52b2677cfbcf8e55b8506d57891

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

@@ -10,6 +10,8 @@
import javax.annotation.Resource;

import javax.validation.Valid;



import com.xcong.excoin.modules.documentary.common.NoticeConstant;

import com.xcong.excoin.utils.*;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



@@ -68,10 +70,6 @@
import com.xcong.excoin.modules.member.entity.MemberLevelRateEntity;

import com.xcong.excoin.modules.member.entity.MemberWalletContractEntity;

import com.xcong.excoin.modules.platform.entity.PlatformTradeSettingEntity;

import com.xcong.excoin.utils.CacheSettingUtils;

import com.xcong.excoin.utils.CoinTypeConvert;

import com.xcong.excoin.utils.MessageSourceUtils;

import com.xcong.excoin.utils.RedisUtils;



import cn.hutool.core.collection.CollUtil;

import cn.hutool.core.util.ObjectUtil;

@@ -927,7 +925,25 @@
        FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitDao.selectById(id);

        followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_N);

        followFollowerProfitDao.updateById(followFollowerProfitEntity);

        


        //删除【跟随者设置】

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

        Long followMemberId = followFollowerProfitEntity.getMemberId();

        Long tradeId = followFollowerProfitEntity.getTradeId();

        columnMap.put("member_id", followMemberId);

        columnMap.put("trade_id", tradeId);

        List<FollowFollowerSettingEntity> selectByMap = followFollowerSettingDao.selectByMap(columnMap);

        if(CollUtil.isNotEmpty(selectByMap)) {

           for(FollowFollowerSettingEntity followFollowerSettingEntity : selectByMap) {

              followFollowerSettingDao.deleteById(followFollowerSettingEntity.getId());

           }

        }



      FollowTraderInfoEntity traderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);



      if (traderInfoEntity != null) {

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

      }

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

   }