From 53fca43bec82f145eec25efb85dab7d85d147051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 23 Oct 2025 16:35:49 +0800 Subject: [PATCH] 1 --- business/model/dao/invoice_dao.go | 5 ++--- business/partner/purchase/mtwm/callback.go | 12 ++++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/business/model/dao/invoice_dao.go b/business/model/dao/invoice_dao.go index c019d49af..a790048bf 100644 --- a/business/model/dao/invoice_dao.go +++ b/business/model/dao/invoice_dao.go @@ -8,10 +8,9 @@ import ( "time" ) -func GetInvoiceInfo(db *DaoDB, vendorOrderId string) (*model.InvoiceMsg, error) { - data := &model.InvoiceMsg{} +func GetInvoiceInfo(db *DaoDB, vendorOrderId string) (data *model.InvoiceMsg, err error) { sql := ` SELECT * FROM invoice_msg WHERE order_id = ? OR remark LIKE ?` - err := GetRow(db, data, sql, []interface{}{vendorOrderId, "%" + fmt.Sprintf("%s", vendorOrderId) + "%"}...) + err = GetRow(db, &data, sql, []interface{}{vendorOrderId, "%" + fmt.Sprintf("%s", vendorOrderId) + "%"}...) return data, err } diff --git a/business/partner/purchase/mtwm/callback.go b/business/partner/purchase/mtwm/callback.go index b58304687..c8b095e2a 100644 --- a/business/partner/purchase/mtwm/callback.go +++ b/business/partner/purchase/mtwm/callback.go @@ -169,15 +169,15 @@ func pushIMToGyOrPet(msg *mtwmapi.ImCallbackMsg, serverType string) { func InvoiceCallback(invoice *mtwmapi.InvoiceCallback) (err error) { var db = dao.GetDB() localOrder, _ := partner.CurOrderManager.LoadOrder(invoice.OrderId, model.VendorIDMTWM) - if localOrder == nil { - return fmt.Errorf("订单不存在:%s", invoice.OrderId) - } + //if localOrder == nil { + // return fmt.Errorf("订单不存在:%s", invoice.OrderId) + //} invoiceData, _ := dao.GetInvoiceInfo(db, invoice.OrderId) if invoiceData == nil { invoiceObj := model.InvoiceMsg{ - ModelIDCUL: model.ModelIDCUL{}, - OrderId: invoice.OrderId, - StoreID: localOrder.JxStoreID, + ModelIDCUL: model.ModelIDCUL{}, + OrderId: invoice.OrderId, + //StoreID: localOrder.JxStoreID, VendorID: model.VendorIDMTWM, Status: model.InvoiceStatusInit, InvoiceTaskId: invoice.InvoiceTaskId,