fix(purchase): 重建 Agent 重试任务 (#217)

android/app/build.gradle.kts

@@ -11,8 +11,8 @@ android {
         applicationId = "cn.ilapage.goauto.agent"
         minSdk = 23
         targetSdk = 34
-        versionCode = 52
-        versionName = "0.9.39"
+        versionCode = 53
+        versionName = "0.9.40"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

android/app/src/main/java/cn/ilapage/goauto/agent/ui/TaskHistoryFragment.kt

@@ -36,8 +36,6 @@ import cn.ilapage.goauto.agent.network.HistoryPage
 import cn.ilapage.goauto.agent.network.HistoryColorImage
 import cn.ilapage.goauto.agent.network.PurchaseHistoryDetail
 import cn.ilapage.goauto.agent.network.PurchaseHistoryItem
-import cn.ilapage.goauto.agent.network.PurchaseResetResult
-import cn.ilapage.goauto.agent.network.PurchaseRetryResult
 import cn.ilapage.goauto.agent.persistence.TaskHistoryCache
 import cn.ilapage.goauto.agent.service.AgentForegroundService
 import cn.ilapage.goauto.agent.service.AgentSettingsStore
@@ -88,7 +86,7 @@ internal object PurchaseRetryPolicy {
     fun confirmationMessage(continuing: Boolean = false): String = if (continuing) {
         "替代商品已完成匹配。系统会保留原任务并创建一笔新采购任务；可能创建拼多多待付款订单，但不会支付。"
     } else {
-        "将使用服务端最新采购规则重跑当前任务，任务号和商品、规格、价格快照不变；可能创建拼多多待付款订单，但不会支付。"
+        "系统会保留原任务，并根据当前商品档案和最新采购规则创建一笔新采购任务；可能创建拼多多待付款订单，但不会支付。"
     }
 }
 
@@ -748,7 +746,7 @@ class TaskHistoryFragment : Fragment() {
                 contentDescription = "重试采购任务 CG-${task.taskId}"
                 setOnClickListener { confirmPurchaseRetry(task) }
             }, collectionCardParams())
-            resultColumn.addView(context.centeredMessage("重试边界", "复用当前任务并刷新采购规则；不会执行支付。"))
+            resultColumn.addView(context.centeredMessage("重试边界", "保留当前失败任务并创建新任务；新任务读取当前商品档案和采购规则，不会执行支付。"))
         } else if (!replacementInProgress && task.status == "failed") {
             val reason = task.retryDisabledReason?.takeIf(String::isNotBlank) ?: "请在管理端核对任务状态。"
             resultColumn.addView(context.centeredMessage("不可重试", reason))
@@ -869,17 +867,13 @@ class TaskHistoryFragment : Fragment() {
             runCatching {
                 val client = AgentApiClient(serverUrl)
                 val requestId = UUID.randomUUID().toString()
-                if (continuing) client.retryPurchaseTask(taskId, requestId, credentials.token)
-                else client.resetPurchaseTask(taskId, requestId, credentials.token)
+                client.retryPurchaseTask(taskId, requestId, credentials.token)
             }
                 .onSuccess { result ->
                     resultColumn.post {
                         if (!isAdded || generation != requestGeneration) return@post
                         AgentForegroundService.start(requireContext())
-                        when (result) {
-                            is PurchaseRetryResult -> showPurchaseRetrySuccess(result.sourceTaskNo, result.taskNo, result.taskId)
-                            is PurchaseResetResult -> showPurchaseResetSuccess(result.taskNo, result.taskId, result.attemptNumber)
-                        }
+                        showPurchaseRetrySuccess(result.sourceTaskNo, result.taskNo, result.taskId)
                     }
                 }
                 .onFailure { error ->
@@ -910,24 +904,6 @@ class TaskHistoryFragment : Fragment() {
         }, collectionCardParams())
     }
 
-    private fun showPurchaseResetSuccess(taskNo: String, taskId: Long, attemptNumber: Int) {
-        resultColumn.removeAllViews()
-        resultColumn.addView(requireContext().centeredMessage(
-            "已加入重试队列 $taskNo",
-            "任务号保持不变，将使用最新采购规则进行第 $attemptNumber 次尝试；系统不会支付。",
-        ))
-        resultColumn.addView(MaterialButton(requireContext()).apply {
-            text = "查看当前任务"
-            minimumHeight = requireContext().dp(48)
-            setOnClickListener { loadPurchaseDetail(taskId) }
-        }, collectionCardParams())
-        resultColumn.addView(MaterialButton(requireContext(), null, com.google.android.material.R.attr.materialButtonOutlinedStyle).apply {
-            text = "返回采购记录"
-            minimumHeight = requireContext().dp(48)
-            setOnClickListener { page = 1; load() }
-        }, collectionCardParams())
-    }
-
     private fun addPagination(currentPage: Int, pageSize: Int) {
         if (total <= pageSize && currentPage == 1) return
         val context = requireContext()

android/app/src/test/java/cn/ilapage/goauto/agent/PurchaseRetryPolicyTest.kt

@@ -16,11 +16,12 @@ class PurchaseRetryPolicyTest {
     }
 
     @Test
-    fun `retry confirmation explains same task latest rule and no payment`() {
+    fun `retry confirmation explains new task current archive and no payment`() {
         val message = PurchaseRetryPolicy.confirmationMessage()
-        assertTrue(message.contains("当前任务"))
+        assertTrue(message.contains("保留原任务"))
+        assertTrue(message.contains("当前商品档案"))
         assertTrue(message.contains("最新采购规则"))
-        assertFalse(message.contains("新采购任务"))
+        assertTrue(message.contains("新采购任务"))
         assertTrue(message.contains("待付款订单"))
         assertTrue(message.contains("不会支付"))
     }