Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

business/jxstore/cms/sku.go

@@ -644,7 +644,8 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, isBySku, isQueryMidPric
 		t1.yb_name_suffix,
 		t1.jds_stock_switch,
 		t1.preparation_time,
-		t1.best_seller
+		t1.best_seller,
+		t1.tiktok_attribute
 		`
 	if isBySku {
 		sqlData += " ,t2.id sku_id"

business/partner/purchase/mtwm/store_sku2.go

@@ -160,10 +160,14 @@ func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID in
 			SecondaryCategoryName: subCatName,
 			Sequence:              storeCat.Seq,
 		}
+		globals.SugarLogger.Debugf("========RetailCatUpdate:%s", utils.Format4Output(param4Update, false))
 		err = getAPI(storeCat.VendorOrgCode, storeID, vendorStoreID).RetailCatUpdate(vendorStoreID, catName, param4Update)
+		globals.SugarLogger.Debugf("========err1:%s", err)
 		if storeCat.CatSyncStatus&model.SyncFlagNewMask == 0 && p.IsErrCategoryNotExist(err) && originName != "" { // 修改分类名，但分类不存在
 			storeCat.CatSyncStatus |= model.SyncFlagNewMask
+			globals.SugarLogger.Debugf("========storeCat==err!=nil:%s", utils.Format4Output(storeCat, false))
 			err = p.CreateStoreCategory(ctx, storeID, vendorStoreID, storeCat)
+			globals.SugarLogger.Debugf("========err2:%s", err)
 		}
 	}
 	if err == nil {