1
This commit is contained in:
@@ -47,15 +47,15 @@ func (p *PurchaseHandler) InvoiceApply(msg *ebaiapi.CallbackMsg) (response *ebai
|
|||||||
if err := utils.Map2StructByJson(msg.Body, invoice, false); err != nil {
|
if err := utils.Map2StructByJson(msg.Body, invoice, false); err != nil {
|
||||||
return api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, msg.Cmd)
|
return api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, msg.Cmd)
|
||||||
}
|
}
|
||||||
orderId = utils.Int64ToStr(invoice.OrderList[0].OrderId)
|
orderId = invoice.OrderList[0].OrderId
|
||||||
invoiceData, _ := dao.GetInvoiceInfo(db, utils.Int64ToStr(invoice.OrderList[0].OrderId))
|
invoiceData, _ := dao.GetInvoiceInfo(db, orderId)
|
||||||
applyNo = invoice.ApplicationNo
|
applyNo = invoice.ApplicationNo
|
||||||
storeId = invoice.ShopId
|
storeId = invoice.ShopId
|
||||||
vendorStoreId = invoice.BaiduShopId
|
vendorStoreId = invoice.BaiduShopId
|
||||||
if invoiceData == nil {
|
if invoiceData == nil {
|
||||||
invoiceObj := model.InvoiceMsg{
|
invoiceObj := &model.InvoiceMsg{
|
||||||
ModelIDCUL: model.ModelIDCUL{},
|
ModelIDCUL: model.ModelIDCUL{},
|
||||||
OrderId: utils.Int64ToStr(invoice.OrderList[0].OrderId),
|
OrderId: orderId,
|
||||||
StoreID: utils.Str2Int(invoice.ShopId),
|
StoreID: utils.Str2Int(invoice.ShopId),
|
||||||
VendorID: model.VendorIDEBAI,
|
VendorID: model.VendorIDEBAI,
|
||||||
InvoiceTaskId: invoice.ApplicationNo,
|
InvoiceTaskId: invoice.ApplicationNo,
|
||||||
@@ -74,7 +74,7 @@ func (p *PurchaseHandler) InvoiceApply(msg *ebaiapi.CallbackMsg) (response *ebai
|
|||||||
InvoiceId: "",
|
InvoiceId: "",
|
||||||
}
|
}
|
||||||
if len(invoice.OrderList) > 1 {
|
if len(invoice.OrderList) > 1 {
|
||||||
orderList := make(map[int64]float64, 0)
|
orderList := make(map[string]float64, 0)
|
||||||
for _, v := range invoice.OrderList {
|
for _, v := range invoice.OrderList {
|
||||||
orderList[v.OrderId] = v.InvoiceAmount
|
orderList[v.OrderId] = v.InvoiceAmount
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -932,7 +932,7 @@ func BathUpdateInvoiceSetting(baiDuStoreId string, setting *ebaiapi.StoreInvoice
|
|||||||
}
|
}
|
||||||
|
|
||||||
// QueryUnansweredInvoice 查询门店未回复发票信息
|
// QueryUnansweredInvoice 查询门店未回复发票信息
|
||||||
func QueryUnansweredInvoice(baiDuStoreId string, jxStoreId int) (*ebaiapi.QueryUnansweredInvoiceResult, error) {
|
func QueryUnansweredInvoice(baiDuStoreId string, jxStoreId int) (*ebaiapi.QueryUnansweredInvoiceResult2, error) {
|
||||||
var db = dao.GetDB()
|
var db = dao.GetDB()
|
||||||
unansweredList, err := api.EbaiAPI.QueryUnansweredInvoice(baiDuStoreId)
|
unansweredList, err := api.EbaiAPI.QueryUnansweredInvoice(baiDuStoreId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -950,7 +950,7 @@ func QueryUnansweredInvoice(baiDuStoreId string, jxStoreId int) (*ebaiapi.QueryU
|
|||||||
invoiceDataMap[unansweredList.RecordList[i].ApplicationNo].Status = model.InvoiceStatusInit
|
invoiceDataMap[unansweredList.RecordList[i].ApplicationNo].Status = model.InvoiceStatusInit
|
||||||
dao.UpdateEntity(db, invoiceDataMap[unansweredList.RecordList[i].ApplicationNo], "Status")
|
dao.UpdateEntity(db, invoiceDataMap[unansweredList.RecordList[i].ApplicationNo], "Status")
|
||||||
} else {
|
} else {
|
||||||
invoiceObj := model.InvoiceMsg{
|
invoiceObj := &model.InvoiceMsg{
|
||||||
ModelIDCUL: model.ModelIDCUL{},
|
ModelIDCUL: model.ModelIDCUL{},
|
||||||
OrderId: utils.Int64ToStr(unansweredList.RecordList[i].OrderList[0].OrderId),
|
OrderId: utils.Int64ToStr(unansweredList.RecordList[i].OrderList[0].OrderId),
|
||||||
StoreID: utils.Str2Int(unansweredList.RecordList[i].ShopId),
|
StoreID: utils.Str2Int(unansweredList.RecordList[i].ShopId),
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ func Init() {
|
|||||||
//orm.RegisterDataBase("default", "mysql", web.AppConfig.DefaultString("dbConnectStr", ""))
|
//orm.RegisterDataBase("default", "mysql", web.AppConfig.DefaultString("dbConnectStr", ""))
|
||||||
//orm.RegisterDataBase("c4beta", "mysql", "ubuntu:WebServer@1@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true")
|
//orm.RegisterDataBase("c4beta", "mysql", "ubuntu:WebServer@1@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true")
|
||||||
//orm.RegisterDataBase("api", "mysql", "root:WebServer@1@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true")
|
//orm.RegisterDataBase("api", "mysql", "root:WebServer@1@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true")
|
||||||
|
|
||||||
// 开启sql打印
|
// 开启sql打印
|
||||||
//orm.Debug = true
|
//orm.Debug = true
|
||||||
orm.RegisterModel(&model.SupermarketSign{})
|
orm.RegisterModel(&model.SupermarketSign{})
|
||||||
|
|||||||
Reference in New Issue
Block a user