liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2023-03-24 13:59:39 +08:00
parent 3872e92562
commit 66e7ddbea0
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
business/jxstore/cms/sku.go
View File

@@ -1168,10 +1168,10 @@ func getCategoryByImg(img ...string) string {
} }
// 根据平台返回的分类id,获取本地绑定的映射分类id // 根据平台返回的分类id,获取本地绑定的映射分类id
func getJDCategoryLoadingLocalCategoryReflex(jdCategoryId, jdsCategoryID, ebaiCategoryID, mtwmCategoryID string) (string, string, string) { func getJDCategoryLoadingLocalCategoryReflex(jdCategoryId, jdsCategoryID, ebaiCategoryID, mtwmCategoryID string, jxCategoryId int) (string, string, string, int) {
cats, err := dao.GetCategoriesByName(dao.GetDB(), "", jdCategoryId) cats, err := dao.GetCategoriesByName(dao.GetDB(), "", jdCategoryId)
if len(cats) == 0 || err != nil { if len(cats) == 0 || err != nil {
return jdsCategoryID, ebaiCategoryID, mtwmCategoryID return jdsCategoryID, ebaiCategoryID, mtwmCategoryID, 0
} else { } else {
if jdsCategoryID == "" && cats[0].JdsCategoryID != 0 { if jdsCategoryID == "" && cats[0].JdsCategoryID != 0 {
jdsCategoryID = utils.Int64ToStr(cats[0].JdsCategoryID) jdsCategoryID = utils.Int64ToStr(cats[0].JdsCategoryID)
@@ -1182,8 +1182,11 @@ func getJDCategoryLoadingLocalCategoryReflex(jdCategoryId, jdsCategoryID, ebaiCa
if mtwmCategoryID == "" && cats[0].MtwmCategoryID != 0 { if mtwmCategoryID == "" && cats[0].MtwmCategoryID != 0 {
mtwmCategoryID = utils.Int64ToStr(cats[0].MtwmCategoryID) mtwmCategoryID = utils.Int64ToStr(cats[0].MtwmCategoryID)
} }
if jxCategoryId == 0 {
jxCategoryId = cats[0].ID
}
} }
return jdsCategoryID, ebaiCategoryID, mtwmCategoryID return jdsCategoryID, ebaiCategoryID, mtwmCategoryID, jxCategoryId
} }
func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, nameID int, payload map[string]interface{}, skuNameExt *model.SkuNameExt, isDelete bool) (flag bool) { func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, nameID int, payload map[string]interface{}, skuNameExt *model.SkuNameExt, isDelete bool) (flag bool) {
@@ -1220,6 +1223,7 @@ func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, n
ebaiCategoryID := "" ebaiCategoryID := ""
mtwmCategoryID := "" mtwmCategoryID := ""
ddCategoryID := "" ddCategoryID := ""
jxCategoryID := 0
if skuNameExt != nil { if skuNameExt != nil {
if skuNameExt.JdCategoryID != "" { if skuNameExt.JdCategoryID != "" {
jdCategoryId = skuNameExt.JdCategoryID jdCategoryId = skuNameExt.JdCategoryID
@@ -1228,11 +1232,12 @@ func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, n
} }
if jdCategoryId != "" && jdCategoryId != "0" { if jdCategoryId != "" && jdCategoryId != "0" {
jdsCategoryID, ebaiCategoryID, mtwmCategoryID = getJDCategoryLoadingLocalCategoryReflex(jdCategoryId, skuNameExt.JdsCategoryID, skuNameExt.EbaiCategoryID, skuNameExt.MtwmCategoryID) jdsCategoryID, ebaiCategoryID, mtwmCategoryID, jxCategoryID = getJDCategoryLoadingLocalCategoryReflex(jdCategoryId, skuNameExt.JdsCategoryID, skuNameExt.EbaiCategoryID, skuNameExt.MtwmCategoryID, skuNameExt.CategoryID)
} else { } else {
jdsCategoryID = skuNameExt.JdsCategoryID jdsCategoryID = skuNameExt.JdsCategoryID
ebaiCategoryID = skuNameExt.EbaiCategoryID ebaiCategoryID = skuNameExt.EbaiCategoryID
mtwmCategoryID = skuNameExt.MtwmCategoryID mtwmCategoryID = skuNameExt.MtwmCategoryID
jxCategoryID = skuNameExt.CategoryID
} }
if skuNameExt.DdCategoryID != "" { if skuNameExt.DdCategoryID != "" {
@@ -1257,9 +1262,12 @@ func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, n
if payload["mtwmCategoryID"] != nil { if payload["mtwmCategoryID"] != nil {
mtwmCategoryID = payload["mtwmCategoryID"].(string) mtwmCategoryID = payload["mtwmCategoryID"].(string)
} }
if payload["categoryID2"] != nil {
jxCategoryID = payload["categoryID2"].(int)
}
if jdCategoryId != "" { if jdCategoryId != "" {
jdsCategoryID, ebaiCategoryID, mtwmCategoryID = getJDCategoryLoadingLocalCategoryReflex(jdCategoryId, jdsCategoryID, ebaiCategoryID, mtwmCategoryID) jdsCategoryID, ebaiCategoryID, mtwmCategoryID, jxCategoryID = getJDCategoryLoadingLocalCategoryReflex(jdCategoryId, jdsCategoryID, ebaiCategoryID, mtwmCategoryID, jxCategoryID)
} }
if payload["ddCategoryID"] != nil { if payload["ddCategoryID"] != nil {

5
business/partner/purchase/ebai/financial.go
View File

@@ -50,6 +50,11 @@ func (p *PurchaseHandler) onFinancialMsg(msg *ebaiapi.CallbackMsg) (response *eb
if err == nil { if err == nil {
err = CurPurchaseHandler.OnOrderDetail(orderMap, partner.UpdatedPeration) err = CurPurchaseHandler.OnOrderDetail(orderMap, partner.UpdatedPeration)
} }
// 部分订单在隐私条约的保护下会隐藏用户收货地址,转自送成功自后才可以获取到正确的地址.
userMap := orderMap["user"].(map[string]interface{})
order, _ := partner.CurOrderManager.LoadOrder(vendorOrderID, model.VendorIDEBAI)
order.ConsigneeAddress = utils.Interface2String(userMap["address"])
partner.CurOrderManager.UpdateOrderFields(order, []string{"ConsigneeMobile"})
} }
} }
return api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, msg.Cmd) return api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, msg.Cmd)

2
business/partner/purchase/ebai/waybill.go
View File

@@ -67,6 +67,8 @@ func (c *PurchaseHandler) onWaybillMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiap
} }
}) })
} }
vendorStatus := utils.Int64ToStr(utils.MustInterface2Int64(msg.Body["status"]))
return api.EbaiAPI.Err2CallbackResponse(msg.Cmd, partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus) return api.EbaiAPI.Err2CallbackResponse(msg.Cmd, partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus)
} }