Compare commits

..
29 changed files with 779 additions and 615 deletions
@@ -1,15 +1,30 @@
package cn.ilapage.goauto.agent.persistence
import cn.ilapage.goauto.agent.network.AgentApiException
object PurchaseRejectionPolicy {
val codes = setOf("PURCHASE_STATE_CONFLICT", "PURCHASE_LEASE_EXPIRED", "PURCHASE_RESULT_CONFLICT")
fun terminalCode(error: Exception): String? = (error as? AgentApiException)
?.takeIf { it.status == 409 && it.code in codes }?.code
}
/** Uploads already-persisted results only; it never invokes device automation. */
class PurchaseOutboxUploader(
private val pending: () -> List<PendingPurchaseOutbox>,
private val submit: (PendingPurchaseOutbox) -> Unit,
private val markUploaded: (PendingPurchaseOutbox) -> Unit,
private val afterUploaded: (PendingPurchaseOutbox) -> Unit = {},
private val markRejected: (PendingPurchaseOutbox, String) -> Unit = { _, _ -> error("Rejection persistence not configured") },
) {
fun flush() {
pending().forEach { item ->
submit(item)
try {
submit(item)
} catch (error: Exception) {
val code = PurchaseRejectionPolicy.terminalCode(error) ?: throw error
markRejected(item, code)
return@forEach
}
markUploaded(item)
afterUploaded(item)
}
@@ -0,0 +1,27 @@
package cn.ilapage.goauto.agent.persistence
data class RejectedPurchaseResult(
val id: Long, val taskId: Long, val attemptId: String, val payloadJson: String,
val rejectedAt: Long, val errorCode: String, val acknowledgedAt: Long?,
)
internal object PurchaseRejectionSql {
val migration = listOf(
"ALTER TABLE purchase_outbox ADD COLUMN rejected_at INTEGER",
"ALTER TABLE purchase_outbox ADD COLUMN rejection_error_code TEXT",
"ALTER TABLE purchase_outbox ADD COLUMN acknowledged_at INTEGER",
)
const val activeTask = "SELECT task_id FROM purchase_task WHERE upload_status != 'rejected' AND (status IN ('running','order_submit_started') OR upload_status='pending') ORDER BY updated_at ASC LIMIT 1"
const val acknowledge = "UPDATE purchase_outbox SET acknowledged_at=? WHERE id=? AND upload_status='rejected' AND acknowledged_at IS NULL"
/** The caller must wrap both writes in one transaction. Zero task rows means a newer attempt replaced it. */
fun reject(item: PendingPurchaseOutbox, code: String, now: Long, update: (String, List<Any>) -> Int) {
require(code in PurchaseRejectionPolicy.codes)
check(update(
"UPDATE purchase_outbox SET upload_status='rejected',rejected_at=?,rejection_error_code=?,updated_at=? WHERE id=? AND task_id=? AND attempt_id=? AND upload_status='pending'",
listOf(now, code, now, item.id, item.taskId, item.attemptId),
) == 1)
update("UPDATE purchase_task SET upload_status='rejected',updated_at=? WHERE task_id=? AND attempt_id=?",
listOf(now, item.taskId, item.attemptId))
}
}
@@ -66,6 +66,7 @@ class PurchaseTaskStore(context: Context) : SQLiteOpenHelper(context, DATABASE_N
)
db.execSQL("CREATE INDEX idx_purchase_outbox_pending ON purchase_outbox(upload_status, id)")
db.execSQL("CREATE INDEX idx_purchase_attempt_task ON purchase_attempt(task_id, created_at)")
PurchaseRejectionSql.migration.forEach(db::execSQL)
}
override fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
@@ -74,6 +75,7 @@ class PurchaseTaskStore(context: Context) : SQLiteOpenHelper(context, DATABASE_N
db.execSQL("ALTER TABLE purchase_task ADD COLUMN final_confirmation_json TEXT")
db.execSQL("ALTER TABLE purchase_task ADD COLUMN irreversible_at INTEGER")
}
if (oldVersion < 3 && newVersion >= 3) PurchaseRejectionSql.migration.forEach(db::execSQL)
}
@Synchronized
@@ -225,8 +227,8 @@ class PurchaseTaskStore(context: Context) : SQLiteOpenHelper(context, DATABASE_N
@Synchronized
fun activeTaskId(): Long? = readableDatabase.rawQuery(
"SELECT task_id FROM purchase_task WHERE status IN (?,?) OR upload_status=? ORDER BY updated_at ASC LIMIT 1",
arrayOf(STATUS_RUNNING, STATUS_ORDER_SUBMIT_STARTED, UPLOAD_PENDING),
PurchaseRejectionSql.activeTask,
null,
).use { cursor -> if (cursor.moveToFirst()) cursor.getLong(0) else null }
@Synchronized
@@ -243,9 +245,53 @@ class PurchaseTaskStore(context: Context) : SQLiteOpenHelper(context, DATABASE_N
}
}
@Synchronized
fun markRejected(item: PendingPurchaseOutbox, code: String) {
val db = writableDatabase
db.beginTransaction()
try {
PurchaseRejectionSql.reject(item, code, System.currentTimeMillis()) { sql, args ->
db.compileStatement(sql).use { statement ->
args.forEachIndexed { index, value ->
if (value is Long) statement.bindLong(index + 1, value)
else statement.bindString(index + 1, value.toString())
}
statement.executeUpdateDelete()
}
}
db.setTransactionSuccessful()
} finally { db.endTransaction() }
}
@Synchronized
fun rejectedResults(): List<RejectedPurchaseResult> = readableDatabase.rawQuery(
"SELECT id,task_id,attempt_id,payload_json,rejected_at,rejection_error_code,acknowledged_at FROM purchase_outbox WHERE upload_status='rejected' ORDER BY id DESC", null,
).use { cursor -> buildList {
while (cursor.moveToNext()) add(RejectedPurchaseResult(
cursor.getLong(0), cursor.getLong(1), cursor.getString(2), cursor.getString(3),
cursor.getLong(4), cursor.getString(5), if (cursor.isNull(6)) null else cursor.getLong(6),
))
} }
@Synchronized
fun rejectedCount(): Int = readableDatabase.rawQuery(
"SELECT COUNT(*) FROM purchase_outbox WHERE upload_status='rejected'", null,
).use { it.moveToFirst(); it.getInt(0) }
@Synchronized
fun isCurrentAttemptRejected(taskId: Long, attemptId: String): Boolean = readableDatabase.rawQuery(
"SELECT 1 FROM purchase_task WHERE task_id=? AND attempt_id=? AND upload_status='rejected'",
arrayOf(taskId.toString(), attemptId),
).use { it.moveToFirst() }
@Synchronized
fun acknowledgeRejection(outboxId: Long) {
writableDatabase.execSQL(PurchaseRejectionSql.acknowledge, arrayOf(System.currentTimeMillis(), outboxId))
}
companion object {
private const val DATABASE_NAME = "goauto_purchase.db"
private const val DATABASE_VERSION = 2
private const val DATABASE_VERSION = 3
private const val STATUS_RUNNING = "running"
const val STATUS_ORDER_SUBMIT_STARTED = "order_submit_started"
private const val STATUS_COMPLETED = "completed"
@@ -204,6 +204,7 @@ class AgentForegroundService : Service() {
}
override fun onDestroy() {
stateStore.stop()
probeHandoff.invalidate()
if (diagnosticInstance === this) diagnosticInstance = null
repurchaseClosed.set(true)
@@ -268,12 +269,13 @@ class AgentForegroundService : Service() {
}
private fun synchronizeAgent(): String {
var heartbeatSucceeded = false
return try {
val serverUrl = ServerUrlPolicy.normalize(settingsStore.serverUrl())
val api = AgentApiClient(serverUrl)
var credentials = identityStore.credentials()
stateStore.update("CONNECTING", "正在连接并校验设备身份", credentials?.deviceId ?: 0L, credentials != null)
updateNotification("正在连接")
stateStore.update("CONNECTING", "正在同步", credentials?.deviceId ?: 0L, credentials != null, connection = true)
updateNotification("正在同步")
if (!registeredThisProcess.get()) {
val registration = api.register(deviceInfo(), credentials?.token)
@@ -290,17 +292,30 @@ class AgentForegroundService : Service() {
}
val activeCredentials = credentials ?: error("设备尚未取得认证凭据")
if (taskMutex.currentTaskId() == null) {
recoverInterruptedPurchases(api, activeCredentials.token)
flushPurchaseOutbox(api, activeCredentials.token)
runningTaskId.set(purchaseStore.activeTaskId())
val sync = AgentSyncCycle(
heartbeat = { currentTaskId ->
api.heartbeat(activeCredentials.token, currentTaskId, AgentCapabilities.supported).also {
check(it.deviceId == activeCredentials.deviceId) { "心跳设备身份不一致" }
}
},
activeTaskId = {
if (taskMutex.currentTaskId() != null) runningTaskId.get()
else purchaseStore.activeTaskId().also(runningTaskId::set)
},
executionActive = { taskMutex.currentTaskId() != null },
recover = { recoverInterruptedPurchases(api, activeCredentials.token) },
flush = { flushPurchaseOutbox(api, activeCredentials.token) },
hasPending = { purchaseStore.pendingOutbox().isNotEmpty() },
).run()
if (sync.failureCode != null) {
cancelIdleReturn("同步未完成")
val message = cn.ilapage.goauto.agent.ui.PurchaseRejectionPresentation.connection(sync.failureCode, 0)
stateStore.update(sync.failureCode, message, activeCredentials.deviceId, true, connection = true)
updateNotification(message)
return if (sync.failureCode == "AUTH_ERROR") MANUAL_AUTH_ERROR else MANUAL_NETWORK_ERROR
}
val heartbeat = api.heartbeat(
activeCredentials.token,
currentTaskId = runningTaskId.get(),
capabilities = AgentCapabilities.supported,
)
check(heartbeat.deviceId == activeCredentials.deviceId) { "心跳返回了不同的设备身份" }
val heartbeat = requireNotNull(sync.heartbeat)
heartbeatSucceeded = true
stateStore.update(
code = if (heartbeat.busy) "BUSY" else "ONLINE",
message = if (heartbeat.busy) "设备在线,正在执行任务" else "设备在线空闲",
@@ -309,30 +324,32 @@ class AgentForegroundService : Service() {
heartbeat = true,
)
updateNotification(if (heartbeat.busy) "在线 · 执行中" else "在线 · 空闲")
scheduleTask(api, activeCredentials.token)
if (sync.canClaim) scheduleTask(api, activeCredentials.token) else MANUAL_BUSY
} catch (error: AgentApiException) {
cancelIdleReturn("网络或服务端请求失败")
val authenticationError = error.code in setOf(
"DEVICE_TOKEN_INVALID", "DEVICE_INSTALL_ID_CONFLICT", "DEVICE_DISABLED",
)
val authenticationError = isAgentAuthenticationError(error)
val connectionFailure = syncConnectionFailureCode(error, heartbeatSucceeded)
val code = connectionFailure ?: "TASK_ERROR"
val storedCredentials = runCatching { identityStore.credentials() }.getOrNull()
stateStore.update(
code = if (authenticationError) "AUTH_ERROR" else "NETWORK_ERROR",
message = "${error.code}:${error.message}",
code = code,
message = if (connectionFailure == null) "任务同步暂未完成,请稍后重试" else cn.ilapage.goauto.agent.ui.PurchaseRejectionPresentation.connection(code, 0),
deviceId = storedCredentials?.deviceId ?: 0L,
tokenStored = storedCredentials != null,
connection = connectionFailure != null,
)
updateNotification(if (authenticationError) "设备认证失败" else "连接失败,等待网络恢复")
updateNotification(if (authenticationError) "设备认证失败" else if (heartbeatSucceeded) "任务同步暂未完成" else "连接失败,等待恢复")
if (authenticationError) MANUAL_AUTH_ERROR else MANUAL_NETWORK_ERROR
} catch (error: Exception) {
cancelIdleReturn("Agent 运行异常")
val configured = settingsStore.serverUrl().isNotBlank()
val storedCredentials = runCatching { identityStore.credentials() }.getOrNull()
stateStore.update(
code = if (configured) "ERROR" else "CONFIG_REQUIRED",
message = error.message ?: "Agent 运行失败",
code = if (heartbeatSucceeded) "TASK_ERROR" else if (configured) "ERROR" else "CONFIG_REQUIRED",
message = if (configured) "同步暂未完成,请稍后重试" else "请配置服务端",
deviceId = storedCredentials?.deviceId ?: 0L,
tokenStored = storedCredentials != null,
connection = !heartbeatSucceeded,
)
updateNotification(if (configured) "运行异常" else "等待配置服务端")
if (configured) MANUAL_ERROR else MANUAL_CONFIG_REQUIRED
@@ -341,8 +358,6 @@ class AgentForegroundService : Service() {
private fun scheduleTask(api: AgentApiClient, token: String): String {
if (taskMutex.currentTaskId() != null) return MANUAL_BUSY
recoverInterruptedPurchases(api, token)
flushPurchaseOutbox(api, token)
val collectionCooldown = activeCollectionCooldown()
val purchaseTask = api.nextPurchaseTask(token)
when (TaskDispatchPolicy.decide(purchaseTask?.status, collectionCooldown != null)) {
@@ -607,7 +622,7 @@ class AgentForegroundService : Service() {
publishCurrentPageResult(0L, "采集间隔中,还需 $remaining 秒。", replacementOriginType, replacementOriginTaskId)
return
}
if (!taskMutex.tryAcquire(CURRENT_PAGE_RESERVATION_ID)) {
if (!tryAcquireCurrentPage(taskMutex, working, CURRENT_PAGE_RESERVATION_ID)) {
publishCurrentPageResult(0L, "设备正在执行任务,请稍后再试。", replacementOriginType, replacementOriginTaskId)
return
}
@@ -937,9 +952,10 @@ class AgentForegroundService : Service() {
)
}
}
val message = if (outcome.resultType == "failed") "${outcome.errorCode}:${outcome.message}" else outcome.message
val rejected = purchaseStore.rejectedResults().any { it.taskId == task.taskId && it.attemptId == task.taskAttemptId }
val message = if (rejected) "采购结果被服务端拒收,请在采购页或设置中查看" else if (outcome.resultType == "failed") "${outcome.errorCode}:${outcome.message}" else outcome.message
stateStore.update(if (outcome.resultType == "failed") "TASK_ERROR" else "ONLINE", message, tokenStored = true)
updateNotification(if (outcome.resultType == "failed") "$taskLabel #${task.taskId} 失败" else "$taskLabel #${task.taskId} 已提交")
updateNotification(if (rejected) "$taskLabel #${task.taskId} 结果被拒收" else if (outcome.resultType == "failed") "$taskLabel #${task.taskId} 失败" else "$taskLabel #${task.taskId} 已提交")
} catch (error: AgentApiException) {
failureSnapshot("failed", error.code.takeIf { it.matches(Regex("[A-Z][A-Z0-9_]{0,63}")) } ?: "PURCHASE_API_FAILED")
stateStore.update("TASK_ERROR", "${error.code}:${error.message}", tokenStored = true)
@@ -1029,9 +1045,10 @@ class AgentForegroundService : Service() {
}
val requestId = UUID.randomUUID().toString()
purchaseStore.completeAndEnqueue(interrupted.taskId, interrupted.attemptId, requestId, purchaseResultPayload(requestId, interrupted.attemptId, outcome))
} catch (_: AgentApiException) {
} catch (error: AgentApiException) {
// Keep the local irreversible marker. The same server request ID
// is replayed after connectivity returns; the order click is never repeated.
if (isAgentAuthenticationError(error)) throw error
}
return@forEach
}
@@ -1066,6 +1083,18 @@ class AgentForegroundService : Service() {
runCatching { onFirstSubmitted(item, requireNotNull(acknowledgement)) }
.onFailure { probeHandoff.invalidate(); logDiagnosticPersistenceFailure(it) }
},
markRejected = { item, code ->
probeHandoff.invalidate()
purchaseStore.markRejected(item, code)
synchronized(taskMutex) {
val runtime = stateStore.read()
if (shouldClearRejectedPurchase(item.taskId, runtime.currentTaskId, runtime.currentTaskType,
taskMutex.currentTaskId(), purchaseStore.isCurrentAttemptRejected(item.taskId, item.attemptId))) {
stateStore.clearActiveTask(item.taskId)
}
}
sendBroadcast(Intent(ACTION_PURCHASE_REJECTIONS_CHANGED).setPackage(packageName))
},
).flush()
runningTaskId.set(purchaseStore.activeTaskId())
}
@@ -1693,6 +1722,7 @@ class AgentForegroundService : Service() {
const val ACTION_REPURCHASE_CONFIRM = "cn.ilapage.goauto.agent.REPURCHASE_CONFIRM"
const val ACTION_REPURCHASE_STOP = "cn.ilapage.goauto.agent.REPURCHASE_STOP"
const val ACTION_REPURCHASE_STATE = "cn.ilapage.goauto.agent.REPURCHASE_STATE"
const val ACTION_PURCHASE_REJECTIONS_CHANGED = "cn.ilapage.goauto.agent.PURCHASE_REJECTIONS_CHANGED"
@Volatile var repurchaseState = RepurchaseState()
private set
const val ACTION_BACKFILL_START = "cn.ilapage.goauto.agent.BACKFILL_START"
@@ -191,17 +191,27 @@ class AgentSettingsStore(context: Context) {
class AgentStateStore(context: Context) {
private val preferences = context.getSharedPreferences(PREFERENCES, Context.MODE_PRIVATE)
private val publicationGate = AgentStatePublicationGate()
fun update(code: String, message: String, deviceId: Long? = null, tokenStored: Boolean? = null, heartbeat: Boolean = false) {
fun update(code: String, message: String, deviceId: Long? = null, tokenStored: Boolean? = null, heartbeat: Boolean = false, connection: Boolean = false) = publicationGate.publish {
val editor = preferences.edit()
.putString(STATE_CODE, code)
.putString(STATE_MESSAGE, message)
deviceId?.let { editor.putLong(DEVICE_ID, it) }
tokenStored?.let { editor.putBoolean(TOKEN_STORED, it) }
if (heartbeat) editor.putLong(LAST_HEARTBEAT, System.currentTimeMillis())
if (heartbeat || connection) editor.putString(CONNECTION_CODE, code)
editor.apply()
}
/** This service instance cannot publish a late heartbeat over STOPPED or a restarted service. */
fun stop() = publicationGate.stop {
preferences.edit().putString(STATE_CODE, "STOPPED").putString(CONNECTION_CODE, "STOPPED")
.putString(STATE_MESSAGE, "前台服务已停止").apply()
}
fun connectionCode(): String = preferences.getString(CONNECTION_CODE, "STOPPED") ?: "STOPPED"
fun read(): AgentState = AgentState(
code = preferences.getString(STATE_CODE, "STOPPED") ?: "STOPPED",
message = preferences.getString(STATE_MESSAGE, "前台服务尚未启动") ?: "前台服务尚未启动",
@@ -279,6 +289,7 @@ class AgentStateStore(context: Context) {
private companion object {
const val PREFERENCES = "goauto_agent_runtime"
const val STATE_CODE = "state_code"
const val CONNECTION_CODE = "connection_code"
const val STATE_MESSAGE = "state_message"
const val DEVICE_ID = "device_id"
const val LAST_HEARTBEAT = "last_heartbeat"
@@ -0,0 +1,64 @@
package cn.ilapage.goauto.agent.service
import cn.ilapage.goauto.agent.network.AgentApiException
import cn.ilapage.goauto.agent.network.HeartbeatResult
internal fun isAgentAuthenticationError(error: Throwable?): Boolean = error is AgentApiException &&
(error.status in setOf(401, 403) || error.code in setOf("DEVICE_TOKEN_INVALID", "DEVICE_INSTALL_ID_CONFLICT", "DEVICE_DISABLED"))
internal fun syncConnectionFailureCode(error: Throwable, heartbeatSucceeded: Boolean): String? = when {
isAgentAuthenticationError(error) -> "AUTH_ERROR"
heartbeatSucceeded -> null
error is AgentApiException && error.code == "DEVICE_TASK_MISMATCH" -> "TASK_MISMATCH"
error is AgentApiException && error.status >= 500 -> "SERVER_ERROR"
else -> "NETWORK_ERROR"
}
internal data class AgentSyncResult(
val heartbeat: HeartbeatResult?,
val failureCode: String?,
val canClaim: Boolean,
)
/** Run under the service's existing sync exclusion; device execution keeps its task mutex. */
internal class AgentSyncCycle(
private val heartbeat: (Long?) -> HeartbeatResult,
private val activeTaskId: () -> Long?,
private val executionActive: () -> Boolean,
private val recover: () -> Unit,
private val flush: () -> Unit,
private val hasPending: () -> Boolean,
) {
fun run(): AgentSyncResult {
var pulse = runCatching { heartbeat(activeTaskId()) }
var authFailure = isAgentAuthenticationError(pulse.exceptionOrNull())
var recovered = false
var flushed = false
if (!authFailure && !executionActive()) {
val recovery = runCatching(recover)
recovered = recovery.isSuccess
authFailure = isAgentAuthenticationError(recovery.exceptionOrNull())
if (!authFailure) {
val upload = runCatching(flush)
flushed = upload.isSuccess
authFailure = isAgentAuthenticationError(upload.exceptionOrNull())
}
if (!authFailure && (pulse.exceptionOrNull() as? AgentApiException)?.code == "DEVICE_TASK_MISMATCH") {
pulse = runCatching { heartbeat(activeTaskId()) }
}
}
val failure = pulse.exceptionOrNull()
return AgentSyncResult(
pulse.getOrNull(),
when {
authFailure -> "AUTH_ERROR"
failure == null -> null
isAgentAuthenticationError(failure) -> "AUTH_ERROR"
(failure as? AgentApiException)?.code == "DEVICE_TASK_MISMATCH" -> "TASK_MISMATCH"
failure is AgentApiException && failure.status >= 500 -> "SERVER_ERROR"
else -> "NETWORK_ERROR"
},
pulse.isSuccess && !authFailure && recovered && flushed && !executionActive() && !hasPending() && activeTaskId() == null,
)
}
}
@@ -0,0 +1,16 @@
package cn.ilapage.goauto.agent.service
internal fun shouldClearRejectedPurchase(
rejectedTaskId: Long, runtimeTaskId: Long?, runtimeTaskType: String?,
executingTaskId: Long?, currentAttemptRejected: Boolean,
): Boolean = executingTaskId == null && runtimeTaskId == rejectedTaskId &&
runtimeTaskType == "purchase" && currentAttemptRejected
internal class AgentStatePublicationGate {
private var stopped = false
@Synchronized fun publish(write: () -> Unit) { if (!stopped) write() }
@Synchronized fun stop(write: () -> Unit) { stopped = true; write() }
}
internal fun tryAcquireCurrentPage(mutex: TaskExecutionMutex, syncing: java.util.concurrent.atomic.AtomicBoolean, reservation: Long): Boolean =
synchronized(mutex) { !syncing.get() && mutex.tryAcquire(reservation) }
@@ -24,6 +24,7 @@ import cn.ilapage.goauto.agent.network.CollectionHistoryItem
import cn.ilapage.goauto.agent.network.PurchaseHistoryItem
import cn.ilapage.goauto.agent.network.ServerUrlPolicy
import cn.ilapage.goauto.agent.persistence.TaskHistoryCache
import cn.ilapage.goauto.agent.persistence.PurchaseTaskStore
import cn.ilapage.goauto.agent.service.AgentForegroundService
import cn.ilapage.goauto.agent.service.AgentSettingsStore
import cn.ilapage.goauto.agent.service.AgentStateStore
@@ -58,6 +59,7 @@ class AgentSettingsFragment : Fragment() {
private lateinit var connectionFeedback: TextView
private lateinit var disabledReason: TextView
private lateinit var diagnostics: TextView
private lateinit var rejectedResultsButton: MaterialButton
private lateinit var accessibilityText: TextView
private lateinit var collectionIntervalStartLayout: TextInputLayout
private lateinit var collectionIntervalStartInput: TextInputEditText
@@ -326,6 +328,20 @@ class AgentSettingsFragment : Fragment() {
diagnostics = context.label("—", 14f, context.getColor(R.color.agent_text))
diagnostics.setPadding(0, context.dp(10), 0, 0)
addView(diagnostics)
rejectedResultsButton = MaterialButton(context).apply {
text = "查看拒收结果"
minHeight = context.dp(48)
setOnClickListener {
val records = PurchaseTaskStore(context).use { it.rejectedResults() }
MaterialAlertDialogBuilder(context).setTitle("采购结果被服务端拒收")
.setMessage(records.joinToString("\n\n") {
PurchaseRejectionPresentation.notice(it) + "\n${it.errorCode}" +
if (it.acknowledgedAt != null) "\n已核对(仅本机记录)" else ""
}.ifBlank { "暂无拒收结果" })
.setPositiveButton("知道了", null).show()
}
}
addView(rejectedResultsButton, fullWidth(8))
}))
}
return context.page(content)
@@ -669,12 +685,14 @@ class AgentSettingsFragment : Fragment() {
disabledReason.text = if (busy) "任务执行中,暂时不能修改服务器或设备名称。" else ""
val installId = runCatching { identityStore.installId() }.getOrElse { "读取失败" }
val rejectedCount = PurchaseTaskStore(context).use { it.rejectedCount() }
rejectedResultsButton.visibility = if (rejectedCount > 0) View.VISIBLE else View.GONE
diagnostics.text = buildString {
append("installId:$installId\n")
append("Device Token:${if (state.tokenStored) "已配置" else "未配置"}\n")
append("注册状态:${if (state.deviceId > 0) "已注册(设备 ${state.deviceId})" else "未注册"}\n")
append("Agent 版本:${BuildConfig.VERSION_NAME}\n")
append("服务端连接:${if (state.code in setOf("ONLINE", "BUSY", "COLLECTION_COOLDOWN")) "已连接" else "未连接"}\n")
append("服务端连接:${PurchaseRejectionPresentation.connection(stateStore.connectionCode(), rejectedCount)}\n")
append("保持屏幕常亮:${if (state.keepScreenOn) "已开启" else "仅在任务执行或采集间隔时开启"}")
}
accessibilityText.text = when (AccessibilityReadinessDetector.current(context)) {
@@ -0,0 +1,28 @@
package cn.ilapage.goauto.agent.ui
import cn.ilapage.goauto.agent.persistence.RejectedPurchaseResult
import org.json.JSONObject
internal object PurchaseRejectionPresentation {
private fun payload(item: RejectedPurchaseResult) = runCatching { JSONObject(item.payloadJson) }.getOrNull()
private fun orderNo(item: RejectedPurchaseResult): String? = payload(item)?.optString("pddOrderNo")
?.takeIf { it.matches(Regex("[0-9A-Za-z-]{1,80}")) }
fun showBanner(item: RejectedPurchaseResult): Boolean = item.acknowledgedAt == null &&
(payload(item)?.optString("resultType") in setOf("order_created", "order_result_unknown") ||
!payload(item)?.optString("pddOrderNo").isNullOrBlank())
fun notice(item: RejectedPurchaseResult): String = buildString {
append("采购任务 #${item.taskId} 的结果被服务端拒收")
orderNo(item)?.let { append("\n拼多多订单号:$it") }
append("\n请人工核对拼多多订单及后台任务,避免重复采购")
}
fun connection(code: String, rejected: Int): String = when (code) {
"CONNECTING" -> "正在同步"
"ONLINE", "BUSY", "COLLECTION_COOLDOWN", "TASK_ERROR" -> if (rejected > 0) "已连接 · 有 $rejected 条采购结果被服务端拒收" else "已连接"
"AUTH_ERROR" -> "未连接 · 设备认证失败"
"TASK_MISMATCH" -> "未连接 · 设备任务状态不一致"
"NETWORK_ERROR" -> "未连接 · 网络暂不可用"
"SERVER_ERROR" -> "未连接 · 服务端暂不可用"
"CONFIG_REQUIRED" -> "未连接 · 请配置服务端"
else -> "未连接 · 同步暂未完成"
}
}
@@ -37,6 +37,8 @@ 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.persistence.TaskHistoryCache
import cn.ilapage.goauto.agent.persistence.PurchaseTaskStore
import cn.ilapage.goauto.agent.persistence.RejectedPurchaseResult
import cn.ilapage.goauto.agent.service.AgentForegroundService
import cn.ilapage.goauto.agent.service.AgentSettingsStore
import cn.ilapage.goauto.agent.service.AgentStateStore
@@ -146,8 +148,14 @@ class TaskHistoryFragment : Fragment() {
private var repurchaseButton: MaterialButton? = null
private var repurchaseDialog: androidx.appcompat.app.AlertDialog? = null
private var repurchaseDialogRound: String? = null
private var rejectionPanel: LinearLayout? = null
private var displayedRejections: List<RejectedPurchaseResult>? = null
private val currentPageReceiver = object : BroadcastReceiver() {
override fun onReceive(context: Context?, intent: Intent?) {
if (intent?.action == AgentForegroundService.ACTION_PURCHASE_REJECTIONS_CHANGED) {
renderRejections()
return
}
if (intent?.action == AgentForegroundService.ACTION_REPURCHASE_STATE) {
renderRepurchase()
if (!collection && isResumed && AgentForegroundService.repurchaseState.phase == cn.ilapage.goauto.agent.service.RepurchasePhase.FINISHED) {
@@ -200,6 +208,10 @@ class TaskHistoryFragment : Fragment() {
val context = requireContext()
pageColumn = context.column()
pageColumn.addView(context.screenTitle(if (collection) "采集记录" else "采购记录"))
if (!collection) {
rejectionPanel = context.column(0)
pageColumn.addView(rejectionPanel)
}
pageColumn.addView(buildSearch())
if (!collection) {
repurchasePanel = context.column(0)
@@ -228,6 +240,7 @@ class TaskHistoryFragment : Fragment() {
override fun onResume() {
super.onResume()
renderRejections()
renderRepurchase()
detailState.taskId?.let { taskId ->
if (collection) loadCollectionDetail(taskId) else loadPurchaseDetail(taskId)
@@ -235,6 +248,8 @@ class TaskHistoryFragment : Fragment() {
}
override fun onDestroyView() {
rejectionPanel = null
displayedRejections = null
repurchaseDialog?.setOnDismissListener(null)
repurchaseDialog?.dismiss()
repurchaseDialog = null
@@ -247,6 +262,29 @@ class TaskHistoryFragment : Fragment() {
super.onDestroyView()
}
private fun renderRejections() {
val panel = rejectionPanel ?: return
val context = context ?: return
val records = PurchaseTaskStore(context).use { it.rejectedResults() }.filter(PurchaseRejectionPresentation::showBanner)
if (records == displayedRejections) return
displayedRejections = records
panel.removeAllViews()
records.forEach { record ->
panel.addView(context.card(context.cardColumn().apply {
addView(context.label(PurchaseRejectionPresentation.notice(record), 14f, context.getColor(R.color.agent_warning), true))
addView(MaterialButton(context).apply {
text = "已核对"
minHeight = context.dp(48)
contentDescription = "采购任务 #${record.taskId} 已核对,仅隐藏本机提醒"
setOnClickListener {
val saved = runCatching { PurchaseTaskStore(context).use { it.acknowledgeRejection(record.id) } }.isSuccess
if (saved) renderRejections() else toast("暂时无法保存核对记录,请稍后重试")
}
}, fullWidth(8))
}))
}
}
override fun onDestroy() {
unregisterCurrentPageReceiver()
imageLoader.close()
@@ -811,6 +849,7 @@ class TaskHistoryFragment : Fragment() {
val filter = IntentFilter(AgentForegroundService.ACTION_CURRENT_PAGE_RESULT)
filter.addAction(AgentForegroundService.ACTION_BACKFILL_STATE)
filter.addAction(AgentForegroundService.ACTION_REPURCHASE_STATE)
filter.addAction(AgentForegroundService.ACTION_PURCHASE_REJECTIONS_CHANGED)
if (Build.VERSION.SDK_INT >= 33) {
requireContext().registerReceiver(currentPageReceiver, filter, Context.RECEIVER_NOT_EXPORTED)
} else {
@@ -893,6 +932,11 @@ class TaskHistoryFragment : Fragment() {
private fun renderPurchaseDetail(detail: PurchaseHistoryDetail) {
val context = requireContext()
val task = detail.task
PurchaseTaskStore(context).use { it.rejectedResults() }.filter { it.taskId == task.taskId }.forEach { record ->
resultColumn.addView(context.card(context.cardColumn().apply {
addView(context.label(PurchaseRejectionPresentation.notice(record) + "\n${record.errorCode}", 14f, context.getColor(R.color.agent_warning)))
}))
}
val info = buildString {
append("蝦皮订单号:${task.shopeeOrderNo.ifBlank { "—" }}\n")
append("PDD 商品:${task.pddGoodsId}\n")
@@ -8,6 +8,22 @@ import org.junit.Test
class PurchaseOutboxHandoffTest {
private val item = PendingPurchaseOutbox(1, 42, "probe", "request", "{}")
@Test fun `terminal conflict does not block later pending result`() {
val submitted = mutableListOf<Long>()
val uploaded = mutableListOf<Long>()
val result = runCatching {
PurchaseOutboxUploader(
{ listOf(item, item.copy(id = 2, taskId = 43)) },
{ submitted += it.id; if (it.id == 1L) throw cn.ilapage.goauto.agent.network.AgentApiException(409, "PURCHASE_STATE_CONFLICT", "untrusted", false) },
{ uploaded += it.id },
markRejected = { _, _ -> },
).flush()
}
assertTrue(result.isSuccess)
assertEquals(listOf(1L, 2L), submitted)
assertEquals(listOf(2L), uploaded)
}
@Test fun `handoff callback runs only after successful submit and local upload mark`() {
for (failure in listOf("submit", "mark", "none")) {
val events = mutableListOf<String>()
@@ -31,4 +47,37 @@ class PurchaseOutboxHandoffTest {
PurchaseOutboxUploader({ listOf(item) }, { submitted++ }, {}).flush()
assertEquals(1, submitted)
}
@Test fun `only whitelisted 409 is terminal independent of retryable`() {
for (code in listOf("PURCHASE_STATE_CONFLICT", "PURCHASE_LEASE_EXPIRED", "PURCHASE_RESULT_CONFLICT", "OTHER")) {
for (status in listOf(409, 401, 403, 500)) for (retryable in listOf(false, true)) {
val events = mutableListOf<String>()
val result = runCatching {
PurchaseOutboxUploader({ listOf(item) },
{ throw cn.ilapage.goauto.agent.network.AgentApiException(status, code, "secret URL", retryable) },
{ events += "uploaded" }, { events += "handoff" },
{ _, fixedCode -> events += fixedCode },
).flush()
}
val rejected = status == 409 && code != "OTHER"
assertEquals(rejected, result.isSuccess)
assertEquals(if (rejected) listOf(code) else emptyList<String>(), events)
}
}
}
@Test fun `network and rejected persistence failures retain pending and stop flush`() {
for (diskFailure in listOf(false, true)) {
val events = mutableListOf<String>()
val result = runCatching {
PurchaseOutboxUploader({ listOf(item, item.copy(id = 2)) },
{ events += "submit"; if (diskFailure) throw cn.ilapage.goauto.agent.network.AgentApiException(409, "PURCHASE_STATE_CONFLICT", "raw", false) else error("network") },
{ events += "uploaded" }, { events += "handoff" },
{ _, _ -> events += "reject"; error("disk") },
).flush()
}
assertTrue(result.isFailure)
assertEquals(if (diskFailure) listOf("submit", "reject") else listOf("submit"), events)
}
}
}
@@ -0,0 +1,54 @@
package cn.ilapage.goauto.agent
import cn.ilapage.goauto.agent.network.AgentApiClient
import cn.ilapage.goauto.agent.network.AgentApiException
import cn.ilapage.goauto.agent.persistence.PendingPurchaseOutbox
import cn.ilapage.goauto.agent.persistence.PurchaseOutboxUploader
import java.net.ServerSocket
import java.util.concurrent.Executors
import java.util.concurrent.TimeUnit
import org.junit.Assert.*
import org.junit.Test
class PurchaseOutboxHttpTest {
@Test fun `missing retryable is not evidence that an unknown 409 is terminal`() {
for (code in listOf("PURCHASE_STATE_CONFLICT", "PURCHASE_LEASE_EXPIRED", "PURCHASE_RESULT_CONFLICT", "UNKNOWN_CONFLICT")) {
ServerSocket(0).use { server ->
server.soTimeout = 3000
val executor = Executors.newSingleThreadExecutor()
val serving = executor.submit {
server.accept().use { socket ->
socket.soTimeout = 3000
val reader = socket.getInputStream().bufferedReader()
var contentLength = 0
while (true) {
val line = reader.readLine() ?: break
if (line.isEmpty()) break
if (line.startsWith("Content-Length:", true)) contentLength = line.substringAfter(':').trim().toInt()
}
repeat(contentLength) { check(reader.read() >= 0) }
val response = """{"code":"$code","message":"untrusted diagnostic"}"""
socket.getOutputStream().write(("HTTP/1.1 409 Conflict\r\nContent-Type: application/json\r\nContent-Length: ${response.toByteArray().size}\r\nConnection: close\r\n\r\n$response").toByteArray())
}
}
try {
val api = AgentApiClient("http://127.0.0.1:${server.localPort}")
var pending = true
val result = runCatching {
PurchaseOutboxUploader(
{ listOf(PendingPurchaseOutbox(1,42,"probe","request","{}")) },
{ api.submitPurchaseResult(it.taskId,it.payloadJson,"synthetic") },
{ fail("409 is never uploaded") },
{ fail("409 is never a handoff") },
{ _, _ -> pending = false },
).flush()
}
assertEquals(code == "UNKNOWN_CONFLICT", pending)
assertEquals(code != "UNKNOWN_CONFLICT", result.isSuccess)
if (pending) assertFalse((result.exceptionOrNull() as AgentApiException).retryable)
serving.get(5, TimeUnit.SECONDS)
} finally { executor.shutdownNow() }
}
}
}
}
@@ -0,0 +1,32 @@
package cn.ilapage.goauto.agent
import cn.ilapage.goauto.agent.persistence.RejectedPurchaseResult
import cn.ilapage.goauto.agent.ui.PurchaseRejectionPresentation
import org.junit.Assert.*
import org.junit.Test
class PurchaseRejectionPresentationTest {
private fun item(payload: String, acknowledged: Long? = null) = RejectedPurchaseResult(1,42,"attempt",payload,100,"PURCHASE_STATE_CONFLICT",acknowledged)
@Test fun `only unacknowledged order evidence appears on procurement banner`() {
for (payload in listOf("""{"resultType":"order_created"}""", """{"resultType":"order_result_unknown"}""", """{"resultType":"failed","pddOrderNo":"123-456"}""")) {
assertTrue(PurchaseRejectionPresentation.showBanner(item(payload)))
assertFalse(PurchaseRejectionPresentation.showBanner(item(payload, 200)))
}
assertFalse(PurchaseRejectionPresentation.showBanner(item("""{"resultType":"spec_probe_completed"}""")))
assertFalse(PurchaseRejectionPresentation.showBanner(item("""{"resultType":"spec_probe_completed","pddOrderNo":null}""")))
}
@Test fun `notice includes task optional order and fixed review instruction without raw errors`() {
val message = PurchaseRejectionPresentation.notice(item("""{"resultType":"order_created","pddOrderNo":"123-456","message":"https://secret"}"""))
assertTrue(message.contains("#42")); assertTrue(message.contains("123-456"))
assertTrue(message.contains("请人工核对拼多多订单及后台任务,避免重复采购"))
assertFalse(message.contains("secret"))
}
@Test fun `connection classifies sync heartbeat and rejected separately`() {
assertEquals("正在同步", PurchaseRejectionPresentation.connection("CONNECTING", 2))
assertEquals("已连接 · 有 2 条采购结果被服务端拒收", PurchaseRejectionPresentation.connection("ONLINE", 2))
assertEquals("未连接 · 设备认证失败", PurchaseRejectionPresentation.connection("AUTH_ERROR", 2))
assertEquals("未连接 · 设备任务状态不一致", PurchaseRejectionPresentation.connection("TASK_MISMATCH", 2))
assertEquals("未连接 · 网络暂不可用", PurchaseRejectionPresentation.connection("NETWORK_ERROR", 2))
assertEquals("未连接 · 服务端暂不可用", PurchaseRejectionPresentation.connection("SERVER_ERROR", 2))
}
}
@@ -0,0 +1,100 @@
package cn.ilapage.goauto.agent.persistence
import java.sql.Connection
import java.sql.DriverManager
import org.junit.Assert.*
import org.junit.Test
class PurchaseRejectionStoreTest {
@Test fun `v2 upgrade adds exactly three nullable columns and preserves all old data`() = database { db ->
val before = rows(db, "SELECT * FROM purchase_outbox")
val taskBefore = rows(db, "SELECT * FROM purchase_task")
migrate(db)
assertEquals(3, PurchaseRejectionSql.migration.size)
assertEquals(taskBefore, rows(db, "SELECT * FROM purchase_task"))
assertEquals(before, rows(db, "SELECT id, task_id, attempt_id, request_id, payload_json, upload_status, created_at, updated_at FROM purchase_outbox"))
assertEquals(listOf(listOf(null, null, null)), rows(db, "SELECT rejected_at,rejection_error_code,acknowledged_at FROM purchase_outbox"))
val columns = rows(db, "PRAGMA table_info(purchase_outbox)").takeLast(3)
assertTrue(columns.all { it[3] == "0" && it[4] == null })
}
@Test fun `reject is atomic preserves payload excludes pending and targets current attempt only`() = database { db ->
migrate(db)
reject(db)
assertEquals(listOf(listOf("rejected", "payload", "100", "PURCHASE_STATE_CONFLICT")), rows(db, "SELECT upload_status,payload_json,rejected_at,rejection_error_code FROM purchase_outbox"))
assertEquals(listOf(listOf("completed", "rejected", "payload")), rows(db, "SELECT status,upload_status,result_json FROM purchase_task"))
assertTrue(rows(db, PurchaseRejectionSql.activeTask).isEmpty())
assertTrue(rows(db, "SELECT id FROM purchase_outbox WHERE upload_status='pending'").isEmpty())
}
@Test fun `old outbox rejection cannot overwrite a newer task attempt`() = database { db ->
migrate(db)
db.createStatement().use { it.execute("UPDATE purchase_task SET attempt_id='new',status='running',upload_status='none'") }
reject(db)
assertEquals(listOf(listOf("new", "running", "none")), rows(db, "SELECT attempt_id,status,upload_status FROM purchase_task"))
}
@Test fun `rejected record never counts active even if legacy local status says running`() = database { db ->
migrate(db); reject(db)
db.createStatement().use { it.execute("UPDATE purchase_task SET status='running'") }
assertTrue(rows(db, PurchaseRejectionSql.activeTask).isEmpty())
}
@Test fun `invalid whitelist and mismatched outbox identity cannot change evidence`() = database { db ->
migrate(db)
for ((item, code) in listOf(
PendingPurchaseOutbox(1,42,"old","request","payload") to "UNKNOWN",
PendingPurchaseOutbox(1,42,"new","request","payload") to "PURCHASE_STATE_CONFLICT",
)) {
assertTrue(runCatching { PurchaseRejectionSql.reject(item, code, 100) { sql, args -> update(db, sql, args) } }.isFailure)
}
assertEquals(listOf(listOf("pending", null, null)), rows(db, "SELECT upload_status,rejected_at,rejection_error_code FROM purchase_outbox"))
}
@Test fun `task update failure rolls back rejection evidence too`() = database { db ->
migrate(db)
db.createStatement().use { it.execute("CREATE TRIGGER fail_task BEFORE UPDATE ON purchase_task BEGIN SELECT RAISE(ABORT, 'test'); END") }
assertTrue(runCatching { reject(db) }.isFailure)
assertEquals(listOf(listOf("pending", null, null)), rows(db, "SELECT upload_status,rejected_at,rejection_error_code FROM purchase_outbox"))
assertEquals(listOf(listOf("pending")), rows(db, "SELECT upload_status FROM purchase_task"))
}
@Test fun `ack survives database reopen and changes no payload or task state`() {
val file = java.io.File.createTempFile("purchase-rejection-", ".db")
try {
connect(file.absolutePath).use { db ->
seed(db); migrate(db); reject(db)
update(db, PurchaseRejectionSql.acknowledge, listOf(200L, 1L))
}
connect(file.absolutePath).use { db ->
assertEquals(listOf(listOf("200", "payload", "rejected")), rows(db, "SELECT acknowledged_at,payload_json,upload_status FROM purchase_outbox"))
assertEquals(listOf(listOf("completed", "rejected")), rows(db, "SELECT status,upload_status FROM purchase_task"))
}
} finally { check(file.delete()) }
}
private fun reject(db: Connection) {
db.autoCommit = false
try {
PurchaseRejectionSql.reject(PendingPurchaseOutbox(1,42,"old","request","payload"), "PURCHASE_STATE_CONFLICT", 100) { sql, args -> update(db, sql, args) }
db.commit()
} catch (error: Exception) { db.rollback(); throw error }
finally { db.autoCommit = true }
}
private fun update(db: Connection, sql: String, args: List<Any>): Int = db.prepareStatement(sql).use { statement ->
args.forEachIndexed { index, arg -> statement.setObject(index + 1, arg) }
statement.executeUpdate()
}
private fun migrate(db: Connection) = PurchaseRejectionSql.migration.forEach { sql -> db.createStatement().use { it.execute(sql) } }
private fun connect(path: String): Connection { Class.forName("org.sqlite.JDBC"); return DriverManager.getConnection("jdbc:sqlite:$path") }
private fun database(block: (Connection) -> Unit) = connect(":memory:").use { seed(it); block(it) }
private fun rows(db: Connection, sql: String): List<List<String?>> = db.createStatement().use { statement ->
statement.executeQuery(sql).use { r -> buildList { while(r.next()) add((1..r.metaData.columnCount).map { r.getString(it) }) } }
}
private fun seed(db: Connection) = db.createStatement().use {
it.execute("CREATE TABLE purchase_task (task_id INTEGER PRIMARY KEY,attempt_id TEXT NOT NULL,rule_snapshot_hash TEXT NOT NULL,current_step TEXT NOT NULL,status TEXT NOT NULL,result_json TEXT,upload_status TEXT NOT NULL,created_at INTEGER NOT NULL,updated_at INTEGER NOT NULL,order_submit_request_id TEXT,final_confirmation_json TEXT,irreversible_at INTEGER)")
it.execute("CREATE TABLE purchase_outbox (id INTEGER PRIMARY KEY AUTOINCREMENT,task_id INTEGER NOT NULL,attempt_id TEXT NOT NULL,request_id TEXT NOT NULL UNIQUE,payload_json TEXT NOT NULL,upload_status TEXT NOT NULL,created_at INTEGER NOT NULL,updated_at INTEGER NOT NULL)")
it.execute("INSERT INTO purchase_task VALUES (42,'old','hash','submit_result','completed','payload','pending',1,2,NULL,NULL,NULL)")
it.execute("INSERT INTO purchase_outbox VALUES (1,42,'old','request','payload','pending',1,2)")
}
}
@@ -0,0 +1,115 @@
package cn.ilapage.goauto.agent.service
import cn.ilapage.goauto.agent.network.AgentApiException
import cn.ilapage.goauto.agent.network.HeartbeatResult
import cn.ilapage.goauto.agent.persistence.PendingPurchaseOutbox
import cn.ilapage.goauto.agent.persistence.PurchaseOutboxUploader
import org.junit.Assert.*
import org.junit.Test
class AgentSyncCycleTest {
private val online = HeartbeatResult(7, true, false, 15)
private fun api(status: Int, code: String) = AgentApiException(status, code, "untrusted URL", false)
@Test fun `stale completed probe heartbeat mismatch rejected then refreshed heartbeat permits next claim`() {
val events = mutableListOf<String>()
var active: Long? = 42
var pending = true
val result = AgentSyncCycle(
heartbeat = { id -> events += "heartbeat:$id"; if (id != null) throw api(409, "DEVICE_TASK_MISMATCH") else online },
activeTaskId = { active }, executionActive = { false },
recover = { events += "recover" },
flush = {
PurchaseOutboxUploader(
{ listOf(PendingPurchaseOutbox(1,42,"probe","request","{}")) },
{ throw api(409,"PURCHASE_STATE_CONFLICT") },
{ fail("rejected probe must not be marked uploaded") },
{ fail("rejected probe must not establish handoff") },
{ _, _ -> events += "reject-probe"; pending = false; active = null },
).flush()
},
hasPending = { pending },
).run()
if (result.canClaim) events += "claim"
assertEquals(listOf("heartbeat:42", "recover", "reject-probe", "heartbeat:null", "claim"), events)
assertEquals(online, result.heartbeat)
}
@Test fun `authentication errors skip recovery and flush including unrecognized HTTP 401 and 403`() {
for ((status, code) in listOf(401 to "OTHER", 403 to "OTHER", 409 to "DEVICE_TOKEN_INVALID", 409 to "DEVICE_INSTALL_ID_CONFLICT", 409 to "DEVICE_DISABLED")) {
val result = AgentSyncCycle({ throw api(status, code) }, { 42 }, { false },
{ fail("recovery after auth failure") }, { fail("flush after auth failure") }, { true }).run()
assertFalse(result.canClaim)
assertEquals("AUTH_ERROR", result.failureCode)
}
}
@Test fun `heartbeat survives recovery or flush failure but claiming stops`() {
for (recoverFails in listOf(false, true)) {
var flushed = false
val result = AgentSyncCycle({ online }, { null }, { false },
{ if (recoverFails) error("disk") },
{ flushed = true; if (!recoverFails) throw api(500, "INTERNAL") }, { false }).run()
assertTrue(flushed)
assertEquals(online, result.heartbeat)
assertFalse(result.canClaim)
}
}
@Test fun `failed heartbeat still flushes but never claims and mismatch retries only once`() {
for (code in listOf("DEVICE_TASK_MISMATCH", "INTERNAL")) {
var heartbeats = 0
var flushed = false
val result = AgentSyncCycle({ heartbeats++; throw api(409, code) }, { null }, { false }, {},
{ flushed = true }, { false }).run()
assertTrue(flushed)
assertEquals(if (code == "DEVICE_TASK_MISMATCH") 2 else 1, heartbeats)
assertFalse(result.canClaim)
}
}
@Test fun `network failure leaves pending even if heartbeat succeeds`() {
var pending = true
val result = AgentSyncCycle({ online }, { 42 }, { false }, {}, { throw java.io.IOException("network") }, { pending }).run()
assertTrue(pending)
assertEquals(online, result.heartbeat)
assertFalse(result.canClaim)
}
@Test fun `active execution sends heartbeat without recovery or flush`() {
val result = AgentSyncCycle({ online }, { 42 }, { true }, { fail("recover") }, { fail("flush") }, { false }).run()
assertEquals(online, result.heartbeat)
assertFalse(result.canClaim)
}
@Test fun `retained irreversible local task prevents claim even without outbox`() {
val result = AgentSyncCycle({ online }, { 42 }, { false }, {}, {}, { false }).run()
assertFalse(result.canClaim)
}
@Test fun `authentication failure during recovery or flush stops round without heartbeat retry`() {
for (duringRecovery in listOf(true, false)) {
var heartbeats = 0
var flushes = 0
val result = AgentSyncCycle({ heartbeats++; throw api(409,"DEVICE_TASK_MISMATCH") }, { 42 }, { false },
{ if (duringRecovery) throw api(401,"OTHER") },
{ flushes++; throw api(403,"OTHER") }, { true }).run()
assertEquals(1, heartbeats)
assertEquals(if (duringRecovery) 0 else 1, flushes)
assertEquals("AUTH_ERROR", result.failureCode)
assertFalse(result.canClaim)
}
}
@Test fun `server failure is classified separately from transport failure`() {
val result = AgentSyncCycle({ throw api(503,"UNAVAILABLE") }, { null }, { false }, {}, {}, { false }).run()
assertEquals("SERVER_ERROR", result.failureCode)
}
@Test fun `claim failure cannot erase successful heartbeat except authentication`() {
assertNull(syncConnectionFailureCode(api(409,"PURCHASE_STATE_CONFLICT"), true))
assertNull(syncConnectionFailureCode(IllegalStateException("disk"), true))
assertNull(syncConnectionFailureCode(api(503,"INTERNAL"), true))
assertEquals("AUTH_ERROR", syncConnectionFailureCode(api(401,"OTHER"), true))
}
}
@@ -0,0 +1,59 @@
package cn.ilapage.goauto.agent.service
import org.junit.Assert.*
import org.junit.Test
class PurchaseRuntimeReconciliationTest {
@Test fun `manual current page cannot enter while sync owns recovery and flush`() {
val mutex = TaskExecutionMutex()
val syncing = java.util.concurrent.atomic.AtomicBoolean(false)
val syncEntered = java.util.concurrent.CountDownLatch(1)
val finishSync = java.util.concurrent.CountDownLatch(1)
val worker = java.util.concurrent.Executors.newSingleThreadExecutor()
val future = worker.submit {
synchronized(mutex) { assertTrue(syncing.compareAndSet(false, true)) }
syncEntered.countDown()
check(finishSync.await(3, java.util.concurrent.TimeUnit.SECONDS))
syncing.set(false)
}
try {
assertTrue(syncEntered.await(3, java.util.concurrent.TimeUnit.SECONDS))
assertFalse(tryAcquireCurrentPage(mutex, syncing, Long.MAX_VALUE))
assertNull(mutex.currentTaskId())
finishSync.countDown()
future.get(3, java.util.concurrent.TimeUnit.SECONDS)
assertTrue(tryAcquireCurrentPage(mutex, syncing, Long.MAX_VALUE))
} finally { finishSync.countDown(); worker.shutdownNow() }
}
@Test fun `reboot restored rejected task clears runtime so repurchase becomes idle`() {
var runtimeTaskId: Long? = 42
val currentDatabaseAttemptRejected = true
if (shouldClearRejectedPurchase(42, runtimeTaskId, "purchase", null, currentDatabaseAttemptRejected)) runtimeTaskId = null
assertNull(runtimeTaskId)
assertTrue(runtimeTaskId == null) // final runtime predicate in repurchaseLocalIdle
}
@Test fun `another task collection active executor or newer attempt cannot be cleared`() {
assertFalse(shouldClearRejectedPurchase(42, 43, "purchase", null, true))
assertFalse(shouldClearRejectedPurchase(42, 42, "collection", null, true))
assertFalse(shouldClearRejectedPurchase(42, 42, "purchase", 42, true))
assertFalse(shouldClearRejectedPurchase(42, 42, "purchase", 43, true))
assertFalse(shouldClearRejectedPurchase(42, 42, "purchase", null, false))
}
@Test fun `stopped service remains stopped after an in flight heartbeat completes`() {
val gate = AgentStatePublicationGate()
var connection = "CONNECTING"
gate.publish { connection = "ONLINE" }
assertEquals("ONLINE", connection)
gate.stop { connection = "STOPPED" }
gate.publish { connection = "ONLINE" }
assertEquals("STOPPED", connection)
val restartedService = AgentStatePublicationGate()
restartedService.publish { connection = "CONNECTING" }
assertEquals("CONNECTING", connection)
gate.publish { connection = "ONLINE" }
assertEquals("CONNECTING", connection)
}
}
+2 -11
View File
@@ -2,8 +2,8 @@
generated: true (请先修改 Gitea Wiki,禁止直接编辑本文件)
wiki_page: Architecture-and-Code-Map
wiki_url: https://git.ilapage.cn/OPC/goauto/wiki/Architecture-and-Code-Map.-
wiki_revision: 08da88a4f106004cb5f02448260d2fc22a83e9cc
synchronized_at: 2026-10-10T00:59:09Z
wiki_revision: 76854d900b2372ddedd46a2b82b5677d8bf5cb31
synchronized_at: 2026-10-09T07:45:10Z
<!-- gitea-wiki-mirror:end -->
<!-- gitea-wiki-mirror:start -->
@@ -673,12 +673,3 @@ Web 唯一展示位置为“采集采购 → SYB 同步记录”:列表状态
- `PddProductDetailCollector.collectColors` 只基于既有解析帧记录颜色阶段 UP 派发次数、空发现轮次和横向探索三态;不增加抓取、手势或等待。标签及签名只在内存使用,持久化仍为安全聚合。
- 不新增 Server/Web API 字段、服务端迁移或权限;普通结果 payload/missing 与采购探测失败策略未改变。完整遍历与不完整候选拦截仍属 #370 后续待证据实施范围,不能把本地诊断值作为已实现的业务门禁。
- 读取与三态限制见 Troubleshooting;旧版不保证降级打开 v5。JDBC 测试与实际 Android 安装升级分别验收,测试不代替真实竖向颜色采集验证。
## Admin 列表按当前筛选导出全部页(#372,待验收)
实现绑定 `a4a793f`(分支 `feat/372-list-export`,未合并、未发布)。
- 采购管理与 SYB 商品页各增「导出」按钮:`web/src/utils/list-export.js` 先按当前筛选读第 1 页取总数,超过 5000 条不导出,否则逐页读取(采购每页 100、SYB 每页 500)再用 `web/src/vendor/Export2Excel.js`(经 `utils/save-excel.js` 按需加载)生成 xlsx;任一页或批次失败不生成文件;筛选条件以点击时复制的参数为准。无服务端导出接口、无异步导出任务。
- `GET /api/admin/v1/purchase-tasks` 的 `AdminListRequest`(`server/app/goauto/purchase/admin_query.go`)新增可选 `orderSubmittedFrom` / `orderSubmittedTo`(`YYYY-MM-DD`,含首尾两天,按 `order_submitted_at`,UTC+8 与 SYB 创建时间筛选一致);格式错误或起止倒置返回 `INVALID_REQUEST`;无下单时间的任务在设置该筛选时不出现。采购页筛选栏用日期范围选择器。
- `GET /api/admin/v1/return-matches` 的 `returnmatch.ListItem` 新增只读 `yeekeQuantity`(`server/app/goauto/returnmatch/service.go`,来自既有 `yeeke_return_item` join,不参与匹配);该接口原本就支持一次传多个 `sybProductId`,SYB 导出按每批 200 个商品 ID 调用,不逐行请求,且只采用 `matched`/`confirmed` 的匹配。
- 无数据库迁移、无新接口、无新权限;导出按钮不单独鉴权,能打开列表的用户(含采购员)都可导出。
+2 -13
View File
@@ -2,8 +2,8 @@
generated: true (请先修改 Gitea Wiki,禁止直接编辑本文件)
wiki_page: Business-Rules-and-Glossary
wiki_url: https://git.ilapage.cn/OPC/goauto/wiki/Business-Rules-and-Glossary.-
wiki_revision: 1c57a8670034fe08420bcac48b58a9c4b2755f23
synchronized_at: 2026-10-10T00:59:12Z
wiki_revision: 7cdfe55383055e0f7611cd153e8d813d32f08d91
synchronized_at: 2026-10-09T10:28:15Z
<!-- gitea-wiki-mirror:end -->
<!-- gitea-wiki-mirror:start -->
@@ -946,14 +946,3 @@ Android 0.9.64 / versionCode 77,源码 `6550b9f`(分支实现,尚未安装
- 设置页区分同步中、真实心跳失败、已连接但有拒收;新说明采用固定文案,不展示任意服务端错误消息。本单只修复明确拒收后的持续阻塞,不代表最初心跳中断的原因已查明,历史诊断仍属于 #378。
- 拒收后只在执行锁空闲、当前运行标记属于同一采购任务且本地当前 attempt 已拒收时清理恢复占位,不清除其他采集/采购或新 attempt;手动当前页采集与同步共用既有 working/任务锁门禁。服务停止写 STOPPED,原服务实例的迟到状态更新不覆盖它。
## Admin 列表导出 Excel(#372,待验收)
实现绑定 `a4a793f`,分支 `feat/372-list-export`,未合并、未发布。
- 范围:采购管理和 SYB 商品页的「导出」导出**当前筛选条件下的全部页**,不是只导出当前页;筛选以点击导出时的值为准。总数超过 **5000** 条时提示缩小筛选范围并不导出;任一页读取失败不生成文件;无数据提示且不生成文件。分页读取期间数据变化可能有少量重复或遗漏,以导出时刻近似结果为准。
- 格式:时间 `YYYY-MM-DD HH:mm:ss`(浏览器本地时区);金额单位元,保留两位小数;空值留空;文件名 `采购导出_YYYYMMDD-HHmmss.xlsx`、`SYB商品导出_YYYYMMDD-HHmmss.xlsx`。不导出收货人、地址、账号等个人信息。
- 采购导出列(按顺序):SYB订单号、虾皮商品ID、颜色、尺码(均为 SYB 目标规格快照)、数量、状态(页面同款中文)、PDD单号、下单时间、价格(元)。价格取 `pddOrderAmountCent / 100`,即 Agent 在 PDD 待付款页读到的应付金额;旧版 Agent 或人工补录前为空则留空。要导出成功采购,先把状态筛为「订单已创建」并按需选择下单日期。
- 采购管理新增「下单日期」筛选:含首尾两天,按 `order_submitted_at`,日期边界 UTC+8,与 SYB 商品页创建时间筛选一致;没有下单时间的任务在设置该筛选时不出现。
- SYB 商品导出列(按顺序):SYB订单、虾皮商品ID、SYB颜色、SYB尺码、SYB数量、yeeke颜色、yeeke尺码、yeeke数量、匹配时间。yeeke 颜色/尺码来自该商品有效(`matched` 或 `confirmed`)退货匹配的 `variationName`,按第一个英文或中文逗号拆分,没有逗号时整段放 yeeke 颜色;yeeke 数量为对应退货商品数量;没有有效匹配时 yeeke 列与匹配时间留空。要导出已用退货,先把处理阶段筛为「已用退货」。
- 权限:不新增按钮权限,能打开列表的用户(含采购员)都可导出。
+20 -2
View File
@@ -2,8 +2,8 @@
generated: true (请先修改 Gitea Wiki,禁止直接编辑本文件)
wiki_page: Troubleshooting
wiki_url: https://git.ilapage.cn/OPC/goauto/wiki/Troubleshooting
wiki_revision: 6b370764320d1f5148fbc31f0ef6ce999370173d
synchronized_at: 2026-10-09T02:06:57Z
wiki_revision: af209183f85200ce53f79f82ab682e17bb0aa942
synchronized_at: 2026-10-09T10:28:29Z
<!-- gitea-wiki-mirror:end -->
# 故障排查
@@ -158,3 +158,21 @@ adb -s <serial> shell run-as cn.ilapage.goauto.agent sqlite3 -readonly databases
```
排查须绑定同一设备、Agent/PDD 版本、任务与规则快照,并对照同次 App 布局。网页竖排与 App 横排不是同一复现场景;当前横排只能做横向兼容性回归。真机测试结果及待验证项以 #370 工单为准。
## 采购结果拒收后设备持续离线(#377)
修复绑定工单分支 fix/377-rejected-purchase-outbox 的 8b75a95、309dce3;尚未合并 main、安装或发布。自动化覆盖不等于真实设备验收,不能假定线上手机已具备本节恢复行为。
旧版同步在心跳之前补传,一条结果被服务端永久拒收就能让每轮跳过心跳及领任务。离线之后本地仍携带旧任务 ID,又可能被心跳的 DEVICE_TASK_MISMATCH 拒绝;仅把心跳前置不足以恢复。#377 先发心跳,仍进行有界拒收收尾,再在任务不一致时重发一次心跳;认证失败不会继续收尾,执行中的任务不会被恢复流程并发接管。
排查步骤:
1. 核实 APK 对应提交,不仅看版本名(本次未改 versionCode/versionName)。设置页“正在同步”不代表断线;真实心跳网络、服务端或认证失败使用固定原因说明;任务处理错误不再覆盖此前成功的连接状态。
2. “已连接 · 有 N 条采购结果被服务端拒收”表示本地已有 rejected 结果,不等于服务端接收成功。可在设置页“查看拒收结果”和对应采购详情查看;有订单证据的结果还在采购页顶部持续提醒。
3. 人工核对 PDD 实际订单及后台任务。需要补录订单时沿用 Admin 原有人工流程;Agent 的“已核对”只隐藏这条本机提醒,不能代替后台保存、恢复回填、解锁重试或完成任务。原结果/订单号与核对时间继续保存。
4. 未知 409、网络失败或 5xx 保持 pending;如果仍卡住,核对错误分类及原任务状态,不自动把 pending 改成 sent。不反复重试真实采购来试探是否已下单。
5. 早期现场曾经另获授权,通过同时修改 outbox 与本地任务 upload_status=sent 恢复设备,但这不代表服务端已收件,也会把订单号留在手机。它只是历史应急处置,不是新版运维步骤,不应复制到脚本或作为常规修复。
数据库升级仅限手机私有 goauto_purchase.db:v3 在 purchase_outbox 添加 rejected_at、rejection_error_code、acknowledged_at;保留原始 payload 和任务数据。不得把整库、订单/地址内容上传到工单、Wiki、普通日志或 SynapBus。旧 APK 不保证能够降级打开 v3;回退优先使用保留 v3 的兼容修复构建,不卸载清数据、不擅自降低库版本。
已验证 SQLite JDBC 执行同一生产迁移/拒收/核对 SQL、事务回滚及文件重开;尚未执行 Android SQLiteOpenHelper 仪器测试、真机界面或真实采购。最初心跳和结果同时中断的原因仍未查明,#378 的诊断计划不属于本修复。
-50
View File
@@ -25,46 +25,6 @@ type AdminListRequest struct {
ShopeeOrderNo string
ShopeeOrderNos []string
PDDOrderNo string
// OrderSubmittedFrom/To are inclusive YYYY-MM-DD days (UTC+8, same as the
// SYB products createdFrom/createdTo filter) over order_submitted_at.
OrderSubmittedFrom string
OrderSubmittedTo string
}
// adminOrderDayLocation matches the SYB products page's createdFrom/createdTo
// day boundary (sybimport.sybStockLocation) so both pages filter the same way.
var adminOrderDayLocation = time.FixedZone("SYB UTC+8", 8*60*60)
// adminOrderSubmittedRange returns [start, endExclusive); a nil bound means
// that side is open. Both days are inclusive for the caller.
func adminOrderSubmittedRange(from, to string) (*time.Time, *time.Time, error) {
from, to = strings.TrimSpace(from), strings.TrimSpace(to)
parse := func(value, label string) (*time.Time, error) {
if value == "" {
return nil, nil
}
parsed, err := time.ParseInLocation("2006-01-02", value, adminOrderDayLocation)
if err != nil {
return nil, fail(CodeInvalidRequest, label+" 必须是 YYYY-MM-DD")
}
return &parsed, nil
}
start, err := parse(from, "orderSubmittedFrom")
if err != nil {
return nil, nil, err
}
endDay, err := parse(to, "orderSubmittedTo")
if err != nil {
return nil, nil, err
}
if start != nil && endDay != nil && start.After(*endDay) {
return nil, nil, fail(CodeInvalidRequest, "orderSubmittedFrom 不能晚于 orderSubmittedTo")
}
if endDay != nil {
end := endDay.AddDate(0, 0, 1)
endDay = &end
}
return start, endDay, nil
}
type AdminTaskItem struct {
@@ -215,17 +175,7 @@ func (s *Service) AdminList(ctx context.Context, req AdminListRequest) (AdminLis
if req.TaskType != "" && req.TaskType != models.PurchaseTaskTypeSYBOrder && req.TaskType != models.PurchaseTaskTypeStock {
return AdminListResponse{}, fail(CodeInvalidRequest, "taskType 无效")
}
submittedFrom, submittedTo, err := adminOrderSubmittedRange(req.OrderSubmittedFrom, req.OrderSubmittedTo)
if err != nil {
return AdminListResponse{}, err
}
query := s.DB.WithContext(ctx).Model(&models.PurchaseTask{})
if submittedFrom != nil {
query = query.Where("order_submitted_at >= ?", *submittedFrom)
}
if submittedTo != nil {
query = query.Where("order_submitted_at < ?", *submittedTo)
}
if req.TaskID > 0 {
query = query.Where("id = ?", req.TaskID)
}
@@ -1,129 +0,0 @@
package purchase
import (
"context"
"encoding/json"
"net/http"
"net/http/httptest"
"strings"
"testing"
"time"
"github.com/gin-gonic/gin"
jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
"github.com/google/uuid"
"go-admin/app/goauto/models"
"go-admin/app/goauto/purchasecontract"
)
// #372: order_submitted_at day filter, inclusive on both ends, UTC+8 days.
func TestAdminOrderSubmittedRange(t *testing.T) {
db := testDB(t)
f := seed(t, db, []string{purchasecontract.CapabilityPurchaseRehearsalV1}, true)
s := testService(db)
base := createAdminQueryTask(t, s, f)
loc := time.FixedZone("UTC+8", 8*3600)
at := func(day string, h, m int) *time.Time {
d, _ := time.ParseInLocation("2006-01-02", day, loc)
v := d.Add(time.Duration(h)*time.Hour + time.Duration(m)*time.Minute)
return &v
}
cases := []struct {
name string
status string
at *time.Time
}{
{"before", models.PurchaseTaskStatusOrderCreated, at("2026-10-01", 23, 59)},
{"first-day-start", models.PurchaseTaskStatusOrderCreated, at("2026-10-02", 0, 0)},
{"middle", models.PurchaseTaskStatusOrderCreated, at("2026-10-03", 12, 0)},
{"last-day-end", models.PurchaseTaskStatusOrderCreated, at("2026-10-04", 23, 59)},
{"after", models.PurchaseTaskStatusOrderCreated, at("2026-10-05", 0, 0)},
{"middle-failed", models.PurchaseTaskStatusFailed, at("2026-10-03", 13, 0)},
{"no-time", models.PurchaseTaskStatusOrderCreated, nil},
}
for _, tc := range cases {
row := base
row.ID = 0
row.CreateRequestID = uuid.NewString()
row.ShopeeOrderNoSnapshot = tc.name
row.Status = tc.status
row.OrderSubmittedAt = tc.at
if err := db.Create(&row).Error; err != nil {
t.Fatal(err)
}
}
names := func(req AdminListRequest) map[string]bool {
t.Helper()
out, err := s.AdminList(context.Background(), req)
if err != nil {
t.Fatal(err)
}
got := map[string]bool{}
for _, item := range out.Items {
got[item.ShopeeOrderNoSnapshot] = true
}
if int(out.Total) != len(got) {
t.Fatalf("total %d != items %d", out.Total, len(got))
}
return got
}
both := names(AdminListRequest{OrderSubmittedFrom: "2026-10-02", OrderSubmittedTo: "2026-10-04"})
if len(both) != 4 || !both["first-day-start"] || !both["middle"] || !both["last-day-end"] || !both["middle-failed"] {
t.Fatalf("both days must be inclusive: %v", both)
}
combined := names(AdminListRequest{OrderSubmittedFrom: "2026-10-02", OrderSubmittedTo: "2026-10-04", Status: models.PurchaseTaskStatusOrderCreated})
if len(combined) != 3 || combined["middle-failed"] {
t.Fatalf("must combine with status: %v", combined)
}
if only := names(AdminListRequest{OrderSubmittedFrom: "2026-10-04"}); len(only) != 2 || !only["last-day-end"] || !only["after"] {
t.Fatalf("from only: %v", only)
}
if only := names(AdminListRequest{OrderSubmittedTo: "2026-10-02"}); len(only) != 2 || !only["before"] || !only["first-day-start"] {
t.Fatalf("to only: %v", only)
}
if one := names(AdminListRequest{OrderSubmittedFrom: "2026-10-03", OrderSubmittedTo: "2026-10-03"}); len(one) != 2 {
t.Fatalf("single day: %v", one)
}
if none := names(AdminListRequest{}); !none["no-time"] {
t.Fatalf("no filter must keep rows without order time: %v", none)
}
}
func TestAdminOrderSubmittedRangeInvalid(t *testing.T) {
gin.SetMode(gin.TestMode)
db := testDB(t)
f := seed(t, db, []string{purchasecontract.CapabilityPurchaseRehearsalV1}, true)
s := testService(db)
createAdminQueryTask(t, s, f)
for _, req := range []AdminListRequest{
{OrderSubmittedFrom: "2026/10/02"},
{OrderSubmittedTo: "10-02"},
{OrderSubmittedFrom: "2026-13-01"},
{OrderSubmittedFrom: "2026-10-05", OrderSubmittedTo: "2026-10-04"},
} {
if _, err := s.AdminList(context.Background(), req); code(err) != CodeInvalidRequest {
t.Fatalf("%+v: expected invalid request, got %v", req, err)
}
}
for _, query := range []string{"orderSubmittedFrom=abc", "orderSubmittedTo=2026-02-30"} {
w := httptest.NewRecorder()
c, _ := gin.CreateTestContext(w)
c.Set("JWT_PAYLOAD", jwt.MapClaims{"rolekey": "purchaser"})
c.Request = httptest.NewRequest(http.MethodGet, "/api/admin/v1/purchase-tasks?"+query, nil)
(Handler{DB: db}).AdminList(c)
if !strings.Contains(w.Body.String(), CodeInvalidRequest) {
t.Fatalf("handler accepted %s: %s", query, w.Body.String())
}
}
w := httptest.NewRecorder()
c, _ := gin.CreateTestContext(w)
c.Set("JWT_PAYLOAD", jwt.MapClaims{"rolekey": "purchaser"})
c.Request = httptest.NewRequest(http.MethodGet, "/api/admin/v1/purchase-tasks?orderSubmittedFrom=2026-10-01&orderSubmittedTo=2026-10-02", nil)
(Handler{DB: db}).AdminList(c)
var result struct {
Data AdminListResponse `json:"data"`
}
if err := json.Unmarshal(w.Body.Bytes(), &result); err != nil || w.Code != http.StatusOK {
t.Fatalf("valid range: %d %s", w.Code, w.Body.String())
}
}
+4 -6
View File
@@ -52,12 +52,10 @@ func (h Handler) AdminList(c *gin.Context) {
response, err := service.AdminList(c.Request.Context(), AdminListRequest{
Page: page, PageSize: pageSize, TaskID: taskID, SYBProductID: sybProductID,
Status: strings.TrimSpace(c.Query("status")), ExecutionMode: strings.TrimSpace(c.Query("executionMode")),
TaskType: strings.TrimSpace(c.Query("taskType")),
ShopeeOrderNo: strings.TrimSpace(c.Query("shopeeOrderNo")),
ShopeeOrderNos: c.Request.URL.Query()["shopeeOrderNos"],
PDDOrderNo: strings.TrimSpace(c.Query("pddOrderNo")),
OrderSubmittedFrom: c.Query("orderSubmittedFrom"),
OrderSubmittedTo: c.Query("orderSubmittedTo"),
TaskType: strings.TrimSpace(c.Query("taskType")),
ShopeeOrderNo: strings.TrimSpace(c.Query("shopeeOrderNo")),
ShopeeOrderNos: c.Request.URL.Query()["shopeeOrderNos"],
PDDOrderNo: strings.TrimSpace(c.Query("pddOrderNo")),
})
if err != nil {
writeError(c, err)
+5 -11
View File
@@ -495,12 +495,9 @@ type ListFilter struct {
// sn, spec) so it never has to issue a second request per row.
type ListItem struct {
models.ReturnMatch
OrderSN string `json:"orderSn,omitempty"`
Image string `json:"image,omitempty"`
VariationName string `json:"variationName,omitempty"`
// YeekeQuantity is the yeeke return item's own quantity (read-only, #372
// export); it comes from the same join and is never used for matching.
YeekeQuantity int64 `json:"yeekeQuantity"`
OrderSN string `json:"orderSn,omitempty"`
Image string `json:"image,omitempty"`
VariationName string `json:"variationName,omitempty"`
DestroyDeadline *time.Time `json:"destroyDeadline,omitempty"`
// SyncStatus/MissingSince (#338) surface the yeeke return item's own
// current availability ("ok"/"missing") so the SYB products match column
@@ -541,7 +538,6 @@ func (s *Service) List(ctx context.Context, filter ListFilter) ([]ListItem, erro
OrderSN string
Image string
VariationName string
Quantity int64
DestroyDeadLine *time.Time
SyncStatus string
MissingSince *time.Time
@@ -549,7 +545,7 @@ func (s *Service) List(ctx context.Context, filter ListFilter) ([]ListItem, erro
PackageMissingAt *time.Time `gorm:"column:package_missing_since"`
}
if err := s.DB.WithContext(ctx).Table("yeeke_return_item AS i").
Select("i.id AS id, p.order_sn AS order_sn, i.image AS image, i.variation_name AS variation_name, i.quantity AS quantity, p.destroy_dead_line AS destroy_dead_line, "+
Select("i.id AS id, p.order_sn AS order_sn, i.image AS image, i.variation_name AS variation_name, p.destroy_dead_line AS destroy_dead_line, "+
"i.sync_status AS sync_status, i.missing_since AS missing_since, p.sync_status AS package_sync_status, p.missing_since AS package_missing_since").
Joins("JOIN yeeke_return_package AS p ON p.id = i.package_id").
Where("i.id IN ?", returnIDs).
@@ -560,7 +556,6 @@ func (s *Service) List(ctx context.Context, filter ListFilter) ([]ListItem, erro
OrderSN string
Image string
VariationName string
Quantity int64
DestroyDeadLine *time.Time
SyncStatus string
MissingSince *time.Time
@@ -574,14 +569,13 @@ func (s *Service) List(ctx context.Context, filter ListFilter) ([]ListItem, erro
if j.PackageSyncStat != "ok" {
syncStatus, missingSince = j.PackageSyncStat, j.PackageMissingAt
}
byID[j.ID] = extraFields{j.OrderSN, j.Image, j.VariationName, j.Quantity, j.DestroyDeadLine, syncStatus, missingSince}
byID[j.ID] = extraFields{j.OrderSN, j.Image, j.VariationName, j.DestroyDeadLine, syncStatus, missingSince}
}
for i := range items {
if extra, ok := byID[items[i].YeekeReturnItemID]; ok {
items[i].OrderSN = extra.OrderSN
items[i].Image = extra.Image
items[i].VariationName = extra.VariationName
items[i].YeekeQuantity = extra.Quantity
items[i].DestroyDeadline = extra.DestroyDeadLine
items[i].SyncStatus = extra.SyncStatus
items[i].MissingSince = extra.MissingSince
@@ -2,7 +2,6 @@ package returnmatch
import (
"context"
"encoding/json"
"errors"
"fmt"
"strings"
@@ -485,27 +484,3 @@ func TestList_EnrichesWithYeekeReturnDisplayFields(t *testing.T) {
t.Fatalf("expected enriched list item: %+v", items)
}
}
// #372: List exposes the yeeke return item's quantity (read-only export field).
func TestList_ExposesYeekeQuantity(t *testing.T) {
db := testDB(t)
s := NewService(db)
s.Now = func() time.Time { return time.Date(2026, 9, 24, 0, 0, 0, 0, time.UTC) }
syb := seedSYB(t, db, "SYB-Q", 1, "白色", "L", time.Date(2026, 9, 1, 0, 0, 0, 0, time.UTC))
deadline := time.Date(2026, 10, 1, 0, 0, 0, 0, time.UTC)
item := seedReturn(t, db, "白色,L", &deadline)
if err := db.Model(&models.YeekeReturnItem{}).Where("id = ?", item.ID).Update("quantity", 3).Error; err != nil {
t.Fatal(err)
}
if resp, err := s.BatchMatch(context.Background(), BatchMatchRequest{SYBProductIDs: []uint64{syb.ID}}); err != nil || resp.MatchedCount != 1 {
t.Fatalf("setup failed: %v %+v", err, resp)
}
items, err := s.List(context.Background(), ListFilter{SYBProductIDs: []uint64{syb.ID}})
if err != nil || len(items) != 1 || items[0].YeekeQuantity != 3 {
t.Fatalf("expected yeekeQuantity 3: %+v %v", items, err)
}
raw, _ := json.Marshal(items[0])
if !strings.Contains(string(raw), `"yeekeQuantity":3`) {
t.Fatalf("json missing yeekeQuantity: %s", raw)
}
}
-136
View File
@@ -1,136 +0,0 @@
// #372: export every page of an admin list (current filters) to xlsx.
// Pure helpers with injected dependencies so they can be unit tested without a
// browser; the pages inject the API calls and the Export2Excel saver.
export const EXPORT_MAX_ROWS = 5000
const pad = (value, width = 2) => String(value).padStart(width, '0')
// YYYY-MM-DD HH:mm:ss in the browser's local time zone; empty for blank/invalid.
export function formatExportTime(value) {
if (!value) return ''
const date = new Date(value)
if (Number.isNaN(date.getTime())) return ''
return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`
}
// YYYYMMDD-HHmmss for file names.
export function formatExportStamp(date = new Date()) {
return `${date.getFullYear()}${pad(date.getMonth() + 1)}${pad(date.getDate())}-${pad(date.getHours())}${pad(date.getMinutes())}${pad(date.getSeconds())}`
}
// Cents -> yuan text with two decimals; null/undefined/'' stay empty.
export function centToYuan(cent) {
if (cent === null || cent === undefined || cent === '') return ''
const value = Number(cent)
if (!Number.isFinite(value)) return ''
const sign = value < 0 ? '-' : ''
const abs = Math.abs(Math.round(value))
return `${sign}${Math.floor(abs / 100)}.${pad(abs % 100)}`
}
// yeeke only has one variation_name ("color,size"); split at the first English
// or Chinese comma. Without a comma the whole text is the color.
export function splitYeekeVariation(name) {
const text = String(name ?? '').trim()
if (!text) return { color: '', size: '' }
const index = text.search(/[,,]/)
if (index < 0) return { color: text, size: '' }
return { color: text.slice(0, index).trim(), size: text.slice(index + 1).trim() }
}
const blank = value => (value === null || value === undefined ? '' : value)
export const PURCHASE_EXPORT_HEADER = ['SYB订单号', '虾皮商品ID', '颜色', '尺码', '数量', '状态', 'PDD单号', '下单时间', '价格(元)']
// statusLabel: the page's own status -> Chinese label function.
export function purchaseExportRow(task, statusLabel = value => value) {
return [
blank(task.shopeeOrderNoSnapshot), blank(task.shopeeItemIdSnapshot), blank(task.targetColorSnapshot), blank(task.targetSizeSnapshot),
blank(task.quantity), task.status ? statusLabel(task.status) : '', blank(task.pddOrderNo),
formatExportTime(task.orderSubmittedAt), centToYuan(task.pddOrderAmountCent)
]
}
export const SYB_PRODUCT_EXPORT_HEADER = ['SYB订单', '虾皮商品ID', 'SYB颜色', 'SYB尺码', 'SYB数量', 'yeeke颜色', 'yeeke尺码', 'yeeke数量', '匹配时间']
export const isActiveReturnMatch = match => Boolean(match) && (match.status === 'matched' || match.status === 'confirmed')
// match: the active (matched/confirmed) return match of this product, or null.
export function sybProductExportRow(product, match) {
const active = isActiveReturnMatch(match) ? match : null
const yeeke = active ? splitYeekeVariation(active.variationName) : { color: '', size: '' }
return [
blank(product.orderCode), blank(product.shopeeItemId), blank(product.targetColor), blank(product.targetSize), blank(product.quantity),
yeeke.color, yeeke.size, active ? blank(active.yeekeQuantity) : '', active ? formatExportTime(active.matchedAt) : ''
]
}
export function exportFailureMessage(result, maxRows = EXPORT_MAX_ROWS) {
switch (result.reason) {
case 'empty': return '当前筛选没有数据,未生成文件'
case 'too_many': return `共 ${result.total} 条,超过 ${maxRows} 条上限,请缩小筛选范围`
case 'page_failed': return `导出失败:第 ${result.page} 页读取失败,未生成文件`
case 'enrich_failed': return '导出失败:匹配信息读取失败,未生成文件'
default: return '导出失败,未生成文件'
}
}
function chunk(items, size) {
const result = []
for (let i = 0; i < items.length; i += size) result.push(items.slice(i, i + size))
return result
}
// Reads page 1 for the total, refuses above maxRows, then reads the remaining
// pages. Any failure returns { ok: false } and nothing is saved.
// fetchPage(page, pageSize) -> { items, total }
// enrich(items) -> decorated items of the same length (optional, per batch)
// mapRow(item) -> array of cells
// save({ header, data, filename }) -> writes the file (only after success)
export async function runListExport({
fetchPage, pageSize, maxRows = EXPORT_MAX_ROWS, enrich = null, enrichBatchSize = 200,
header, mapRow, filename, save, onProgress = () => {}
}) {
let first
try {
first = await fetchPage(1, pageSize)
} catch (error) {
return { ok: false, reason: 'page_failed', page: 1, error }
}
const total = Number(first?.total) || 0
if (total === 0) return { ok: false, reason: 'empty', total: 0 }
if (total > maxRows) return { ok: false, reason: 'too_many', total }
const pages = Math.ceil(total / pageSize)
const enrichSteps = enrich ? Math.ceil(total / enrichBatchSize) : 0
const steps = pages + enrichSteps
let done = 1
onProgress(done, steps)
let items = [...(first.items || [])]
for (let page = 2; page <= pages; page++) {
let response
try {
response = await fetchPage(page, pageSize)
} catch (error) {
return { ok: false, reason: 'page_failed', page, error }
}
items = items.concat(response?.items || [])
onProgress(++done, steps)
}
if (enrich) {
const decorated = []
for (const part of chunk(items, enrichBatchSize)) {
try {
decorated.push(...await enrich(part))
} catch (error) {
return { ok: false, reason: 'enrich_failed', error }
}
onProgress(++done, steps)
}
items = decorated
}
if (items.length === 0) return { ok: false, reason: 'empty', total: 0 }
const data = items.map(mapRow)
await save({ header, data, filename: `${filename}_${formatExportStamp()}` })
return { ok: true, total, rows: data.length }
}
-5
View File
@@ -1,5 +0,0 @@
// Loads the xlsx writer on demand so the list pages do not pull it into their chunk.
export async function saveExcel(file) {
const { export_json_to_excel: exportJsonToExcel } = await import('@/vendor/Export2Excel')
exportJsonToExcel(file)
}
+4 -28
View File
@@ -16,8 +16,7 @@
<el-form-item label="状态"><el-select v-model="query.status" clearable placeholder="全部状态" style="width:160px"><el-option v-for="item in statuses" :key="item.value" :label="item.label" :value="item.value" /></el-select></el-form-item>
<el-form-item label="SYB 商品"><el-input v-model="query.sybProductId" class="syb-input" clearable placeholder="商品 ID" @keyup.enter="search" /></el-form-item>
<el-form-item label="PDD 订单号"><el-input v-model="query.pddOrderNo" class="order-input" clearable placeholder="订单号" @keyup.enter="search" /></el-form-item>
<el-form-item label="下单日期"><el-date-picker v-model="query.orderSubmittedRange" type="daterange" value-format="YYYY-MM-DD" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" clearable style="width:260px" /></el-form-item>
<el-form-item><el-button type="primary" :icon="Search" :disabled="Boolean(orderFilter.error)" @click="search">查询</el-button><el-button :icon="RefreshLeft" @click="reset">重置</el-button><el-button :disabled="exporting || Boolean(orderFilter.error)" @click="exportExcel">{{ exporting ? `导出中 ${exportProgress.done}/${exportProgress.steps}` : '导出' }}</el-button></el-form-item>
<el-form-item><el-button type="primary" :icon="Search" :disabled="Boolean(orderFilter.error)" @click="search">查询</el-button><el-button :icon="RefreshLeft" @click="reset">重置</el-button></el-form-item>
</el-form>
<div class="batch-actions"><span class="selected-copy">已选择 <strong>{{ retrySelection.length }}</strong> 条</span><el-button type="warning" :disabled="retryCandidates.length === 0" :loading="retryDialog.saving" @click="openRetryDialog">重试({{ retryCandidates.length }})</el-button><el-button type="primary" plain :disabled="orderWritebackCandidates.length === 0" :loading="orderWriteback.saving" @click="submitOrderWriteback(orderWritebackCandidates)">批量回填 SYB({{ orderWritebackCandidates.length }})</el-button></div>
@@ -155,8 +154,6 @@ import { ElMessage, ElMessageBox } from 'element-plus'
import { RefreshLeft, Search } from '@element-plus/icons-vue'
import { authorizeRepurchase, cancelPurchaseTask, choosePurchaseMatching, getPurchaseTask, listPurchaseTasks, requeuePurchaseMatching, resolveUnknownPurchaseTask, retryPurchaseTasksBatch, reviewPurchasePayment, selectPurchaseWriteback, writebackPurchaseOrderNumbers } from '@/api/goauto/purchase-tasks'
import { createRequestId } from '@/utils/request-id'
import { saveExcel } from '@/utils/save-excel'
import { EXPORT_MAX_ROWS, PURCHASE_EXPORT_HEADER, exportFailureMessage, purchaseExportRow, runListExport } from '@/utils/list-export'
import { listFailureSnapshots } from '@/api/goauto/purchase-failure-snapshots'
import FailureSnapshotCell from './FailureSnapshotCell.vue'
@@ -172,10 +169,9 @@ export default {
data() {
return {
loading: false, loadError: '', tasks: [], total: 0, statuses: [...statusOptions, { value: 'syb_writeback_succeeded', label: '已回填 SYB' }],
exporting: false, exportProgress: { done: 0, steps: 0 },
detailSession: 0, snapshots: { items: {}, loading: false, error: false },
orderWriteback: { open: false, saving: false, items: [] },
query: { page: 1, pageSize: 20, taskId: '', taskType: '', shopeeOrderNo: '', status: '', executionMode: 'live', sybProductId: '', pddOrderNo: '', orderSubmittedRange: [] },
query: { page: 1, pageSize: 20, taskId: '', taskType: '', shopeeOrderNo: '', status: '', executionMode: 'live', sybProductId: '', pddOrderNo: '' },
detail: { open: false, loading: false, task: null, attempts: [], matching: null },
matchingAction: { saving: false }, matchingDialog: { open: false, saving: false, color: '', size: '' },
retrySelection: [],
@@ -231,34 +227,14 @@ export default {
try { const r = await listPurchaseTasks(this.cleanQuery()); this.tasks = r.data.items || []; this.total = r.data.total || 0; this.retrySelection = []; this.$nextTick(() => this.$refs.taskTable?.clearSelection()) } catch (error) { this.tasks = []; this.total = 0; this.loadError = error?.message || '采购任务加载失败,请稍后重试' } finally { this.loading = false }
},
cleanQuery() {
const params = Object.fromEntries(Object.entries(this.query).filter(([key, value]) => key !== 'shopeeOrderNo' && key !== 'orderSubmittedRange' && value !== ''))
const [orderSubmittedFrom, orderSubmittedTo] = this.query.orderSubmittedRange || []
if (orderSubmittedFrom) params.orderSubmittedFrom = orderSubmittedFrom
if (orderSubmittedTo) params.orderSubmittedTo = orderSubmittedTo
const params = Object.fromEntries(Object.entries(this.query).filter(([key, value]) => key !== 'shopeeOrderNo' && value !== ''))
const values = this.orderFilter.values
if (values.length === 1) params.shopeeOrderNo = values[0]
else if (values.length > 1) params.shopeeOrderNos = values
return params
},
search() { this.query.page = 1; this.load() },
reset() { this.query = { page: 1, pageSize: 20, taskId: '', taskType: '', shopeeOrderNo: '', status: '', executionMode: 'live', sybProductId: '', pddOrderNo: '', orderSubmittedRange: [] }; this.load() },
// #372: export every page of the filters as they are at click time (params are copied once).
async exportExcel() {
if (this.exporting || this.orderFilter.error) return
const filters = this.cleanQuery(); delete filters.page; delete filters.pageSize
this.exporting = true; this.exportProgress = { done: 0, steps: 0 }
try {
const result = await runListExport({
pageSize: 100, maxRows: EXPORT_MAX_ROWS, header: PURCHASE_EXPORT_HEADER, filename: '采购导出',
fetchPage: async(pageNo, size) => { const r = await listPurchaseTasks({ ...filters, page: pageNo, pageSize: size }); return { items: r.data.items || [], total: r.data.total || 0 } },
mapRow: task => purchaseExportRow(task, this.statusLabel),
save: saveExcel,
onProgress: (done, steps) => { this.exportProgress = { done, steps } }
})
if (!result.ok) ElMessage.warning(exportFailureMessage(result, EXPORT_MAX_ROWS))
else ElMessage.success(`已导出 ${result.rows} 条;导出期间数据变化可能有少量差异`)
} catch (error) { ElMessage.error('导出失败,未生成文件') } finally { this.exporting = false }
},
reset() { this.query = { page: 1, pageSize: 20, taskId: '', taskType: '', shopeeOrderNo: '', status: '', executionMode: 'live', sybProductId: '', pddOrderNo: '' }; this.load() },
clearSnapshots() { this.detailSession++; this.snapshots = { items: {}, loading: false, error: false } },
async loadSnapshots() {
if (!this.isSnapshotAdmin || !this.detail.open || !this.detail.task || this.snapshots.loading) return
+1 -33
View File
@@ -26,7 +26,7 @@
<el-form-item label="解析状态"><el-select v-model="query.parseStatus" clearable placeholder="全部" style="width: 110px"><el-option label="成功" value="success" /><el-option label="失败" value="failed" /></el-select></el-form-item>
<el-form-item label="处理阶段"><el-select v-model="query.processStage" clearable placeholder="全部" style="width: 132px" @change="onProcessStageChange"><el-option v-for="item in processStageOptions" :key="item.value" :label="item.label" :value="item.value" /></el-select></el-form-item>
<el-form-item label="采购类型"><el-select v-model="query.purchaseType" style="width: 132px"><el-option label="需 PDD 采购" value="pdd" /><el-option label="无需 PDD 采购" value="excluded" /><el-option label="全部" value="all" /></el-select></el-form-item>
<el-form-item class="toolbar-actions"><el-button type="primary" :icon="Search" @click="search">查询</el-button><el-button :icon="RefreshLeft" @click="reset">重置</el-button><el-button :disabled="exporting" @click="exportExcel">{{ exporting ? `导出中 ${exportProgress.done}/${exportProgress.steps}` : '导出' }}</el-button><el-tooltip v-if="canPurchase" :content="aiMatchButtonReason" :disabled="!aiMatchButtonReason" placement="top"><span class="action-button-wrap"><el-button :loading="specMatchLoading" :disabled="purchaseReadinessLoading || specMatchLoading || aiMatchCandidates.length === 0 || aiMatchButtonOverLimit" @click="runBatchSpecMatch">AI 匹配<span class="action-count">{{ aiMatchCandidates.length }}</span></el-button></span></el-tooltip><el-tooltip v-if="canPurchase" :content="imageSearchButtonReason" :disabled="!imageSearchButtonReason" placement="top"><span class="action-button-wrap"><el-button type="success" plain :disabled="imageSearchRows.length === 0 || imageSearchButtonOverLimit" @click="openImageSearchBatch">图搜采集<span class="action-count">{{ imageSearchRows.length }}</span></el-button></span></el-tooltip><el-tooltip v-if="canPurchase" :content="collectionButtonReason" :disabled="!collectionButtonReason" placement="top"><span class="action-button-wrap"><el-button type="primary" :loading="purchaseReadinessLoading" :disabled="purchaseReadinessLoading || specMatchLoading || collectionCandidates.length === 0 || collectionButtonOverLimit" @click="openCollectionBatch">创建采集<span class="action-count action-count-primary">{{ collectionCandidates.length }}</span></el-button></span></el-tooltip><el-tooltip v-if="canPurchase" :content="purchaseButtonReason" :disabled="!purchaseButtonReason" placement="top"><span class="action-button-wrap"><el-button type="primary" :loading="purchaseReadinessLoading" :disabled="purchaseReadinessLoading || specMatchLoading || purchaseCandidates.length === 0 || purchaseButtonOverLimit" @click="openPurchaseBatch">创建采购<span class="action-count action-count-primary">{{ purchaseCandidates.length }}</span></el-button></span></el-tooltip><el-tooltip v-if="canPurchase" :content="returnMatchButtonReason" :disabled="!returnMatchButtonReason" placement="top"><span class="action-button-wrap"><el-button :loading="returnMatchBatchLoading" :disabled="purchaseReadinessLoading || returnMatchBatchLoading || returnConfirmBatchLoading || returnCancelBatchLoading || returnTransitionLoading || matchDetail.saving || returnMatchCandidateIds.length === 0 || returnMatchButtonOverLimit" @click="runBatchMatchReturns">匹配退货<span class="action-count">{{ returnMatchCandidateIds.length }}</span></el-button></span></el-tooltip><el-tooltip v-if="canPurchase" :content="returnCancelButtonReason" :disabled="!returnCancelButtonReason" placement="top"><span class="action-button-wrap"><el-button :loading="returnCancelBatchLoading" :disabled="Boolean(returnCancelButtonReason)" @click="runBatchCancelReturns">取消匹配<span class="action-count">{{ returnCancelCandidates.length }}</span></el-button></span></el-tooltip><el-tooltip v-if="canPurchase" :content="returnConfirmButtonReason" :disabled="!returnConfirmButtonReason" placement="top"><span class="action-button-wrap"><el-button type="success" plain :loading="returnConfirmBatchLoading" :disabled="Boolean(returnConfirmButtonReason)" @click="runBatchConfirmReturns">使用退货<span class="action-count">{{ returnConfirmCandidates.length }}</span></el-button></span></el-tooltip></el-form-item>
<el-form-item class="toolbar-actions"><el-button type="primary" :icon="Search" @click="search">查询</el-button><el-button :icon="RefreshLeft" @click="reset">重置</el-button><el-tooltip v-if="canPurchase" :content="aiMatchButtonReason" :disabled="!aiMatchButtonReason" placement="top"><span class="action-button-wrap"><el-button :loading="specMatchLoading" :disabled="purchaseReadinessLoading || specMatchLoading || aiMatchCandidates.length === 0 || aiMatchButtonOverLimit" @click="runBatchSpecMatch">AI 匹配<span class="action-count">{{ aiMatchCandidates.length }}</span></el-button></span></el-tooltip><el-tooltip v-if="canPurchase" :content="imageSearchButtonReason" :disabled="!imageSearchButtonReason" placement="top"><span class="action-button-wrap"><el-button type="success" plain :disabled="imageSearchRows.length === 0 || imageSearchButtonOverLimit" @click="openImageSearchBatch">图搜采集<span class="action-count">{{ imageSearchRows.length }}</span></el-button></span></el-tooltip><el-tooltip v-if="canPurchase" :content="collectionButtonReason" :disabled="!collectionButtonReason" placement="top"><span class="action-button-wrap"><el-button type="primary" :loading="purchaseReadinessLoading" :disabled="purchaseReadinessLoading || specMatchLoading || collectionCandidates.length === 0 || collectionButtonOverLimit" @click="openCollectionBatch">创建采集<span class="action-count action-count-primary">{{ collectionCandidates.length }}</span></el-button></span></el-tooltip><el-tooltip v-if="canPurchase" :content="purchaseButtonReason" :disabled="!purchaseButtonReason" placement="top"><span class="action-button-wrap"><el-button type="primary" :loading="purchaseReadinessLoading" :disabled="purchaseReadinessLoading || specMatchLoading || purchaseCandidates.length === 0 || purchaseButtonOverLimit" @click="openPurchaseBatch">创建采购<span class="action-count action-count-primary">{{ purchaseCandidates.length }}</span></el-button></span></el-tooltip><el-tooltip v-if="canPurchase" :content="returnMatchButtonReason" :disabled="!returnMatchButtonReason" placement="top"><span class="action-button-wrap"><el-button :loading="returnMatchBatchLoading" :disabled="purchaseReadinessLoading || returnMatchBatchLoading || returnConfirmBatchLoading || returnCancelBatchLoading || returnTransitionLoading || matchDetail.saving || returnMatchCandidateIds.length === 0 || returnMatchButtonOverLimit" @click="runBatchMatchReturns">匹配退货<span class="action-count">{{ returnMatchCandidateIds.length }}</span></el-button></span></el-tooltip><el-tooltip v-if="canPurchase" :content="returnCancelButtonReason" :disabled="!returnCancelButtonReason" placement="top"><span class="action-button-wrap"><el-button :loading="returnCancelBatchLoading" :disabled="Boolean(returnCancelButtonReason)" @click="runBatchCancelReturns">取消匹配<span class="action-count">{{ returnCancelCandidates.length }}</span></el-button></span></el-tooltip><el-tooltip v-if="canPurchase" :content="returnConfirmButtonReason" :disabled="!returnConfirmButtonReason" placement="top"><span class="action-button-wrap"><el-button type="success" plain :loading="returnConfirmBatchLoading" :disabled="Boolean(returnConfirmButtonReason)" @click="runBatchConfirmReturns">使用退货<span class="action-count">{{ returnConfirmCandidates.length }}</span></el-button></span></el-tooltip></el-form-item>
</div>
<div class="search-row search-row-secondary">
<el-form-item label="创建时间"><el-date-picker v-model="query.createdAtRange" type="daterange" value-format="YYYY-MM-DD" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" clearable /></el-form-item>
@@ -395,8 +395,6 @@ import { createPurchaseTasksBatch, matchPurchaseSpecsBatch, previewPurchaseTasks
import { batchCreateCollectionTasks, batchCreateImageSearchCollectionTasks } from '@/api/goauto/collection-tasks'
import { listCollectionRules } from '@/api/goauto/collection-rules'
import { listReturnMatches, batchMatchReturns, getReturnMatch, confirmReturnMatch, cancelReturnMatch, remarkReturnMatch } from '@/api/goauto/return-matches'
import { saveExcel } from '@/utils/save-excel'
import { EXPORT_MAX_ROWS, SYB_PRODUCT_EXPORT_HEADER, exportFailureMessage, isActiveReturnMatch, runListExport, sybProductExportRow } from '@/utils/list-export'
import { createRequestId } from '@/utils/request-id'
import { readPurchaseDevice, rememberPurchaseDevice } from '@/utils/purchase-device-preference'
import ShopeeProductDetailDrawer from '../shopee-products/ShopeeProductDetailDrawer.vue'
@@ -432,8 +430,6 @@ export default {
collectionBatchData: { ruleId: null, deviceId: null },
collectionBatchRules: { ruleId: [{ required: true, message: '请选择采集规则', trigger: 'change' }] },
query: { page: 1, pageSize: 200, shopIds: [], orderCodesText: '', parseStatus: '', processStage: '', purchaseType: 'pdd', createdAtRange: [] },
exporting: false,
exportProgress: { done: 0, steps: 0 },
returnMatchByProductId: {},
returnMatchLoading: false,
returnMatchBatchLoading: false,
@@ -533,34 +529,6 @@ export default {
}
},
search() { this.query.page = 1; this.load() },
// #372: export every page of the filters as they are at click time (params are copied once);
// return matches are read per batch of product ids, never per row.
async exportExcel() {
if (this.exporting) return
const orderCodes = this.normalizedOrderCodes()
if (orderCodes === null) return
const [createdFrom = '', createdTo = ''] = this.query.createdAtRange || []
const filters = { shopIds: [...this.query.shopIds], orderCodes: orderCodes.join(','), parseStatus: this.query.parseStatus, processStage: this.query.processStage, purchaseType: this.query.purchaseType, createdFrom, createdTo }
this.exporting = true; this.exportProgress = { done: 0, steps: 0 }
try {
const result = await runListExport({
pageSize: 500, maxRows: EXPORT_MAX_ROWS, header: SYB_PRODUCT_EXPORT_HEADER, filename: 'SYB商品导出',
fetchPage: async(page, size) => { const r = await listSybProducts({ ...filters, page, pageSize: size }, { suppressErrorMessage: true }); return { items: r.data.items || [], total: r.data.total || 0 } },
enrichBatchSize: 200,
enrich: async items => {
const r = await listReturnMatches({ sybProductId: items.map(item => item.id) }, { suppressErrorMessage: true })
const byProduct = {}
for (const match of (r.data?.items || [])) if (isActiveReturnMatch(match) && !byProduct[match.sybProductId]) byProduct[match.sybProductId] = match
return items.map(item => ({ item, match: byProduct[item.id] || null }))
},
mapRow: ({ item, match }) => sybProductExportRow(item, match),
save: saveExcel,
onProgress: (done, steps) => { this.exportProgress = { done, steps } }
})
if (!result.ok) ElMessage.warning(exportFailureMessage(result, EXPORT_MAX_ROWS))
else ElMessage.success(`已导出 ${result.rows} 条;导出期间数据变化可能有少量差异`)
} catch (error) { ElMessage.error('导出失败,未生成文件') } finally { this.exporting = false }
},
reset() { this.query = { page: 1, pageSize: 200, shopIds: [], orderCodesText: '', parseStatus: '', processStage: '', purchaseType: 'pdd', createdAtRange: [] }; this.load() },
onPagination() {
// Both controls may emit after a size change clamps the old page. Coalesce
-133
View File
@@ -1,133 +0,0 @@
const { test } = require('node:test')
const assert = require('node:assert/strict')
const fs = require('node:fs')
const path = require('node:path')
const source = fs.readFileSync(path.join(__dirname, '../../src/utils/list-export.js'), 'utf8')
const lib = new Function(source.replace(/^export /gm, '') + `
return { EXPORT_MAX_ROWS, formatExportTime, formatExportStamp, centToYuan, splitYeekeVariation, purchaseExportRow, PURCHASE_EXPORT_HEADER,
sybProductExportRow, SYB_PRODUCT_EXPORT_HEADER, exportFailureMessage, runListExport }`)()
test('time and stamp use local time, empty and invalid stay empty', () => {
const date = new Date(2026, 9, 9, 8, 5, 3)
assert.equal(lib.formatExportTime(date.toISOString()), '2026-10-09 08:05:03')
assert.equal(lib.formatExportTime(null), '')
assert.equal(lib.formatExportTime(''), '')
assert.equal(lib.formatExportTime('not a date'), '')
assert.equal(lib.formatExportStamp(date), '20261009-080503')
})
test('cent to yuan keeps two decimals and leaves empty values empty', () => {
assert.equal(lib.centToYuan(12345), '123.45')
assert.equal(lib.centToYuan(5), '0.05')
assert.equal(lib.centToYuan(1000), '10.00')
assert.equal(lib.centToYuan(0), '0.00')
for (const value of [null, undefined, '']) assert.equal(lib.centToYuan(value), '')
})
test('yeeke variation splits at the first English or Chinese comma, none puts all in color', () => {
assert.deepEqual(lib.splitYeekeVariation('白色,L【建議65-75公斤】'), { color: '白色', size: 'L【建議65-75公斤】' })
assert.deepEqual(lib.splitYeekeVariation('黑色+白色,簡約,L'), { color: '黑色+白色', size: '簡約,L' })
assert.deepEqual(lib.splitYeekeVariation('均碼'), { color: '均碼', size: '' })
assert.deepEqual(lib.splitYeekeVariation(''), { color: '', size: '' })
assert.deepEqual(lib.splitYeekeVariation(undefined), { color: '', size: '' })
})
test('purchase row maps columns in order with status label, amount and blanks', () => {
assert.equal(lib.PURCHASE_EXPORT_HEADER.length, 9)
const row = lib.purchaseExportRow({
shopeeOrderNoSnapshot: '001', shopeeItemIdSnapshot: '5020', targetColorSnapshot: '白色', targetSizeSnapshot: 'L', quantity: 2,
status: 'order_created', pddOrderNo: 'PDD-1', orderSubmittedAt: new Date(2026, 9, 9, 1, 2, 3).toISOString(), pddOrderAmountCent: 3990,
receiverName: 'must not leak', address: 'must not leak'
}, value => ({ order_created: '订单已创建' })[value])
assert.deepEqual(row, ['001', '5020', '白色', 'L', 2, '订单已创建', 'PDD-1', '2026-10-09 01:02:03', '39.90'])
assert.deepEqual(lib.purchaseExportRow({ quantity: 1 }), ['', '', '', '', 1, '', '', '', ''])
assert.equal(lib.purchaseExportRow({ shopeeOrderNoSnapshot: 'A', status: 'failed', pddOrderAmountCent: null })[8], '')
})
test('syb product row uses only an active match and ignores cancelled ones', () => {
const product = { orderCode: 'O1', shopeeItemId: '99', targetColor: '白色', targetSize: 'L', quantity: 1 }
const matchedAt = new Date(2026, 9, 9, 9, 0, 0).toISOString()
assert.equal(lib.SYB_PRODUCT_EXPORT_HEADER.length, 9)
assert.deepEqual(lib.sybProductExportRow(product, { status: 'confirmed', variationName: '白色,L', yeekeQuantity: 3, matchedAt }),
['O1', '99', '白色', 'L', 1, '白色', 'L', 3, '2026-10-09 09:00:00'])
assert.deepEqual(lib.sybProductExportRow(product, { status: 'matched', variationName: '均碼', yeekeQuantity: 1, matchedAt }).slice(5, 8), ['均碼', '', 1])
assert.deepEqual(lib.sybProductExportRow(product, { status: 'cancelled', variationName: 'x', yeekeQuantity: 1, matchedAt }), ['O1', '99', '白色', 'L', 1, '', '', '', ''])
assert.deepEqual(lib.sybProductExportRow(product, null), ['O1', '99', '白色', 'L', 1, '', '', '', ''])
})
function harness(total, options = {}) {
const calls = []; const saved = []; const progress = []
const pageSize = options.pageSize || 100
const run = () => lib.runListExport({
pageSize, header: ['id'], filename: '测试', mapRow: item => [item.id],
fetchPage: async (page, size) => {
calls.push(page)
if (options.failPage === page) throw new Error('boom')
const start = (page - 1) * size
return { total, items: Array.from({ length: Math.max(0, Math.min(size, total - start)) }, (_, i) => ({ id: start + i + 1 })) }
},
save: async file => { saved.push(file) }, onProgress: (done, steps) => progress.push([done, steps]), ...options.extra
})
return { run, calls, saved, progress }
}
test('reads every page, reports progress, saves once with a timestamped name', async () => {
const h = harness(250)
const result = await h.run()
assert.deepEqual(result, { ok: true, total: 250, rows: 250 })
assert.deepEqual(h.calls, [1, 2, 3])
assert.deepEqual(h.progress, [[1, 3], [2, 3], [3, 3]])
assert.equal(h.saved.length, 1)
assert.equal(h.saved[0].data.length, 250)
assert.deepEqual(h.saved[0].data[249], [250])
assert.match(h.saved[0].filename, /^测试_\d{8}-\d{6}$/)
})
test('exactly 5000 rows are allowed, 5001 is refused after reading only page 1', async () => {
const ok = harness(5000, { pageSize: 500 })
assert.equal((await ok.run()).ok, true)
assert.equal(ok.calls.length, 10)
const over = harness(5001, { pageSize: 500 })
const result = await over.run()
assert.deepEqual(result, { ok: false, reason: 'too_many', total: 5001 })
assert.deepEqual(over.calls, [1])
assert.equal(over.saved.length, 0)
assert.equal(lib.exportFailureMessage(result), '共 5001 条,超过 5000 条上限,请缩小筛选范围')
})
test('empty result does not save', async () => {
const h = harness(0)
const result = await h.run()
assert.deepEqual(result, { ok: false, reason: 'empty', total: 0 })
assert.equal(h.saved.length, 0)
assert.match(lib.exportFailureMessage(result), /没有数据/)
})
test('a failing page stops the export without saving', async () => {
const h = harness(450, { failPage: 3 })
const result = await h.run()
assert.equal(result.ok, false)
assert.equal(result.reason, 'page_failed')
assert.equal(result.page, 3)
assert.deepEqual(h.calls, [1, 2, 3])
assert.equal(h.saved.length, 0)
assert.equal(lib.exportFailureMessage(result), '导出失败:第 3 页读取失败,未生成文件')
const first = harness(10, { failPage: 1 })
assert.equal((await first.run()).page, 1)
assert.equal(first.saved.length, 0)
})
test('enrich runs per batch (not per row), counts in progress, and a failure saves nothing', async () => {
const batches = []
const h = harness(450, { pageSize: 200, extra: { enrichBatchSize: 200, enrich: async items => { batches.push(items.length); return items.map(item => ({ ...item, id: item.id * 10 })) } } })
const result = await h.run()
assert.equal(result.ok, true)
assert.deepEqual(batches, [200, 200, 50])
assert.deepEqual(h.saved[0].data[0], [10])
assert.deepEqual(h.progress[h.progress.length - 1], [6, 6])
const bad = harness(450, { pageSize: 200, extra: { enrich: async () => { throw new Error('boom') } } })
const failed = await bad.run()
assert.equal(failed.reason, 'enrich_failed')
assert.equal(bad.saved.length, 0)
})