From bc2b1349da61d599957581ed4048b8dc613de6a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Thu, 26 Dec 2024 14:12:37 +0800
Subject: [PATCH] 1

---
 business/jxstore/cms/sku.go        | 29 ++++++++++++++++++++++++++++-
 business/partner/delivery/rider.go |  3 +++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index e4cdc4346..3e0d24118 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -3484,6 +3484,7 @@ func GetSkuNamesNew(ctx *jxcontext.Context, keyword string, skuIDs, skuNameIDs [
 		t1.yb_name_suffix,
 		t1.jds_stock_switch,
 		t1.preparation_time,
+		t1.mt_attribute,
 		t1.best_seller
 		FROM sku_name t1
 		LEFT JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ?
@@ -3524,7 +3525,9 @@ func GetSkuNamesNew(ctx *jxcontext.Context, keyword string, skuIDs, skuNameIDs [
 		t1.yb_name_suffix,
 		t1.jds_stock_switch,
 		t1.preparation_time,
-		t1.best_seller, t2.id sku_id
+		t1.best_seller,		
+		t1.mt_attribute,
+		t2.id sku_id
 		FROM sku_name t1
 		LEFT JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ?
 		LEFT JOIN thing_map t3 ON t3.thing_id = t2.id AND t3.thing_type = ? AND t3.vendor_org_code = ? AND t3.deleted_at = ? 
@@ -3648,6 +3651,30 @@ func GetSkuNamesNew(ctx *jxcontext.Context, keyword string, skuIDs, skuNameIDs [
 					}
 					skuName.Places = placeCodes
 				}
+
+				// 京西商品库页面只获取美团属性来作为判断值,其余平台暂不获取
+				skuVendorCats, _ := dao.GetSkuVendorCategoryMaps(db, []int{skuName.ID}, []int{model.VendorIDMTWM}, nil)
+				if len(skuVendorCats) > 0 {
+					for _, v := range skuVendorCats {
+						if v.VendorID == model.VendorIDMTWM {
+							skuName.MtwmCategoryID = v.VendorCategoryID
+							break
+						}
+						//if v.VendorID == model.VendorIDJDShop {
+						//	skuName.JdsCategoryID = v.VendorCategoryID
+						//}
+						//if v.VendorID == model.VendorIDDD {
+						//	skuName.DdCategoryID = v.VendorCategoryID
+						//}
+						//if v.VendorID == model.VendorIDJD {
+						//	skuName.JdCategoryID = v.VendorCategoryID
+						//}
+						//if v.VendorID == model.VendorIDEBAI {
+						//	skuName.EbaiCategoryID = v.VendorCategoryID
+						//}
+					}
+				}
+
 				return retVal, err
 			}, skuNamesInfo.SkuNames)
 		tasksch.HandleTask(task, nil, true).Run()
diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go
index 1e464a43e..a33d8ffbc 100644
--- a/business/partner/delivery/rider.go
+++ b/business/partner/delivery/rider.go
@@ -111,6 +111,9 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
 					globals.SugarLogger.Debug("Get Order waybill rider info err FN/DADA/SFPS :%v", err)
 					continue
 				}
+				if riderInfo.CourierPhone != "" && riderInfo.CourierName != "" && strings.Contains(riderInfo.LogisticsContext, "%s") {
+					riderInfo.LogisticsContext = fmt.Sprintf(riderInfo.LogisticsContext, riderInfo.CourierPhone, riderInfo.CourierName)
+				}
 			} else if v.WaybillVendorID == model.VendorIDMTPS {
 				if v.VendorWaybillID != "" {
 					riderInfo, err = handlerInfo.Handler.GetRiderInfo(v.VendorOrderID, v.ID+1000000, v.VendorWaybillID)