conflict

Helius

2020-08-06 ad4774eff562d52b2677cfbcf8e55b8506d57891

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

@@ -467,6 +467,7 @@
         //更新【跟随者收益】数据

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

         columnMap.put("member_id", memberId);

         columnMap.put("trade_id", traderId);

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

         if (CollUtil.isNotEmpty(selectByMap)) {

            FollowFollowerProfitEntity followFollowerProfitEntity = selectByMap.get(0);

@@ -483,6 +484,28 @@
            followFollowerProfitDao.insert(followFollowerProfitEntity);

         }

      } else {

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

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

         columnMap.put("member_id", memberId);

         columnMap.put("trade_id", traderId);

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

         if (CollUtil.isNotEmpty(selectByMap)) {

            FollowFollowerProfitEntity followFollowerProfitEntity = selectByMap.get(0);

            followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_Y);

            followFollowerProfitDao.updateById(followFollowerProfitEntity);

         }else {

            FollowFollowerProfitEntity followFollowerProfitEntity = new FollowFollowerProfitEntity();

            followFollowerProfitEntity.setMemberId(memberId);

            followFollowerProfitEntity.setTradeId(traderId);

            FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(traderId);

            Long traderMemberId = followTraderInfoEntity.getMemberId();

            followFollowerProfitEntity.setTradeMemberId(traderMemberId);

            followFollowerProfitEntity.setTotalPrincipal(BigDecimal.ZERO);

            followFollowerProfitEntity.setTotalProfit(BigDecimal.ZERO);

            followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_Y);

            followFollowerProfitDao.insert(followFollowerProfitEntity);

         }

			
         isExistSetting.setSymbols(documentaryOrderSetDto.getSymbols());

         isExistSetting.setFollowType(documentaryOrderSetDto.getFollowType());

         isExistSetting.setFollowCnt(documentaryOrderSetDto.getFollowCnt());

@@ -873,9 +896,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);

               }

            }

            

@@ -903,9 +926,22 @@
        followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_N);

        followFollowerProfitDao.updateById(followFollowerProfitEntity);



        FollowTraderInfoEntity traderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);

        //删除【跟随者设置】

        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());

           }

        }



        if (traderInfoEntity != null) {

      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"));