Update app.py
Browse files
app.py
CHANGED
@@ -81,23 +81,19 @@ def api():
|
|
81 |
else:
|
82 |
message_list[payload.get("msg_id")] = {"user_id": payload.get("user_id"),
|
83 |
"amount": get_amount(payload.get("msg_text"))}
|
84 |
-
print(payload.get("token"), "回覆測試", payload.get("quote_token"))
|
85 |
-
send_text(payload.get("token"), "回覆測試", payload.get("quote_token"))
|
86 |
|
87 |
for msg_id, data in message_list.items():
|
88 |
quoted_msg_id = data.get("quoted_msg_id")
|
89 |
quoted_msg_list = {key: value for key, value in message_list.items() if value.get("quoted_msg_id") == msg_id}
|
90 |
-
quoted_number = len(quoted_msg_list)
|
91 |
|
92 |
-
if not quoted_msg_id and
|
93 |
amount: float = data.get("amount")
|
94 |
paid: float = 0.0
|
95 |
for _, value in quoted_msg_list.items():
|
96 |
paid += value.get("amount")
|
97 |
print(amount, paid)
|
98 |
if (amount-paid > 1):
|
99 |
-
data.get("quote_token")
|
100 |
-
print("未付清")
|
101 |
break
|
102 |
|
103 |
# if quoted_msg_id:
|
@@ -166,7 +162,14 @@ def get_users_number() -> int:
|
|
166 |
|
167 |
def get_amount(text: str) -> float | None:
|
168 |
try:
|
169 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
170 |
except:
|
171 |
return None
|
172 |
|
|
|
81 |
else:
|
82 |
message_list[payload.get("msg_id")] = {"user_id": payload.get("user_id"),
|
83 |
"amount": get_amount(payload.get("msg_text"))}
|
|
|
|
|
84 |
|
85 |
for msg_id, data in message_list.items():
|
86 |
quoted_msg_id = data.get("quoted_msg_id")
|
87 |
quoted_msg_list = {key: value for key, value in message_list.items() if value.get("quoted_msg_id") == msg_id}
|
|
|
88 |
|
89 |
+
if not quoted_msg_id and len(quoted_msg_list) != 0:
|
90 |
amount: float = data.get("amount")
|
91 |
paid: float = 0.0
|
92 |
for _, value in quoted_msg_list.items():
|
93 |
paid += value.get("amount")
|
94 |
print(amount, paid)
|
95 |
if (amount-paid > 1):
|
96 |
+
send_text(payload.get("token"), "未付清", data.get("quote_token"))
|
|
|
97 |
break
|
98 |
|
99 |
# if quoted_msg_id:
|
|
|
162 |
|
163 |
def get_amount(text: str) -> float | None:
|
164 |
try:
|
165 |
+
after_dollar = text.split("$")[1]
|
166 |
+
number = after_dollar.split("\n")[0]
|
167 |
+
second_row = after_dollar.split("\n")[1]
|
168 |
+
divisor = 1
|
169 |
+
if "/" in second_row:
|
170 |
+
divisor = int(second_row.replace("/", ""))
|
171 |
+
print(round(float(simple_eval(number/divisor)), 2))
|
172 |
+
return round(float(simple_eval(number/divisor)), 2)
|
173 |
except:
|
174 |
return None
|
175 |
|