fix(delivery): 硬化自动发货可靠性,避免双发与无限 Webhook 重试

恢复 ship_failed 可重试 UI;DLC 断点续传 queue;乐玩未绑定禁止进 delivering;Webhook 原子 nonce 与业务拒绝回 200。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
yml2213
2026-09-14 20:13:29 +08:00
co-authored by Cursor
parent df1a170d44
commit c2d8228512
10 changed files with 235 additions and 29 deletions
@@ -1,6 +1,7 @@
package service
import (
"bytes"
"encoding/json"
"strconv"
"strings"
@@ -62,6 +63,40 @@ func mergeResultData(existing string, patch map[string]interface{}) string {
return string(raw)
}
// encodeFulfillmentResultData 写入 result_data:已是 JSON 对象/数组字符串时不再二次 Marshal,避免双重编码。
func encodeFulfillmentResultData(v interface{}) (string, error) {
switch t := v.(type) {
case nil:
return "", nil
case string:
trimmed := strings.TrimSpace(t)
if trimmed == "" {
return "", nil
}
if json.Valid([]byte(trimmed)) && (strings.HasPrefix(trimmed, "{") || strings.HasPrefix(trimmed, "[")) {
return trimmed, nil
}
raw, err := json.Marshal(t)
return string(raw), err
case []byte:
trimmed := bytes.TrimSpace(t)
if len(trimmed) == 0 {
return "", nil
}
if json.Valid(trimmed) && (trimmed[0] == '{' || trimmed[0] == '[') {
return string(trimmed), nil
}
raw, err := json.Marshal(t)
return string(raw), err
default:
raw, err := json.Marshal(v)
if err != nil {
return "", err
}
return string(raw), nil
}
}
func resultDataMap(raw string) map[string]interface{} {
m := map[string]interface{}{}
if raw == "" {