diff --git a/business/jxstore/cms/system_store_sku.go b/business/jxstore/cms/system_store_sku.go index 92e2109a3..932f37e91 100644 --- a/business/jxstore/cms/system_store_sku.go +++ b/business/jxstore/cms/system_store_sku.go @@ -194,7 +194,7 @@ func BatchInitSkuEBai2EBai(ctx *jxcontext.Context, fromSku []*ebaiapi.SkuInfo, t if customSkuID == "" { customSkuID = utils.Int64ToStr(storeSku.SkuId) } - _, err := toApi.SkuCreate(ctx.GetTrackInfo(), storeID, utils.Str2Int64(storeSku.CustomSkuID), params) + _, err := toApi.SkuCreate(ctx.GetTrackInfo(), storeID, storeSku.CustomSkuID, params) if err != nil { errList = append(errList, err) } diff --git a/business/partner/purchase/ebai/im.go b/business/partner/purchase/ebai/im.go index ae1ce468e..b26097fc2 100644 --- a/business/partner/purchase/ebai/im.go +++ b/business/partner/purchase/ebai/im.go @@ -52,11 +52,13 @@ func (p *PurchaseHandler) InvoiceApply(msg *ebaiapi.CallbackMsg) (response *ebai applyNo = invoice.ApplicationNo storeId = invoice.ShopId vendorStoreId = invoice.BaiduShopId + localOrder, _ := partner.CurOrderManager.LoadOrder(orderId, model.VendorIDEBAI) + if invoiceData == nil { invoiceObj := &model.InvoiceMsg{ ModelIDCUL: model.ModelIDCUL{}, OrderId: orderId, - StoreID: utils.Str2Int(invoice.ShopId), + StoreID: localOrder.JxStoreID, VendorID: model.VendorIDEBAI, InvoiceTaskId: invoice.ApplicationNo, Status: invoice.Status, diff --git a/business/partner/purchase/ebai/store_sku2.go b/business/partner/purchase/ebai/store_sku2.go index aa8857a17..c51c1bfe2 100644 --- a/business/partner/purchase/ebai/store_sku2.go +++ b/business/partner/purchase/ebai/store_sku2.go @@ -270,18 +270,18 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v var ( vendorSkuID int64 isExd bool = false - customSkuID int64 + customSkuID string ) if strings.Contains(storeSku.StoreName, model.ExdStoreName) { isExd = true if storeSku.ExdSkuID == "" { - customSkuID = 0 + customSkuID = "" } else { - customSkuID = utils.Str2Int64(storeSku.ExdSkuID) + customSkuID = storeSku.ExdSkuID } } else { isExd = false - customSkuID = int64(storeSku.SkuID) + customSkuID = utils.Int2Str(storeSku.SkuID) } params := genSkuParamsFromStoreSkuInfo2(storeSku, true, true) diff --git a/business/partner/purchase/mtwm/order_afs.go b/business/partner/purchase/mtwm/order_afs.go index 405e72dd2..7efc4ea76 100644 --- a/business/partner/purchase/mtwm/order_afs.go +++ b/business/partner/purchase/mtwm/order_afs.go @@ -47,7 +47,6 @@ func init() { // 单协程串行处理所有售后消息,天然有序,无并发冲突 go func() { for msg := range globalAfsChan { - globals.SugarLogger.Debugf("--------33 := %s", utils.Format4Output(msg, false)) jxutils.CallMsgHandlerAsync(func() { _ = CurPurchaseHandler.onAfsOrderMsg(msg) }, jxutils.ComposeUniversalOrderID(GetOrderIDFromMsg(msg), model.VendorIDMTWM))