From 198008366eb8637fe341b4a4dab25ff164fccf27 Mon Sep 17 00:00:00 2001 From: ryoeiken <754264374@qq.com> Date: Mon, 1 Feb 2021 17:41:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=86=99=E8=BD=AC=E5=A4=A7=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/fantang/common/NumberToList.java | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/common/NumberToList.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/common/NumberToList.java index 72215a18a..1042fcdea 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/common/NumberToList.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/common/NumberToList.java @@ -165,16 +165,25 @@ public class NumberToList { Map map = convertTo(number, level); String han[] = { "零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖" }; String[] str = {"fen","jiao","yuan", "shi", "bai", "qian", "wan", "shiwan", "baiwan", "qianwan"}; - return String.format("%s仟%s佰%s拾%s万%s仟%s佰%s拾%s元%s角%s分", - han[Integer.parseInt(map.get("qianwan"))], - han[Integer.parseInt(map.get("baiwan"))], - han[Integer.parseInt(map.get("shiwan"))], - han[Integer.parseInt(map.get("wan"))], - han[Integer.parseInt(map.get("qian"))], - han[Integer.parseInt(map.get("bai"))], - han[Integer.parseInt(map.get("shi"))], - han[Integer.parseInt(map.get("yuan"))], - han[Integer.parseInt(map.get("jiao"))], - han[Integer.parseInt(map.get("fen"))]); + + + for (String key : map.keySet()) { + if (Objects.equals(map.get(key), " ")) { + map.put(key, "0"); + } else if (Objects.equals(map.get(key), "¥")) { + map.put(key, "0"); + } + } + + return String.format("%s佰%s拾%s万%s仟%s佰%s拾%s元%s角%s分", + han[Integer.parseInt(map.get("baiwan"+level))], + han[Integer.parseInt(map.get("shiwan"+level))], + han[Integer.parseInt(map.get("wan"+level))], + han[Integer.parseInt(map.get("qian"+level))], + han[Integer.parseInt(map.get("bai"+level))], + han[Integer.parseInt(map.get("shi"+level))], + han[Integer.parseInt(map.get("yuan"+level))], + han[Integer.parseInt(map.get("jiao"+level))], + han[Integer.parseInt(map.get("fen"+level))]); } }