tujidelv il y a 2 ans
Parent
commit
2989fcbea3

+ 2 - 8
src/main/java/top/lvzhiqiang/service/impl/CoinServiceImpl.java

@@ -798,6 +798,7 @@ public class CoinServiceImpl implements CoinService {
                     throw new RuntimeException(e);
                 }
 
+                watchlistMap4CmC.put(coinWatchlist.getCmcId(), coinWatchlist);
                 try {
                     Connection.Response response = JsoupUtil.requestBody(coinWatchlist.getCollectUrl(), JsoupUtil.HTTP_GET, InitRunner.proxy, new HashMap<>(), new HashMap<>());
                     JSONObject jsonObject = JSONObject.parseObject(response.body());
@@ -807,19 +808,12 @@ public class CoinServiceImpl implements CoinService {
                     if (marketData.containsKey("market_cap_rank") && null != marketData.get("market_cap_rank")) {
                         Integer totalMarketRanking = marketData.getInteger("market_cap_rank");
                         coinWatchlist.setTotalMarketRanking(totalMarketRanking);
-                    } else {
-                        watchlistMap4CmC.put(coinWatchlist.getCmcId(), coinWatchlist);
                     }
 
                     // 总市值
                     if (marketData.containsKey("market_cap") && null != marketData.get("market_cap")) {
                         BigDecimal totalMarketValue = marketData.getJSONObject("market_cap").getBigDecimal("usd");
                         coinWatchlist.setTotalMarketValue(totalMarketValue);
-                        if (totalMarketValue.compareTo(BigDecimal.ZERO) == 0) {
-                            watchlistMap4CmC.put(coinWatchlist.getCmcId(), coinWatchlist);
-                        }
-                    } else {
-                        watchlistMap4CmC.put(coinWatchlist.getCmcId(), coinWatchlist);
                     }
 
                     // 市场价格
@@ -944,7 +938,7 @@ public class CoinServiceImpl implements CoinService {
                 if (dataJO.containsKey(key)) {
                     JSONObject jsonObject = dataJO.getJSONObject(String.valueOf(key));
                     value.setTotalMarketRanking(jsonObject.getInteger("cmc_rank"));
-                    value.setTotalMarketValue(jsonObject.getBigDecimal("self_reported_market_cap").setScale(2, RoundingMode.HALF_UP));
+                    value.setTotalMarketValue(jsonObject.getJSONObject("quote").getJSONObject("USD").getBigDecimal("market_cap").setScale(2, RoundingMode.HALF_UP));
 
                     coinMapper.updateCoinWatchlist(value);
                 }

+ 2 - 2
src/main/resources/static/coin.html

@@ -198,8 +198,8 @@
                 <option value="">--</option>
             </select>
             <select id="apis-quiet-div-watchlist-sortField" style="height: 24px;">
-                <option value="total_market_value">市值</option>
-                <option value="total_market_ranking">市值排名</option>
+                <option value="total_market_value">流通市值</option>
+                <option value="total_market_ranking">市值排名</option>
                 <option value="increase_multiple">涨幅倍数</option>
                 <option value="issuing_days">发行天数</option>
             </select>