Merge branch 'master' into dev-test

src/main/java/com/zfxftech/telmarket/task/followAccount/AssetStockPriceTask.java

@@ -172,7 +172,7 @@ public class AssetStockPriceTask implements ApplicationRunner {
             if (!ObjectUtils.isEmpty(marketDetailsVO.getPosition())) {
                 //TODO 优化
                 //示范持仓比
-                productRelation.setSimulatedProportion(new BigDecimal(marketDetailsVO.getPosition()));
+                productRelation.setSimulatedProportion(new BigDecimal(marketDetailsVO.getTotalProfitRate()));
             }
             //示范盘持仓数量
             productRelation.setPositionCount(ObjectUtils.isEmpty(stockPositions.size()) ? 0 : stockPositions.size());

src/main/java/com/zfxftech/telmarket/task/followAccount/HighStockPriceTask.java

@@ -192,7 +192,7 @@ public class HighStockPriceTask implements ApplicationRunner {
             }
             if (!ObjectUtils.isEmpty(marketDetailsVO.getPosition())) {
                 //示范持仓比
-                productRelation.setSimulatedProportion(new BigDecimal(marketDetailsVO.getPosition()));
+                productRelation.setSimulatedProportion(new BigDecimal(marketDetailsVO.getTotalProfitRate()));
             }
             //示范盘持仓数量
             productRelation.setPositionCount(ObjectUtils.isEmpty(stockPositions.size()) ? 0 : stockPositions.size());

src/main/java/com/zfxftech/telmarket/task/followAccount/SmartStockPriceTask.java

@@ -189,7 +189,7 @@ public class SmartStockPriceTask implements ApplicationRunner {
             }
             if (!ObjectUtils.isEmpty(marketDetailsVO.getPosition())) {
                 //示范持仓比
-                smartAccountProductRelation.setSimulatedProportion(new BigDecimal(marketDetailsVO.getPosition()));
+                smartAccountProductRelation.setSimulatedProportion(new BigDecimal(marketDetailsVO.getTotalProfitRate()));
             }
             //示范盘持仓数量
             smartAccountProductRelation.setPositionCount(ObjectUtils.isEmpty(stockPositions.size()) ? 0 : stockPositions.size());

src/main/java/com/zfxftech/telmarket/task/followAccount/StockPriceTask.java

@@ -187,7 +187,7 @@ public class StockPriceTask implements ApplicationRunner {
             }
             if (!ObjectUtils.isEmpty(marketDetailsVO.getPosition())) {
                 //示范持仓比
-                productRelation.setSimulatedProportion(new BigDecimal(marketDetailsVO.getPosition()));
+                productRelation.setSimulatedProportion(new BigDecimal(marketDetailsVO.getTotalProfitRate()));
             }
             //示范盘持仓数量
             productRelation.setPositionCount(ObjectUtils.isEmpty(stockPositions.size()) ? 0 : stockPositions.size());

src/main/java/com/zfxftech/telmarket/task/followAccount/SurveyStockPriceTask.java

@@ -189,7 +189,7 @@ public class SurveyStockPriceTask implements ApplicationRunner {
             }
             if (!ObjectUtils.isEmpty(marketDetailsVO.getPosition())) {
                 //示范持仓比
-                surveyAccountProductRelation.setSimulatedProportion(new BigDecimal(marketDetailsVO.getPosition()));
+                surveyAccountProductRelation.setSimulatedProportion(new BigDecimal(marketDetailsVO.getTotalProfitRate()));
             }
             //示范盘持仓数量
             surveyAccountProductRelation.setPositionCount(ObjectUtils.isEmpty(stockPositions.size()) ? 0 : stockPositions.size());