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 00:03:29 +08:00
parent ee956e2e01
commit fe71276e62
5 changed files with 5 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/service/fulfillment.go
-44
View File
@@ -181,14 +181,6 @@ func (s *FulfillmentService) CreateOrder(in CreateFulfillmentOrderInput) (*Creat
return err
}
}
if err := tx.Create(&model.FulfillmentJob{
MerchantID: in.MerchantID,
OrderID: order.ID,
Status: model.FulfillmentJobStatusPending,
NextRunAt: time.Now(),
}).Error; err != nil {
return err
}
if err := writeAudit(tx, &in.MerchantID, nil, &in.APIClientID, "open_order.create", "fulfillment_order", order.OrderNo, map[string]interface{}{"client_order_no": in.ClientOrderNo, "sku": in.SKU}); err != nil {
return err
}
@@ -415,20 +407,6 @@ func (s *FulfillmentService) UpdateFulfillment(in FulfillmentUpdateInput) (*mode
if err := tx.Model(&order).Updates(updates).Error; err != nil {
return err
}
jobStatus := model.FulfillmentJobStatusProcessing
if in.Status == model.FulfillmentStatusSucceeded {
jobStatus = model.FulfillmentJobStatusSucceeded
} else if in.Status == model.FulfillmentStatusFailed {
jobStatus = model.FulfillmentJobStatusFailed
}
if err := tx.Model(&model.FulfillmentJob{}).Where("order_id = ?", order.ID).Updates(map[string]interface{}{
"status": jobStatus,
"provider_order_no": in.ProviderOrderNo,
"result_payload": resultData,
"last_error": in.FailureReason,
}).Error; err != nil {
return err
}
if err := tx.First(&out, order.ID).Error; err != nil {
return err
}
@@ -509,12 +487,6 @@ func (s *FulfillmentService) CancelOrder(merchantID, apiClientID uint, orderNo,
return err
}
}
if err := tx.Model(&model.FulfillmentJob{}).Where("order_id = ?", order.ID).Updates(map[string]interface{}{
"status": model.FulfillmentJobStatusFailed,
"last_error": "订单已取消",
}).Error; err != nil {
return err
}
if err := tx.First(&out, order.ID).Error; err != nil {
return err
}
@@ -941,22 +913,6 @@ func (s *FulfillmentService) HandleShipNotify(in ShipNotifyInput) (*ShipNotifyRe
return err
}
jobStatus := model.FulfillmentJobStatusFailed
if nextStatus == model.FulfillmentStatusSucceeded {
jobStatus = model.FulfillmentJobStatusSucceeded
}
jobUpdates := map[string]interface{}{
"status": jobStatus,
"result_payload": resultData,
"last_error": in.FailReason,
}
if in.ProviderOrderNo != "" {
jobUpdates["provider_order_no"] = in.ProviderOrderNo
}
if err := tx.Model(&model.FulfillmentJob{}).Where("order_id = ?", order.ID).Updates(jobUpdates).Error; err != nil {
return err
}
if err := writeAudit(tx, &order.MerchantID, nil, nil, "ship.notify", "fulfillment_order", order.OrderNo,
shipNotifyAuditMetadata(in, nextStatus, message)); err != nil {
return err