From 2c0177d2bfc2ed89b2fdffc7ccb84dc685cdf524 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 18 三月 2025 10:09:04 +0800
Subject: [PATCH] fix： 财务统计逻辑
---
app/src/main/java/com/example/firstapp/receiver/SmsReceiver.kt | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/app/src/main/java/com/example/firstapp/receiver/SmsReceiver.kt b/app/src/main/java/com/example/firstapp/receiver/SmsReceiver.kt
index 711ad6b..685b248 100644
--- a/app/src/main/java/com/example/firstapp/receiver/SmsReceiver.kt
+++ b/app/src/main/java/com/example/firstapp/receiver/SmsReceiver.kt
@@ -44,17 +44,19 @@
messages[i] = SmsMessage.createFromPdu(pdus[i] as ByteArray)
messageBody.append(messages[i]?.messageBody)
}
-
// 输出短信内容到控制台
- Log.d("SmsReceiver", "Received SMS: ${messageBody.toString()}")
val msg = Msg(0, "1111", "111111", messageBody.toString(),1, "111", 1, 1)
val msgId = Core.msg.insert(msg)
- Log.d("SmsReceiver", "Received SMS msgId: ${msgId}")
-
// 这里我要写个数组，并创建个对象存放一些内容，如这个对象的属性有匹配内容，正则表达式，并循环遍历
val ruleList = mutableListOf(
Rule("快递","京东","\\d{6}"),
- Rule("快递","菜鸟驿站","\\d{1,2}-\\d{1,2}-\\d{4}")
+ Rule("快递","菜鸟驿站","\\d{1,2}-\\d{1,2}-\\d{4}"),
+ // 银行规则使用默认正则，实际匹配时会使用 BANK_PATTERNS 中的模式
+ Rule("财务", "中国银行", "账单金额[：:](\\d+\\.?\\d*).*还款日[：:](\\d{1,2})日"),
+ Rule("财务", "工商银行", "账单金额[：:](\\d+\\.?\\d*).*还款日[：:](\\d{1,2})日"),
+ Rule("财务", "建设银行", "账单金额[：:](\\d+\\.?\\d*).*还款日[：:](\\d{1,2})日"),
+ Rule("财务", "信用卡", "账单[￥¥](\\d+\\.?\\d*).*还款日(\\d{2})月(\\d{2})日"),
+ Rule("财务", "花呗", "本月花呗账单(\\d+\\.?\\d*)元.*还款日[期是：:](\\d{1,2})[日号]")
)
CoroutineScope(Dispatchers.IO).launch {
@@ -74,19 +76,49 @@
Log.d("RuleList", ruleList.toString())
for (rule in ruleList) {
- val code = rule.extractCodeFromMessage(messageBody.toString())
- if (code!==null) {
- // 转换为 Date 对象
+ val code = if (rule.type == "财务") {
+ // 对信用卡账单使用特殊的提取逻辑
+ val regex = rule.pattern.toRegex()
+ val matchResult = regex.find(messageBody.toString())
+ matchResult?.let {
+ val amount = it.groupValues[1] // 账单金额
+ amount
+ }
+ } else {
+ rule.extractCodeFromMessage(messageBody.toString())
+ }
+
+ if (code !== null) {
val currentTime = LocalDateTime.now()
- // 将 LocalDateTime 转换为 Date
val date = Date.from(currentTime.atZone(ZoneId.systemDefault()).toInstant())
- // 如果需要格式化显示
val sdf = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
val createtime = sdf.format(date)
+
+ // 对于信用卡账单，使用还款日作为time字段
+ val time = if (rule.type == "财务") {
+ rule.extractDueDate(messageBody.toString()) ?: createtime
+ } else {
+ createtime
+ }
+
val existingCode = Core.code.queryByTypeAndCodeAndDate(rule.content, code, createtime)
if (existingCode == null) {
- val code = Code(0, rule.type, 1, rule.content, 1, 1, msgId, code, createtime, "中通",0,"","")
- Core.code.insert(code)
+ val codeEntity = Code(
+ 0,
+ rule.type,
+ 1,
+ rule.content,
+ 1,
+ 1,
+ msgId,
+ code,
+ createtime,
+ rule.content, // 银行名称作为name
+ 0,
+ time, // 还款日期
+ ""
+ )
+ Core.code.insert(codeEntity)
Log.d("SMS_DEBUG", "新短信已保存到数据库")
// 发送广播通知数据已更新
--
Gitblit v1.9.3