From e42d99b8b8d4d2cc6bf9f63a78f66a39095c2af8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Wed, 9 Nov 2022 15:44:04 +0800
Subject: [PATCH] 1

---
 business/model/dao/thing_map.go               |  4 ++++
 business/partner/delivery/rider.go            |  8 +++----
 .../purchase/tiktok_store/store_sku2.go       | 22 +++++++++----------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/business/model/dao/thing_map.go b/business/model/dao/thing_map.go
index fee17da2e..67875ba97 100644
--- a/business/model/dao/thing_map.go
+++ b/business/model/dao/thing_map.go
@@ -37,6 +37,10 @@ func CreateThingMap(thingId int64, vendorThingID, appOrgCode, skuAttrId string)
 		Remark:        skuAttrId,
 		SyncStatus:    0,
 	}
+	// 正常来说这个skuAttrId 不应该为空
+	if skuAttrId == "" {
+		thingMap.Remark = "这个值不应该为空才对"
+	}
 
 	WrapAddIDCULDEntity(thingMap, "jxadmin")
 	return CreateEntity(GetDB(), thingMap)
diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go
index 002c8b9d7..c00617bd4 100644
--- a/business/partner/delivery/rider.go
+++ b/business/partner/delivery/rider.go
@@ -171,8 +171,6 @@ func PullTiktokRiderInfo(riderInfo *mtpsapi.RiderInfo) {
 		riderInfo.LogisticsStatus = 40
 		riderInfo.OpCode = tiktok_api.TiktokLogisticsDELIVERED
 	case 115: // 取消
-		riderInfo.CourierName = ""
-		riderInfo.CourierPhone = ""
 		riderInfo.LogisticsStatus = 100
 		riderInfo.OpCode = tiktok_api.TiktokLogisticsCANCELDELIVERY
 	case 22, 0, 120: // 异常配送
@@ -181,14 +179,14 @@ func PullTiktokRiderInfo(riderInfo *mtpsapi.RiderInfo) {
 	}
 
 	if riderInfo.CourierPhone == "" {
-		riderInfo.CourierPhone = "18981810000"
+		riderInfo.CourierPhone = " 暂无电话 "
 	}
 	if riderInfo.CourierName == "" {
-		riderInfo.CourierName = "暂无"
+		riderInfo.CourierName = " 暂无骑手 "
 	}
 
 	if riderInfo.LogisticsStatus != 22 && riderInfo.LogisticsStatus != 120 && riderInfo.LogisticsStatus != 0 {
-		riderInfo.LogisticsContext += fmt.Sprintf(riderInfo.LogisticsContext, riderInfo.CourierName, riderInfo.CourierPhone)
+		riderInfo.LogisticsContext = fmt.Sprintf(riderInfo.LogisticsContext, riderInfo.CourierName, riderInfo.CourierPhone)
 	}
 
 	// 呼叫骑手的时候推送发货
diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go
index 82b009442..a7cd0563c 100644
--- a/business/partner/purchase/tiktok_store/store_sku2.go
+++ b/business/partner/purchase/tiktok_store/store_sku2.go
@@ -281,17 +281,17 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr
 func (p *PurchaseHandler) UpdateStoreSkusPrice(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
 	api := getAPI(vendorOrgCode, storeID, vendorStoreID)
 	for _, v := range storeSkuList {
-		// 更新主品
-		err = api.EditPrice(&sku_editPrice_request.SkuEditPriceParam{
-			Price:     v.VendorPrice,
-			SkuId:     utils.Str2Int64(v.VendorSkuAttrId),
-			ProductId: utils.Str2Int64(v.VendorMainId),
-		})
-		if err != nil {
-			failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "更新主品价格异常")...)
-		} else {
-			failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "更新主品价格正常")...)
-		}
+		// 更新主品 (暂不支持渠道主商品)
+		//err = api.EditPrice(&sku_editPrice_request.SkuEditPriceParam{
+		//	Price:     v.VendorPrice,
+		//	SkuId:     utils.Str2Int64(v.VendorSkuAttrId),
+		//	ProductId: utils.Str2Int64(v.VendorMainId),
+		//})
+		//if err != nil {
+		//	failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "更新主品价格异常")...)
+		//} else {
+		//	failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "更新主品价格正常")...)
+		//}
 
 		// 更新子品
 		err = api.EditPrice(&sku_editPrice_request.SkuEditPriceParam{