yml/affiliate_dash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

统一订单单状态模型

Browse Source
This commit is contained in:
yml2213
2026-07-31 17:02:19 +08:00
parent 677bdbbc1c
commit 04130e5ec8
19 changed files with 300 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/service/delivery_test.go
+4 -4
View File
@@ -216,15 +216,15 @@ func TestDeliveryMerchantApiBindAndSubmit(t *testing.T) {
if err != nil {
t.Fatalf("submit for merchant: %v", err)
}
if submitted.Status != model.FulfillmentStatusProcessing || submitted.ProviderOrderNo != "provider-1" {
if submitted.Status != model.OrderStatusDelivering || submitted.ProviderOrderNo != "provider-1" {
t.Fatalf("unexpected submit result: %+v", submitted)
}
var afterSubmit model.FulfillmentOrder
if err := db.Where("order_no = ?", created.Order.OrderNo).First(&afterSubmit).Error; err != nil {
t.Fatalf("reload after submit: %v", err)
}
if afterSubmit.FulfillmentStatus != model.FulfillmentStatusProcessing || afterSubmit.ProviderOrderNo != "provider-1" {
t.Fatalf("submit should persist processing state: %+v", afterSubmit)
if afterSubmit.OrderStatus != model.OrderStatusDelivering || afterSubmit.ProviderOrderNo != "provider-1" {
t.Fatalf("submit should persist delivering state: %+v", afterSubmit)
}
if atomic.LoadInt32(&queueCreateCalls) != 1 || atomic.LoadInt32(&upstreamCalls) != 1 {
t.Fatalf("first submit should only create one queue, queue=%d upstream=%d requests=%v", queueCreateCalls, upstreamCalls, requestLog)
@@ -233,7 +233,7 @@ func TestDeliveryMerchantApiBindAndSubmit(t *testing.T) {
if err != nil {
t.Fatalf("repeat submit for merchant: %v", err)
}
if second.ProviderOrderNo != "provider-1" || second.Status != model.FulfillmentStatusProcessing {
if second.ProviderOrderNo != "provider-1" || second.Status != model.OrderStatusDelivering {
t.Fatalf("repeat submit should reuse existing result: %+v", second)
}
if atomic.LoadInt32(&queueCreateCalls) != 1 || atomic.LoadInt32(&upstreamCalls) != 1 {