20200805 代码提交

xiaoyong931011

2020-08-05 6f706a7458611493e8f36fbe33ab2d6f8bdeff81

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

@@ -369,7 +369,7 @@
               

               // 回报率

               BigDecimal returnRate = rewardRatio.divide(contractHoldOrderEntity.getBondAmount().subtract(contractHoldOrderEntity.getOpeningFeeAmount()), 8, BigDecimal.ROUND_DOWN);

               myFollowOrderVo.setRewardRatio(returnRate.setScale(2, BigDecimal.ROUND_DOWN));

               myFollowOrderVo.setRewardRatio(returnRate.setScale(4, BigDecimal.ROUND_DOWN));

               

               myFollowOrderVos.add(myFollowOrderVo);

            }

@@ -469,6 +469,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);

@@ -485,6 +486,17 @@
            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);

         }

			
         isExistSetting.setSymbols(documentaryOrderSetDto.getSymbols());

         isExistSetting.setFollowType(documentaryOrderSetDto.getFollowType());

         isExistSetting.setFollowCnt(documentaryOrderSetDto.getFollowCnt());

@@ -875,9 +887,9 @@
               String phone = memberEntity.getPhone();

               String email = memberEntity.getEmail();

               if(StrUtil.isNotEmpty(phone)) {

                  myFollowTraderInfoVo.setAccount(phone);

                  myFollowTraderInfoVo.setNickname(phone);

               }else {

                  myFollowTraderInfoVo.setAccount(email);

                  myFollowTraderInfoVo.setNickname(email);

               }

            }