From 66e7ddbea02fdb97b478b6dde86ee2ffa80cdff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 24 Mar 2023 13:59:39 +0800
Subject: [PATCH] 1

---
 business/jxstore/cms/sku.go                 | 18 +++++++++++++-----
 business/partner/purchase/ebai/financial.go |  5 +++++
 business/partner/purchase/ebai/waybill.go   |  2 ++
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index e75b1b06c..a8fb5412a 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -1168,10 +1168,10 @@ func getCategoryByImg(img ...string) string {
 }
 
 // 根据平台返回的分类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)
 	if len(cats) == 0 || err != nil {
-		return jdsCategoryID, ebaiCategoryID, mtwmCategoryID
+		return jdsCategoryID, ebaiCategoryID, mtwmCategoryID, 0
 	} else {
 		if jdsCategoryID == "" && cats[0].JdsCategoryID != 0 {
 			jdsCategoryID = utils.Int64ToStr(cats[0].JdsCategoryID)
@@ -1182,8 +1182,11 @@ func getJDCategoryLoadingLocalCategoryReflex(jdCategoryId, jdsCategoryID, ebaiCa
 		if mtwmCategoryID == "" && cats[0].MtwmCategoryID != 0 {
 			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) {
@@ -1220,6 +1223,7 @@ func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, n
 		ebaiCategoryID := ""
 		mtwmCategoryID := ""
 		ddCategoryID := ""
+		jxCategoryID := 0
 		if skuNameExt != nil {
 			if skuNameExt.JdCategoryID != "" {
 				jdCategoryId = skuNameExt.JdCategoryID
@@ -1228,11 +1232,12 @@ func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, n
 			}
 
 			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 {
 				jdsCategoryID = skuNameExt.JdsCategoryID
 				ebaiCategoryID = skuNameExt.EbaiCategoryID
 				mtwmCategoryID = skuNameExt.MtwmCategoryID
+				jxCategoryID = skuNameExt.CategoryID
 			}
 
 			if skuNameExt.DdCategoryID != "" {
@@ -1257,9 +1262,12 @@ func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, n
 			if payload["mtwmCategoryID"] != nil {
 				mtwmCategoryID = payload["mtwmCategoryID"].(string)
 			}
+			if payload["categoryID2"] != nil {
+				jxCategoryID = payload["categoryID2"].(int)
+			}
 
 			if jdCategoryId != "" {
-				jdsCategoryID, ebaiCategoryID, mtwmCategoryID = getJDCategoryLoadingLocalCategoryReflex(jdCategoryId, jdsCategoryID, ebaiCategoryID, mtwmCategoryID)
+				jdsCategoryID, ebaiCategoryID, mtwmCategoryID, jxCategoryID = getJDCategoryLoadingLocalCategoryReflex(jdCategoryId, jdsCategoryID, ebaiCategoryID, mtwmCategoryID, jxCategoryID)
 			}
 
 			if payload["ddCategoryID"] != nil {
diff --git a/business/partner/purchase/ebai/financial.go b/business/partner/purchase/ebai/financial.go
index 0381d8922..3058f8f44 100644
--- a/business/partner/purchase/ebai/financial.go
+++ b/business/partner/purchase/ebai/financial.go
@@ -50,6 +50,11 @@ func (p *PurchaseHandler) onFinancialMsg(msg *ebaiapi.CallbackMsg) (response *eb
 			if err == nil {
 				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)
diff --git a/business/partner/purchase/ebai/waybill.go b/business/partner/purchase/ebai/waybill.go
index 5b7569e4e..432e9a332 100644
--- a/business/partner/purchase/ebai/waybill.go
+++ b/business/partner/purchase/ebai/waybill.go
@@ -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)
 }