From b569d62a259c71857257294cf6d892f1c8138719 Mon Sep 17 00:00:00 2001 From: lanyuanxiaoyao Date: Mon, 15 Sep 2025 15:20:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A4=A7=E6=95=B0?= =?UTF-8?q?=E5=AD=97=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/controller/StockController.java | 2 ++ .../leopard/server/helper/NumberHelper.java | 21 ++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/StockController.java b/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/StockController.java index c056774..c871c44 100644 --- a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/StockController.java +++ b/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/StockController.java @@ -9,6 +9,7 @@ import com.lanyuanxiaoyao.service.template.controller.SimpleControllerSupport; import java.time.LocalDate; import java.util.Map; import java.util.function.Function; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RestController; * @author lanyuanxiaoyao * @version 20250829 */ +@Slf4j @RestController @RequestMapping("stock") public class StockController extends SimpleControllerSupport { diff --git a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/helper/NumberHelper.java b/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/helper/NumberHelper.java index 0f8bae9..75a3d37 100644 --- a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/helper/NumberHelper.java +++ b/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/helper/NumberHelper.java @@ -16,19 +16,16 @@ public class NumberHelper { if (ObjectUtil.isNull(value)) { return FINANCE_NULL_DOUBLE; } - var builder = new StringBuilder(); - if (value > 100000000) { - builder.append(value.longValue() / 100000000).append("亿"); - value = value % 100000000; + var result = FINANCE_NULL_DOUBLE; + var absValue = Double.valueOf(Math.abs(value)); + if (absValue > 100000000) { + result = NumberUtil.decimalFormat("#.##亿", absValue / 100000000); + } else if (value > 10000) { + result = NumberUtil.decimalFormat("#.##万", absValue / 10000); + } else { + result = NumberUtil.decimalFormat("#.##", absValue); } - if (value > 10000) { - builder.append(value.longValue() / 10000).append("万"); - value = value % 10000; - } - if (value > 0) { - builder.append(NumberUtil.decimalFormat("#.##", value)); - } - return builder.toString(); + return value < 0 ? "-" + result : result; } public static String formatPercentageDouble(Double value) {