update:watchlist展示优化v1

src/main/java/top/lvzhiqiang/service/impl/CoinServiceImpl.java

@@ -1053,8 +1053,15 @@ public class CoinServiceImpl implements CoinService {
     }
 
     private void renderMainSearch4Watchlist(List<CoinWatchlist> watchlistList) {
+        BigDecimal bigDecimal10000 = new BigDecimal("10000");
         for (CoinWatchlist coinWatchlist : watchlistList) {
-            coinWatchlist.setTotalMarketValueStr(df2.format(coinWatchlist.getTotalMarketValue()));
+            BigDecimal divide = coinWatchlist.getTotalMarketValue().divide(bigDecimal10000, 8, RoundingMode.HALF_UP);
+            if (divide.compareTo(bigDecimal10000) <= 0) {
+                coinWatchlist.setTotalMarketValueStr(divide.setScale(4, RoundingMode.HALF_UP) + "万");
+            } else {
+                divide = divide.divide(bigDecimal10000, 4, RoundingMode.HALF_UP);
+                coinWatchlist.setTotalMarketValueStr(divide + "亿");
+            }
         }
     }
 
@@ -1105,11 +1112,12 @@ public class CoinServiceImpl implements CoinService {
                 String markPrice = JSONObject.parseObject(response.body()).getJSONObject("data").getString("markPrice");
 
                 BigDecimal chaRate = BigDecimal.ZERO;
-                if ("open_long".equals(side)) {
-                    chaRate = new BigDecimal(markPrice).divide(new BigDecimal(jsonObject.getString("triggerPrice")), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP);
-                } else if ("open_short".equals(side)) {
-                    //chaRate = new BigDecimal(jsonObject.getString("triggerPrice")).divide(new BigDecimal(markPrice), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP);
-                    chaRate = new BigDecimal(markPrice).divide(new BigDecimal(jsonObject.getString("triggerPrice")), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP);
+                BigDecimal triggerPriceDecimal = new BigDecimal(jsonObject.getString("triggerPrice"));
+                BigDecimal markPriceDecimal = new BigDecimal(markPrice);
+                if (markPriceDecimal.compareTo(triggerPriceDecimal) < 0) {
+                    chaRate = markPriceDecimal.divide(triggerPriceDecimal, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP);
+                } else if (markPriceDecimal.compareTo(triggerPriceDecimal) > 0) {
+                    chaRate = triggerPriceDecimal.divide(markPriceDecimal, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP);
                 }
 
                 jsonObject.put("markPrice", markPrice);

src/main/resources/static/js/my-coin.js

@@ -44,14 +44,14 @@ function initOther() {
                     var nameEn2 = $(obj).attr("nameEn");
                     var slideDiv = $(this_).attr("slideDiv") + '-' + $(obj).attr("id");
 
-                    apisMoveDivButton2Timer4Custorm[index] = setInterval(mainSearch, 2000, url, nameEn2, slideDiv, "1");
+                    apisMoveDivButton2Timer4Custorm[index] = setInterval(mainSearch, 3000, url, nameEn2, slideDiv, "1");
                 });
                 actualFlag = true;
             } else {
                 var url = selectedOption.attr("url");
                 var slideDiv = $(this).attr("slideDiv");
 
-                apisMoveDivButton2Timer = setInterval(mainSearch, 2000, url, nameEn, slideDiv, "2");
+                apisMoveDivButton2Timer = setInterval(mainSearch, 3000, url, nameEn, slideDiv, "2");
                 actualFlag = true;
             }
         }
@@ -355,7 +355,7 @@ function mainSearch(url, nameEn, slideDiv, needCustomFlag) {
 
                 $('#' + slideDiv).find(".contentTD").html(str);
 
-                initContentEvent();
+                initContentEvent(nameEn);
             } else {
                 //alert(data.message);
             }
@@ -374,51 +374,53 @@ function mainSearch(url, nameEn, slideDiv, needCustomFlag) {
 /**
  * 初始化主内容事件
  */
-function initContentEvent() {
+function initContentEvent(nameEn) {
     if ($(".apis-move-div-input1").val().length === 0) {
         $("title").html('Coin主页');
     }
 
-    $(".apis-quiet-div-watchlist-detail").click(function () {
-        if ($("#watchlistpreview").css("display") === 'none') {
-            $("#watchlistpreview").css("display", "block");
-        } else if ($("#watchlistpreview").css("display") === 'block') {
-            $("#watchlistpreview").css("display", "none");
-        }
-
-        $(".watchlistpreview-top-close").click(function () {
+    if (nameEn === 'watchlist') {
+        $(".apis-quiet-div-watchlist-detail").click(function () {
             if ($("#watchlistpreview").css("display") === 'none') {
                 $("#watchlistpreview").css("display", "block");
             } else if ($("#watchlistpreview").css("display") === 'block') {
                 $("#watchlistpreview").css("display", "none");
             }
-            $(this).unbind("click");
-        });
 
-        $.ajax({
-            url: "coin/watchlistDetail/" + $(this).attr("symbolName"), //请求的url地址
-            type: "get", //请求方式
-            async: true, //请求是否异步，默认为异步，这也是ajax重要特性
-            success: function (data) {
-                //请求成功时处理
-                if (data != null && $.trim(data) != "" && data.success) {
-                    data = data.data;
-                    $(".watchlistpreview-content").html(data);
-                } else {
-                    //alert(data.message);
+            $(".watchlistpreview-top-close").click(function () {
+                if ($("#watchlistpreview").css("display") === 'none') {
+                    $("#watchlistpreview").css("display", "block");
+                } else if ($("#watchlistpreview").css("display") === 'block') {
+                    $("#watchlistpreview").css("display", "none");
                 }
-            },
-            beforeSend: function () {
-                $(".watchlistpreview-content").html("");
-                $(".watchlistpreview-loading").css("display", "block");
-            },
-            complete: function () {
-                $(".watchlistpreview-loading").css("display", "none");
-            },
-            error: function (data) {
-                //请求出错处理
-                alert('error：' + data);
-            }
+                $(this).unbind("click");
+            });
+
+            $.ajax({
+                url: "coin/watchlistDetail/" + $(this).attr("symbolName"), //请求的url地址
+                type: "get", //请求方式
+                async: true, //请求是否异步，默认为异步，这也是ajax重要特性
+                success: function (data) {
+                    //请求成功时处理
+                    if (data != null && $.trim(data) != "" && data.success) {
+                        data = data.data;
+                        $(".watchlistpreview-content").html(data);
+                    } else {
+                        //alert(data.message);
+                    }
+                },
+                beforeSend: function () {
+                    $(".watchlistpreview-content").html("");
+                    $(".watchlistpreview-loading").css("display", "block");
+                },
+                complete: function () {
+                    $(".watchlistpreview-loading").css("display", "none");
+                },
+                error: function (data) {
+                    //请求出错处理
+                    alert('error：' + data);
+                }
+            });
         });
-    });
+    }
 }