From 686154836dc45d3e6d007ce3acd2e1dd83014967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 13 Aug 2025 10:12:58 +0800 Subject: [PATCH] 1 --- business/partner/purchase/mtwm/callback.go | 18 ++++++++++++++++-- controllers/mtwm_callback.go | 2 +- globals/beegodb/beegodb.go | 1 + 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/business/partner/purchase/mtwm/callback.go b/business/partner/purchase/mtwm/callback.go index caf7356c0..62457c0a7 100644 --- a/business/partner/purchase/mtwm/callback.go +++ b/business/partner/purchase/mtwm/callback.go @@ -135,11 +135,12 @@ 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) } - invoiceData, _ := dao.GetInvoiceInfo(dao.GetDB(), invoice.OrderId) + invoiceData, _ := dao.GetInvoiceInfo(db, invoice.OrderId) if invoiceData == nil { invoiceObj := model.InvoiceMsg{ ModelIDCUL: model.ModelIDCUL{}, @@ -161,9 +162,22 @@ func InvoiceCallback(invoice *mtwmapi.InvoiceCallback) (err error) { InvoiceId: "", } dao.WrapAddIDCULEntity(invoiceObj, "system") - if err = dao.CreateEntity(dao.GetDB(), invoiceObj); err != nil { + if err = dao.CreateEntity(db, invoiceObj); err != nil { return err } + } else { + invoiceData.InvoiceTaskId = invoice.InvoiceTaskId + invoiceData.PushType = invoice.PushType + invoiceData.InvoiceTitle = invoice.InvoiceTitle + invoiceData.TaxpayerId = invoice.TaxpayerId + invoiceData.NeedInvoiceByCategory = invoice.NeedInvoiceByCategory + invoiceData.CompanyAddress = invoice.CompanyAddress + invoiceData.CompanyPhone = invoice.CompanyPhone + invoiceData.AccountBank = invoice.AccountBank + invoiceData.AccountNumber = invoice.AccountNumber + invoiceData.Email = invoice.Email + invoiceData.InvoiceAmount = invoice.ItemTotalInvoiceAmount + dao.UpdateEntity(db, invoiceData) } content2 := fmt.Sprintf("订单:%s,用户申请发票,请老板提供发票信息!", localOrder.VendorOrderID) diff --git a/controllers/mtwm_callback.go b/controllers/mtwm_callback.go index f068396cb..c7c3ea03d 100644 --- a/controllers/mtwm_callback.go +++ b/controllers/mtwm_callback.go @@ -148,7 +148,7 @@ func (c *MtwmController) Invoice() { c.ServeJSON() return } - globals.SugarLogger.Debugf("------body:= %s", string(body)) + globals.SugarLogger.Debugf("------Invoice:= %s", string(body)) data := &mtwmapi.InvoiceCallback{} if err = json.Unmarshal(body, data); err != nil { diff --git a/globals/beegodb/beegodb.go b/globals/beegodb/beegodb.go index a7e02bc01..567c7ba6c 100644 --- a/globals/beegodb/beegodb.go +++ b/globals/beegodb/beegodb.go @@ -139,6 +139,7 @@ func Init() { orm.RegisterModel(&model.LakalaRecipient{}) orm.RegisterModel(&model.LakalaSeparateAmt{}) orm.RegisterModel(&model.LakalaWithdrawal{}) + orm.RegisterModel(&model.InvoiceMsg{}) //发送图文消息公众号 orm.RegisterModel(&model.KnowledgeDepot{})