diff --git a/business/partner/purchase/mtwm/callback.go b/business/partner/purchase/mtwm/callback.go index 0fb1a34db..b58304687 100644 --- a/business/partner/purchase/mtwm/callback.go +++ b/business/partner/purchase/mtwm/callback.go @@ -181,7 +181,7 @@ func InvoiceCallback(invoice *mtwmapi.InvoiceCallback) (err error) { VendorID: model.VendorIDMTWM, Status: model.InvoiceStatusInit, InvoiceTaskId: invoice.InvoiceTaskId, - PushType: invoice.PushType, + PushType: utils.Str2Int(invoice.PushType), InvoiceTitle: invoice.InvoiceTitle, TaxpayerId: invoice.TaxpayerId, NeedInvoiceByCategory: invoice.NeedInvoiceByCategory, @@ -200,7 +200,7 @@ func InvoiceCallback(invoice *mtwmapi.InvoiceCallback) (err error) { } } else { invoiceData.InvoiceTaskId = invoice.InvoiceTaskId - invoiceData.PushType = invoice.PushType + invoiceData.PushType = utils.Str2Int(invoice.PushType) invoiceData.InvoiceTitle = invoice.InvoiceTitle invoiceData.TaxpayerId = invoice.TaxpayerId invoiceData.NeedInvoiceByCategory = invoice.NeedInvoiceByCategory diff --git a/controllers/mtwm_callback.go b/controllers/mtwm_callback.go index a3da38b35..179269d9b 100644 --- a/controllers/mtwm_callback.go +++ b/controllers/mtwm_callback.go @@ -155,16 +155,10 @@ func (c *MtwmController) Invoice() { c.ServeJSON() return } - globals.SugarLogger.Debugf("mtwm------Invoice:= %s", utils.Format4Output(msg.FormData, false)) - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "MtwmController发票推送", utils.Format4Output(msg.FormData, false)) + ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "MtwmController发票推送", utils.Format4Output(msg, false)) data := &mtwmapi.InvoiceCallback{} - byteData, _ := json.Marshal(msg.Data) - if err := json.Unmarshal(byteData, data); err != nil { - c.Data["json"] = map[string]interface{}{"result_code": -1} - c.ServeJSON() - return - } + utils.Map2StructByJson(utils.URLValues2Map(msg.FormData), data, false) // 消息通知 if err := mtwm.InvoiceCallback(data); err != nil {