Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole...

xiaoyong931011

2021-03-04 745689516004069d6bac6a5d13f3119f58459e46

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

@@ -317,7 +317,7 @@
            }



            profitOrLess = profitOrLess.add(rewardRatio).setScale(2, BigDecimal.ROUND_DOWN);

            totalBondAmount = totalBondAmount.add(contractHoldOrderEntity.getBondAmount());

            totalBondAmount = totalBondAmount.add(contractHoldOrderEntity.getBondAmount()).setScale(2, BigDecimal.ROUND_DOWN);

         }

      }



@@ -820,6 +820,7 @@
           followTraderInfoEntity.setDeclaration(declaration);

        }

        followTraderInfoEntity.setLabels(labels);

        followTraderInfoEntity.setFollowNum(FollowTraderInfoEntity.FOLLOWNUM_DEFAULT);

        followTraderInfoEntity.setIsAll(FollowTraderInfoEntity.IS_ALL_N);

        followTraderInfoEntity.setProfitRatio(BigDecimal.ZERO);

        followTraderInfoEntity.setVerifyStatus(FollowTraderInfoEntity.VERIFYSTATUS_ING);