This commit is contained in:
邹宗楠
2025-10-23 16:35:49 +08:00
parent 297bdd950d
commit 53fca43bec
2 changed files with 8 additions and 9 deletions

View File

@@ -8,10 +8,9 @@ import (
"time" "time"
) )
func GetInvoiceInfo(db *DaoDB, vendorOrderId string) (*model.InvoiceMsg, error) { func GetInvoiceInfo(db *DaoDB, vendorOrderId string) (data *model.InvoiceMsg, err error) {
data := &model.InvoiceMsg{}
sql := ` SELECT * FROM invoice_msg WHERE order_id = ? OR remark LIKE ?` 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 return data, err
} }

View File

@@ -169,15 +169,15 @@ func pushIMToGyOrPet(msg *mtwmapi.ImCallbackMsg, serverType string) {
func InvoiceCallback(invoice *mtwmapi.InvoiceCallback) (err error) { func InvoiceCallback(invoice *mtwmapi.InvoiceCallback) (err error) {
var db = dao.GetDB() var db = dao.GetDB()
localOrder, _ := partner.CurOrderManager.LoadOrder(invoice.OrderId, model.VendorIDMTWM) localOrder, _ := partner.CurOrderManager.LoadOrder(invoice.OrderId, model.VendorIDMTWM)
if localOrder == nil { //if localOrder == nil {
return fmt.Errorf("订单不存在:%s", invoice.OrderId) // return fmt.Errorf("订单不存在:%s", invoice.OrderId)
} //}
invoiceData, _ := dao.GetInvoiceInfo(db, invoice.OrderId) invoiceData, _ := dao.GetInvoiceInfo(db, invoice.OrderId)
if invoiceData == nil { if invoiceData == nil {
invoiceObj := model.InvoiceMsg{ invoiceObj := model.InvoiceMsg{
ModelIDCUL: model.ModelIDCUL{}, ModelIDCUL: model.ModelIDCUL{},
OrderId: invoice.OrderId, OrderId: invoice.OrderId,
StoreID: localOrder.JxStoreID, //StoreID: localOrder.JxStoreID,
VendorID: model.VendorIDMTWM, VendorID: model.VendorIDMTWM,
Status: model.InvoiceStatusInit, Status: model.InvoiceStatusInit,
InvoiceTaskId: invoice.InvoiceTaskId, InvoiceTaskId: invoice.InvoiceTaskId,