优化总资产

src/main/java/com/zfxftech/telmarket/service/impl/business/StockPositionServiceImpl.java

@@ -1523,12 +1523,17 @@ public class StockPositionServiceImpl extends ServiceImpl<StockPositionMapper, S
     public MarketDetailsVO createMarketDetailsVOTask( List<StockPosition> stockPositions, BigDecimal funding, AccountProductRelation accountProductRelation) {
 
         MarketDetailsVO marketDetailsVO = new MarketDetailsVO();
+        BigDecimal stocksTotalPrice = new BigDecimal("0");
+        if(!ObjectUtils.isEmpty(stockPositions)){
+            List<String> codes = stockPositions.stream().map(StockPosition::getCode).collect(Collectors.toList());
+            //批量获取股票当前价格
+            Map<String, Quote> codeAndPriceMapping = stockCodeService.batchQueryStockPrice(codes);
+            //计算股票总市值（当前）
+             stocksTotalPrice = financeCalculateService.calculateTotalAssets(stockPositions, codeAndPriceMapping);
+        }
+
+
 
-        List<String> codes = stockPositions.stream().map(StockPosition::getCode).collect(Collectors.toList());
-        //批量获取股票当前价格
-        Map<String, Quote> codeAndPriceMapping = stockCodeService.batchQueryStockPrice(codes);
-        //计算股票总市值（当前）
-        BigDecimal stocksTotalPrice = financeCalculateService.calculateTotalAssets(stockPositions, codeAndPriceMapping);
         //计算总资产 剩余的钱+总市值
         BigDecimal totalPrice = BigDecimalUtil.add(funding, stocksTotalPrice);
         //计算仓位 总市值/总资产

src/main/java/com/zfxftech/telmarket/service/impl/business/high/HighStockPositionServiceImpl.java

@@ -1530,11 +1530,14 @@ public class HighStockPositionServiceImpl extends ServiceImpl<HighStockPositionM
 
      HighMarketDetailsVO marketDetailsVO = new HighMarketDetailsVO();
 
-        List<String> codes = stockPositions.stream().map(HighStockPosition::getCode).collect(Collectors.toList());
-        //批量获取股票当前价格
-        Map<String, Quote> codeAndPriceMapping = stockCodeService.batchQueryStockPrice(codes);
-        //计算股票总市值（当前）
-        BigDecimal stocksTotalPrice = financeCalculateService.calculateTotalAssets(stockPositions, codeAndPriceMapping);
+     BigDecimal stocksTotalPrice = new BigDecimal("0");
+     if(!ObjectUtils.isEmpty(stockPositions)){
+         List<String> codes = stockPositions.stream().map(HighStockPosition::getCode).collect(Collectors.toList());
+         //批量获取股票当前价格
+         Map<String, Quote> codeAndPriceMapping = stockCodeService.batchQueryStockPrice(codes);
+         //计算股票总市值（当前）
+         stocksTotalPrice = financeCalculateService.calculateTotalAssets(stockPositions, codeAndPriceMapping);
+     }
         //计算总资产 剩余的钱+总市值
         BigDecimal totalPrice = BigDecimalUtil.add(funding, stocksTotalPrice);
         //计算仓位 总市值/总资产

src/main/java/com/zfxftech/telmarket/service/impl/business/smart/SmartStockPositionServiceImpl.java

@@ -21,6 +21,7 @@ import com.zfxftech.telmarket.common.pojo.dao.InvestmentStyle;
 import com.zfxftech.telmarket.common.pojo.dao.MemberBase;
 import com.zfxftech.telmarket.common.pojo.dao.Quote;
 import com.zfxftech.telmarket.common.pojo.dao.StocksCode;
+import com.zfxftech.telmarket.common.pojo.dao.high.HighStockPosition;
 import com.zfxftech.telmarket.common.pojo.dao.permission.UsAdmin;
 import com.zfxftech.telmarket.common.pojo.dao.permission.UsTeamUser;
 import com.zfxftech.telmarket.common.pojo.dao.smart.*;
@@ -1360,11 +1361,14 @@ public class SmartStockPositionServiceImpl extends ServiceImpl<SmartStockPositio
     public SmartMarketDetailsVO createMarketDetailsVOTask( List<SmartStockPosition> stockPositions, BigDecimal funding, SmartAccountProductRelation accountProductRelation) {
 
         SmartMarketDetailsVO marketDetailsVO = new SmartMarketDetailsVO();
-        List<String> codes = stockPositions.stream().map(SmartStockPosition::getCode).collect(Collectors.toList());
-        //批量获取股票当前价格
-        Map<String, Quote> codeAndPriceMapping = stockCodeService.batchQueryStockPrice(codes);
-        //计算股票总市值（当前）
-        BigDecimal stocksTotalPrice = smartFinanceCalculateService.calculateTotalAssets(stockPositions, codeAndPriceMapping);
+        BigDecimal stocksTotalPrice = new BigDecimal("0");
+        if(!ObjectUtils.isEmpty(stockPositions)){
+            List<String> codes = stockPositions.stream().map(SmartStockPosition::getCode).collect(Collectors.toList());
+            //批量获取股票当前价格
+            Map<String, Quote> codeAndPriceMapping = stockCodeService.batchQueryStockPrice(codes);
+            //计算股票总市值（当前）
+            stocksTotalPrice = smartFinanceCalculateService.calculateTotalAssets(stockPositions, codeAndPriceMapping);
+        }
         //计算总值
         BigDecimal totalPrice = BigDecimalUtil.add(funding, stocksTotalPrice);
         //计算仓位

src/main/java/com/zfxftech/telmarket/service/impl/business/survey/SurveyStockPositionServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -51,11 +52,15 @@ public class SurveyStockPositionServiceImpl extends ServiceImpl<SurveyStockPosit
     @Override
     public SurveyMarketDetailsVO createMarketDetailsVOTask(List<SurveyStockPosition> stockPositions, BigDecimal funding, SurveyAccountProductRelation accountProductRelation) {
         SurveyMarketDetailsVO marketDetailsVO = new SurveyMarketDetailsVO();
-        List<String> codes = stockPositions.stream().map(SurveyStockPosition::getCode).collect(Collectors.toList());
-        //批量获取股票当前价格
-        Map<String, Quote> codeAndPriceMapping = stockCodeService.batchQueryStockPrice(codes);
-        //计算股票总市值（当前）
-        BigDecimal stocksTotalPrice = surveyFinanceCalculateService.calculateTotalAssets(stockPositions, codeAndPriceMapping);
+
+        BigDecimal stocksTotalPrice = new BigDecimal("0");
+        if(!ObjectUtils.isEmpty(stockPositions)){
+            List<String> codes = stockPositions.stream().map(SurveyStockPosition::getCode).collect(Collectors.toList());
+            //批量获取股票当前价格
+            Map<String, Quote> codeAndPriceMapping = stockCodeService.batchQueryStockPrice(codes);
+            //计算股票总市值（当前）
+            stocksTotalPrice = surveyFinanceCalculateService.calculateTotalAssets(stockPositions, codeAndPriceMapping);
+        }
         //计算总值
         BigDecimal totalPrice = BigDecimalUtil.add(funding, stocksTotalPrice);
         //计算仓位

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

@@ -142,7 +142,6 @@ public class AssetStockPriceTask implements ApplicationRunner {
 
     //资管
     public AssetAccountProductRelation AccountProductRelationTask(AssetAccountProductRelation accountProductRelation) {
-        Date startTime = new Date();
         AssetAccountProductRelation productRelation = new AssetAccountProductRelation();
 
         try {