modify

Helius

2021-04-14 f3948fa31158c7b7dea3b038e01c43ce54c55a1c

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

@@ -216,6 +216,10 @@
              FollowTraderProfitInfoVo.setDeclaration(declaration);

              Integer isAll = followTraderInfoEntity.getIsAll();

              FollowTraderProfitInfoVo.setIsAll(isAll);



            Date entryTime = followTraderInfoEntity.getEntryTime();

            int datePoor = getDatePoor(entryTime, new Date());

            FollowTraderProfitInfoVo.setEntryDays(datePoor);

              

              String labels = followTraderInfoEntity.getLabels();

              if(StrUtil.isNotEmpty(labels)) {

@@ -405,7 +409,7 @@
                  myFollowOrderVo.setLeverRatio(leverRatio);

                  BigDecimal rewardAmount = contractOrderEntity.getRewardAmount().setScale(2, BigDecimal.ROUND_DOWN);

                  myFollowOrderVo.setRewardAmount(rewardAmount);

                  BigDecimal rewardRatio = contractOrderEntity.getRewardRatio().setScale(4, BigDecimal.ROUND_DOWN);

                  BigDecimal rewardRatio = contractOrderEntity.getRewardRatio() == null ? BigDecimal.ZERO : contractOrderEntity.getRewardRatio().setScale(4, BigDecimal.ROUND_DOWN);

                  myFollowOrderVo.setRewardRatio(rewardRatio);

                  int symbolCnt = contractOrderEntity.getSymbolCnt();

                  myFollowOrderVo.setSymbolCnt(symbolCnt);

@@ -526,7 +530,7 @@
            String nickname = followTraderInfoEntity.getNickname();

            myFollowTraderInfoVo.setNickname(nickname);

            BigDecimal totalPrincipal = FollowFollowerProfitEntity.getTotalPrincipal();

            myFollowTraderInfoVo.setTotalPrincipal(totalPrincipal);

            myFollowTraderInfoVo.setTotalPrincipal(totalPrincipal.setScale(2, BigDecimal.ROUND_DOWN));

            BigDecimal totalProfit = FollowFollowerProfitEntity.getTotalProfit();

              myFollowTraderInfoVo.setTotalProfit(totalProfit.setScale(2, BigDecimal.ROUND_DOWN));



@@ -1032,7 +1036,11 @@
           tradeProfitInfoVo.setTotalFollowerCnt(totalFollowerCnt);

           BigDecimal totalOrderCnt = followTraderProfitInfoVo.getTotalOrderCnt();

           tradeProfitInfoVo.setTotalOrderCnt(totalOrderCnt);

        }

         BigDecimal thirtyProfitRatio = followTraderProfitInfoVo.getThirtyProfitRatio();

         tradeProfitInfoVo.setThirtyProfitRatio(thirtyProfitRatio);

         BigDecimal thirtyRatio = followTraderProfitInfoVo.getThirtyRatio();

         tradeProfitInfoVo.setThirtyRatio(thirtyRatio);

      }

      return Result.ok(tradeProfitInfoVo);

   }



@@ -1148,6 +1156,7 @@
                          BigDecimal rewardAmount = orderEntity.getRewardAmount();

                          allRewardAmount = allRewardAmount.add(rewardAmount);

                          BigDecimal rewardRatio = orderEntity.getRewardRatio();

                        rewardRatio = rewardRatio == null ? BigDecimal.ZERO : rewardRatio;

                          allRewardRatio = allRewardRatio.add(rewardRatio);

                       }

                    }

@@ -1170,7 +1179,7 @@
                 myFollowOrderVo.setLeverRatio(leverRatio);

                 BigDecimal rewardAmount = contractOrderEntity.getRewardAmount().setScale(2, BigDecimal.ROUND_DOWN);

                 myFollowOrderVo.setRewardAmount(rewardAmount);

                 BigDecimal rewardRatio = contractOrderEntity.getRewardRatio().setScale(4, BigDecimal.ROUND_DOWN);

                 BigDecimal rewardRatio = contractOrderEntity.getRewardRatio() == null ? BigDecimal.ZERO : contractOrderEntity.getRewardRatio().setScale(4, BigDecimal.ROUND_DOWN);

                 myFollowOrderVo.setRewardRatio(rewardRatio);

                 int symbolCnt = contractOrderEntity.getSymbolCnt();

                 myFollowOrderVo.setSymbolCnt(symbolCnt);