diff --git a/util/util.py b/util/util.py index 6921a94..4c3d645 100644 --- a/util/util.py +++ b/util/util.py @@ -135,12 +135,12 @@ def chinese_to_number(chinese): section += number * (unit[0] / 10) unit = [None, False] elif number > 0: - raise ValueError(f"Bad number '{chinese[i - 1]}{c}' at: {i}") + raise ValueError(f"{chinese} has bad number '{chinese[i - 1]}{c}' at: {i}") number = num else: unit = chinese_to_money_unit(c) if unit[0] == None: - raise ValueError(f"Unknown unit '{c}' at: {i}") + raise ValueError(f"{chinese} has unknown unit '{c}' at: {i}") if unit[1]: section = (section + number) * unit[0] result += section @@ -166,6 +166,10 @@ def chinese_money_to_number(chinese_money_amount): yi = chinese_money_amount.find("圆") ji = chinese_money_amount.find("角") fi = chinese_money_amount.find("分") + + if yi == -1 and ji == -1 and fi == -1: + raise ValueError(f"无法解析: {chinese_money_amount}") + y_str = None if yi > 0: y_str = chinese_money_amount[0:yi]