Commit 4878137c authored by “dujiuxin”'s avatar “dujiuxin”

Merge remote-tracking branch 'origin/dev-test' into dev-test

parents f662933e 7296678a
...@@ -154,9 +154,7 @@ public class AssetStockPriceTask implements ApplicationRunner { ...@@ -154,9 +154,7 @@ public class AssetStockPriceTask implements ApplicationRunner {
//获取所有买入过的股票 //获取所有买入过的股票
List<AssetStockPosition> stockPositions = stockPositionService.queryStockPositions(marketId); List<AssetStockPosition> stockPositions = stockPositionService.queryStockPositions(marketId);
if(ObjectUtils.isEmpty(stockPositions)){
return null;
}
//汇总数据 //汇总数据
AssetMarketDetailsVO marketDetailsVO = stockPositionService.createMarketDetailsVOTask(stockPositions, funding, accountProductRelation); AssetMarketDetailsVO marketDetailsVO = stockPositionService.createMarketDetailsVOTask(stockPositions, funding, accountProductRelation);
......
...@@ -175,9 +175,7 @@ public class HighStockPriceTask implements ApplicationRunner { ...@@ -175,9 +175,7 @@ public class HighStockPriceTask implements ApplicationRunner {
} }
//获取所有买入过的股票 //获取所有买入过的股票
List<HighStockPosition> stockPositions = stockPositionService.queryStockPositions(marketId); List<HighStockPosition> stockPositions = stockPositionService.queryStockPositions(marketId);
if(ObjectUtils.isEmpty(stockPositions)){
return null;
}
//汇总数据 //汇总数据
HighMarketDetailsVO marketDetailsVO = stockPositionService.createMarketDetailsVOTask(stockPositions, funding, accountProductRelation); HighMarketDetailsVO marketDetailsVO = stockPositionService.createMarketDetailsVOTask(stockPositions, funding, accountProductRelation);
......
...@@ -170,9 +170,7 @@ public class SmartStockPriceTask implements ApplicationRunner { ...@@ -170,9 +170,7 @@ public class SmartStockPriceTask implements ApplicationRunner {
} }
//获取所有买入过的股票 //获取所有买入过的股票
List<SmartStockPosition> stockPositions = stockPositionService.queryStockPositions(marketId); List<SmartStockPosition> stockPositions = stockPositionService.queryStockPositions(marketId);
if(ObjectUtils.isEmpty(stockPositions)){
return null;
}
//汇总数据 //汇总数据
SmartMarketDetailsVO marketDetailsVO = stockPositionService.createMarketDetailsVOTask(stockPositions, funding, accountProductRelation); SmartMarketDetailsVO marketDetailsVO = stockPositionService.createMarketDetailsVOTask(stockPositions, funding, accountProductRelation);
......
...@@ -170,9 +170,7 @@ public class StockPriceTask implements ApplicationRunner { ...@@ -170,9 +170,7 @@ public class StockPriceTask implements ApplicationRunner {
} }
//获取所有买入过的股票 //获取所有买入过的股票
List<StockPosition> stockPositions = stockPositionService.queryStockPositions(marketId); List<StockPosition> stockPositions = stockPositionService.queryStockPositions(marketId);
if(ObjectUtils.isEmpty(stockPositions)){
return null;
}
//汇总数据 //汇总数据
MarketDetailsVO marketDetailsVO = stockPositionService.createMarketDetailsVOTask(stockPositions, funding, accountProductRelation); MarketDetailsVO marketDetailsVO = stockPositionService.createMarketDetailsVOTask(stockPositions, funding, accountProductRelation);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment