From 4cb9946eff3626389ae93feef4250dd3d45fb694 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 03 三月 2025 16:00:50 +0800
Subject: [PATCH] fix: 取件相关逻辑

---
 app/src/main/java/com/example/firstapp/activity/PickupActivity.kt |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/example/firstapp/activity/PickupActivity.kt b/app/src/main/java/com/example/firstapp/activity/PickupActivity.kt
index 9713e2c..2ba9cd2 100644
--- a/app/src/main/java/com/example/firstapp/activity/PickupActivity.kt
+++ b/app/src/main/java/com/example/firstapp/activity/PickupActivity.kt
@@ -61,7 +61,7 @@
         lifecycleScope.launch {
             try {
                 // 处理单个包裹取件
-//                Core.code.pickup(pack.trackingNumber)
+                Core.code.pickup(pack.id)
                 // 重新加载数据
                 loadData()
                 // 通知MainActivity刷新
@@ -79,7 +79,7 @@
                 val packages = expressAdapter.currentList
                 // 批量处理取件
                 packages.forEach { pack ->
-//                    Core.code.pickup(pack.trackingNumber)
+                    Core.code.pickup(pack.id)
                 }
                 // 清空列表
                 expressAdapter.submitList(emptyList())
@@ -103,9 +103,10 @@
             val codes = Core.code.getByKeyword(stationName)
             val packages = codes.map { code ->
                 ExpressPackage(
+                    id = code.id,
                     company = code.name ?: company,
                     trackingNumber = code.code,
-                    date = code.overtime
+                    createTime = code.createtime
                 )
             }
             

--
Gitblit v1.9.3