1

2023-01-09 13:52:27 +08:00
parent c4223bbf96 f5f8b03e9b
commit a3e6bedabd
17 changed files with 623 additions and 235 deletions
--- a/platformapi/jdapi/jdapi_test.go
+++ b/platformapi/jdapi/jdapi_test.go
@@ -25,13 +25,13 @@ func init() {
 	// sandbox
 	// api = New("594ab45a-9a73-4a43-82b0-a64cbd55d883", "06692746f7224695ad4788ce340bc854", "d6b42a35a7414a5490d811654d745c84")
 	// prod
-	api = New("73e2e9f6-b21e-4dcd-8c92-71e4e100b07e", "1dba76d40cac446ca500c0391a0b6c9d", "a88d031a1e7b462cb1579f12e97fe7f4")
+	// api = New("73e2e9f6-b21e-4dcd-8c92-71e4e100b07e", "1dba76d40cac446ca500c0391a0b6c9d", "a88d031a1e7b462cb1579f12e97fe7f4")
 	// 天天果园
 	//api = New("c45e6510-00ba-4be2-977e-bcb9c9792cc7", "5d5577a2506f41b8b4ec520ba83490f5", "0b01b9eeb15b41dab1c3d05d95c17a26")
 	// 京东果园
 	//api = New("b1138139-9610-4b80-9a63-a63da4773885", "5d5577a2506f41b8b4ec520ba83490f5", "0b01b9eeb15b41dab1c3d05d95c17a26")
 	// 果切
-	//api = New("0e12f461-2e6b-49ca-bce6-935c6672362d", "f2ed33075faf4773a47e065acd79532b", "aed14cbbecac4456843570e90c5f46ec")
+	api = New("0e12f461-2e6b-49ca-bce6-935c6672362d", "f2ed33075faf4773a47e065acd79532b", "aed14cbbecac4456843570e90c5f46ec")

 	//prod zs
 	// api = New("6f8d3290-0120-4ad7-8b53-943c67c84f3f", "789279b9ae814ba091ac52815566b54d", "5d668cd227644637bb0fd73ed8118ec8")
--- a/platformapi/jdapi/order_test.go
+++ b/platformapi/jdapi/order_test.go
@@ -109,7 +109,7 @@ func TestGetAfsService2(t *testing.T) {
 }

 func TestOrderShoudSettlementService2(t *testing.T) {
-	result, err := api.OrderShoudSettlementService2("2230776748000074")
+	result, err := api.OrderShoudSettlementService2("2230609970000292")
 	if err != nil {
 		t.Fatal(err.Error())
 	}
--- a/platformapi/jdapi/store_sku_test.go
+++ b/platformapi/jdapi/store_sku_test.go
@@ -1,6 +1,8 @@
 package jdapi

 import (
+	"fmt"
+	"sync"
 	"testing"

 	"git.rosy.net.cn/baseapi/utils"
@@ -58,9 +60,9 @@ func TestDelVipPrice(t *testing.T) {
 //}

 func TestBatchUpdateVendibility(t *testing.T) {
-	result, err := api.BatchUpdateVendibility("", "100130", "", []*StockVendibility{
+	result, err := api.BatchUpdateVendibility("", "800302", "", []*StockVendibility{
 		&StockVendibility{
-			OutSkuId: "26919",
+			OutSkuId: "6042945",
 			DoSale:   true,
 		},
 	}, "test")
@@ -121,3 +123,48 @@ func TestBatchUpdateCurrentQtys(t *testing.T) {
 	t.Log(utils.Format4Output(result, false))
 	//baseapi.SugarLogger.Debug(utils.Format4Output(result, false))
 }
+
+type Object2222 struct {
+	Clients map[string]int
+	*sync.RWMutex
+}
+
+func NewTcpClient222() *Object2222 {
+	t := &Object2222{
+		Clients: make(map[string]int),
+	}
+	t.RWMutex = new(sync.RWMutex)
+	return t
+}
+func TestLock(t *testing.T) {
+	obj := NewTcpClient222()
+	go func() {
+		fmt.Println("1")
+		for i := 0; i < 100000; i++ {
+			obj.setParam(utils.Int2Str(i), i)
+		}
+	}()
+
+	go func() {
+		fmt.Println("2")
+		for i := 0; i < 100000; i++ {
+			fmt.Println(obj.getParam(utils.Int2Str(i)))
+		}
+	}()
+
+	for i := 0; i < 100000; i++ {
+		fmt.Println(obj.Clients[utils.Int2Str(i)])
+	}
+}
+
+func (t *Object2222) setParam(key string, v int) {
+	t.Lock()
+	defer t.Unlock()
+	t.Clients[key] = v
+}
+
+func (t *Object2222) getParam(key string) int {
+	t.RLock()
+	defer t.RUnlock()
+	return t.Clients[key]
+}
--- a/platformapi/mtwmapi/retail.go
+++ b/platformapi/mtwmapi/retail.go
@@ -271,7 +271,6 @@ func handleRetailBatchResultByRegexp(result interface{}) (failedFoodList []*AppF
 // https://developer.waimai.meituan.com/home/myquestionDetail/6716
 // 另外这个接口即使不指定operate_type为1，也可能报错：”商品spu名称在该店内分类中已存在“，原因就是已经存在两个相同的SKU了
 func (a *API) RetailInitData(trackInfo, poiCode, foodCode string, params map[string]interface{}) (err error) {
-	globals.SugarLogger.Debugf("===========create sku mt : %s,%s,%s,%s", trackInfo, poiCode, foodCode, utils.Format4Output(params, false))
 	_, err = a.AccessAPI2("retail/initdata", false, utils.MergeMaps(map[string]interface{}{
 		KeyAppPoiCode:  poiCode,
 		KeyAppFoodCode: foodCode,
--- a/platformapi/mtwmapi/retail_test.go
+++ b/platformapi/mtwmapi/retail_test.go
@@ -289,36 +289,36 @@ func TestRetailSkuSellStatus(t *testing.T) {
 }

 func TestRetailSellStatus(t *testing.T) {
-	result, err := api.RetailSellStatus(utils.GetUUID(), testPoiCode, []*BareStoreFoodInfo{
+	result, err := api.RetailSellStatus(utils.GetUUID(), "666975", []*BareStoreFoodInfo{
 		&BareStoreFoodInfo{
-			AppFoodCode: "2212",
+			AppFoodCode: "6096035",
 			Skus: []*BareStoreSkuInfo{
 				&BareStoreSkuInfo{
-					SkuID: "2212",
-					Price: "1.2",
-					Stock: "123",
+					SkuID: "6096035",
+					Price: "2.1",
+					Stock: "0",
 				},
 			},
 		},
-		&BareStoreFoodInfo{
-			AppFoodCode: "23840",
-			Skus: []*BareStoreSkuInfo{
-				&BareStoreSkuInfo{
-					SkuID: "23840",
-					Stock: "123",
-				},
-			},
-		},
-		&BareStoreFoodInfo{
-			AppFoodCode: "2384999",
-			Skus: []*BareStoreSkuInfo{
-				&BareStoreSkuInfo{
-					SkuID: "2384999",
-					Stock: "123",
-				},
-			},
-		},
-	}, SellStatusOnline)
+		//&BareStoreFoodInfo{
+		//	AppFoodCode: "23840",
+		//	Skus: []*BareStoreSkuInfo{
+		//		&BareStoreSkuInfo{
+		//			SkuID: "23840",
+		//			Stock: "123",
+		//		},
+		//	},
+		//},
+		//&BareStoreFoodInfo{
+		//	AppFoodCode: "2384999",
+		//	Skus: []*BareStoreSkuInfo{
+		//		&BareStoreSkuInfo{
+		//			SkuID: "2384999",
+		//			Stock: "123",
+		//		},
+		//	},
+		//},
+	}, SellStatusOffline)
 	if err != nil {
 		t.Fatal(err)
 	}
--- a/platformapi/tiktok_shop/sdk-golang/api/sku_syncStock/request/sku_syncStock_request.go
+++ b/platformapi/tiktok_shop/sdk-golang/api/sku_syncStock/request/sku_syncStock_request.go
@@ -46,25 +46,25 @@ func (c *SkuSyncStockRequest) GetParams() *SkuSyncStockParam {

 type SkuSyncStockParam struct {
 	// sku编码
-	Code string `json:"code"`
+	//Code string `json:"code"`
 	// 规格id；抖店系统生成，商品id下唯一。
-	SkuId int64 `json:"sku_id"`
+	//SkuId int64 `json:"sku_id"`
 	// 外部skuid，开发者在创建或更新商品时设置。
 	OutSkuId int64 `json:"out_sku_id"`
 	// 商品ID，抖店系统生成，店铺下唯一；长度19位。
 	ProductId int64 `json:"product_id"`
 	// 外部商品id；开发者在创建或更新商品时设置的。
-	OutProductId int64 `json:"out_product_id"`
+	//OutProductId int64 `json:"out_product_id"`
 	// 外部仓库id编码，开发者自定义；如传入传值表示更新区域库存，不传默认更新普通库存。可以使用【/warehouse/list】接口响应参数【out_warehouse_id】字段获取。超市小时达店铺类型，需传入store_id字段，store_id可以使用【/shop/batchCreateStore】创建成功后获取
-	OutWarehouseId string `json:"out_warehouse_id"`
+	//OutWarehouseId string `json:"out_warehouse_id"`
 	// 供应商ID
-	SupplierId string `json:"supplier_id"`
+	//SupplierId string `json:"supplier_id"`
 	// 库存更新方式；true-增量更新，同时idempotent_id字段必填；false-全量更新；默认为false
 	Incremental bool `json:"incremental"`
 	// 幂等ID，当incremental=true时该参数必传
-	IdempotentId string `json:"idempotent_id"`
+	//IdempotentId string `json:"idempotent_id"`
 	// 库存值；可以设置为0；
 	StockNum int64 `json:"stock_num"`
 	// 阶梯库存
-	StepStockNum int64 `json:"step_stock_num"`
+	//StepStockNum int64 `json:"step_stock_num"`
 }
--- a/platformapi/tiktok_shop/tiktok_api/afs_test.go
+++ b/platformapi/tiktok_shop/tiktok_api/afs_test.go
@@ -18,9 +18,10 @@ import (
 //	"authority_id": ""
 //}`

-var token = `{"access_token":"84b9ab00-68d0-4b9f-9682-a03f75eaed95","expires_in":1672634978,"scope":"SCOPE","shop_id":57939570,"shop_name":"京西菜市速食","refresh_token":"44b1e11e-90a0-4876-b5f9-edd2bf5820e8","authority_id":""}`
+var token = `{"access_token":"adea9f19-9f8d-4656-8eb3-03c91385252f","expires_in":1673237952,"scope":"SCOPE","shop_id":57939570,"shop_name":"京西菜市速食","refresh_token":"ab14e321-1a68-405c-b904-7c4c14222c58","authority_id":""}`
+
+//var token = `{"access_token":"e3173e9f-266f-4d87-88e7-e7cd837bc9d9","expires_in":1672882632,"scope":"SCOPE","shop_id":68023619,"shop_name":"京西到家","refresh_token":"5070aae2-493f-46bd-b5d6-6ea0cd64729f","authority_id":""}`

-//var token = `{"access_token":"83e52462-ad46-4297-98c4-242ee6b7a5c8","expires_in":1672033612,"scope":"SCOPE","shop_id":63141688,"shop_name":"二期-抖音超市小时达测试店铺","refresh_token":"8f690bc3-3f3e-49bd-bbf7-31c9e868e980","authority_id":""}`
 var a = New("7136048270014416392", "c397aa9f-3927-47c4-8cfe-4d84e02602e0", token)

 // 查询售后单详情
@@ -35,7 +36,7 @@ func TestAggreOrNotAggreAfs(t *testing.T) {
 }

 func TestGetSkuDetailLocalID(t *testing.T) {
-	data, err := a.GetSkuDetailLocalID("", "30644")
+	data, err := a.GetSkuDetailLocalID("", "6094828")
 	globals.SugarLogger.Debugf("data=%s", utils.Format4Output(data, false))
 	globals.SugarLogger.Debugf("data=%s", err)
 }
--- a/platformapi/tiktok_shop/tiktok_api/order.go
+++ b/platformapi/tiktok_shop/tiktok_api/order.go
@@ -172,8 +172,6 @@ func (a *API) GetRefundAddressId(storeID int64) (int64, error) {
 	param.StoreId = storeID

 	result, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("获取抖店售后地址列表=========%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("获取抖店售后地址列表:=%s", utils.Format4Output(result, false))
 	if err != nil {
 		return 0, err
 	}
@@ -195,8 +193,6 @@ func (a *API) QueryAllReason(afterSaleId int64) ([]afterSale_rejectReasonCodeLis
 	}

 	result, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("查询所有的售后审核处理原因详情=========%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("查询所有的售后审核处理原因详情:=%s", utils.Format4Output(result, false))
 	if err != nil {
 		return nil, err
 	}
@@ -219,8 +215,6 @@ func (a *API) GetStoreOrderList(queryData time.Time, storeId int64) ([]string, e
 	param.Size = 100

 	orderDetailList, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("获取门店订单列表=========%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("获取门店订单列表:=%s", utils.Format4Output(orderDetailList, false))
 	if err != nil {
 		return nil, err
 	}
@@ -281,8 +275,6 @@ func (a *API) ReturnGoodsToWareHouseSuccess(afsOrderId string) error {
 	param.OpTime = time.Now().Unix()

 	result, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("商家确认售后单对应的用户退货入仓成功=========%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("商家确认售后单对应的用户退货入仓成功:=%s", utils.Format4Output(result, false))
 	if err != nil {
 		return err // 202210141114300102101071350D6F3847
 	}
--- a/platformapi/tiktok_shop/tiktok_api/sku.go
+++ b/platformapi/tiktok_shop/tiktok_api/sku.go
@@ -2,7 +2,6 @@ package tiktok_api

 import (
 	"errors"
-	"fmt"
 	brand_list_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/brand_list/request"
 	order_batchDecrypt_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/order_batchDecrypt/request"
 	order_batchSensitive_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/order_batchSensitive/request"
@@ -46,8 +45,6 @@ func (a *API) UpdateSkuStock(param *sku_syncStock_request.SkuSyncStockParam) err
 	request := sku_syncStock_request.New()
 	request.Param = param
 	resp, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("更新区域库存=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("更新区域库存:=%s", utils.Format4Output(resp, false))
 	if err != nil {
 		return err
 	}
@@ -126,7 +123,7 @@ func (a *API) CreateStoreCommodity(skuParam *product_addV2_request.ProductAddV2P
 		return nil, err
 	}
 	if result.Code != RequestSuccessCode {
-		globals.SugarLogger.Debugf("======CreateStoreCommodity logid: %s,%d,%d", result.LogId, skuParam.MainProductId, result.SubMsg)
+		globals.SugarLogger.Debugf("======CreateStoreCommodity logid: %s", utils.Format4Output(result, false))
 		return nil, errors.New(result.SubMsg)
 	}
 	return result.Data, nil
@@ -152,14 +149,11 @@ func (a *API) EditStoreCommodity(sku *product_editV2_request.ProductEditV2Param)
 	request.Param = sku

 	result, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("====skuparam %s", utils.Format4Output(sku, false))
-	globals.SugarLogger.Debugf("====result %s", utils.Format4Output(result, false))
 	if err != nil {
 		globals.SugarLogger.Debugf("LogId %s ,err %s", result.LogId, err.Error())
 		return err
 	}
 	if result.Code != RequestSuccessCode {
-		globals.SugarLogger.Debugf("LogId %s ,err %s", result.LogId, result.SubMsg)
 		return errors.New(result.SubMsg)
 	}
 	return nil
@@ -288,9 +282,6 @@ func (a *API) EditPrice(skuPrice *sku_editPrice_request.SkuEditPriceParam) error
 	request.Param = skuPrice

 	result, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("修改商品价格=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("修改商品价格:=%s", utils.Format4Output(result, false))
-	globals.SugarLogger.Debugf("修改商品参数:=%s", utils.Format4Output(skuPrice, false))
 	if err != nil {
 		return err
 	}
@@ -305,8 +296,6 @@ func (a *API) GetSkuBrand(categoryId int64) (int64, error) {
 	request := brand_list_request.New()
 	request.Param.CategoryId = categoryId
 	result, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("获取商品所属品牌=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("获取商品所属品牌:=%s", utils.Format4Output(result, false))
 	if err != nil {
 		return 0, err
 	}
@@ -344,8 +333,6 @@ func (a *API) OrderUserInfoDecrypt(orderId, name, tel, address string) (string,
 	request.Param.CipherInfos = cipherInfos

 	result, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("用户信息解密=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("用户信息解密:=%s", utils.Format4Output(result, false))
 	if err != nil {
 		return "", "", "", err
 	}
@@ -393,10 +380,7 @@ func (a *API) OrderUserInfoSensitive(orderId, name, tel, address string) {

 	request.Param.CipherInfos = paramItems

-	result, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("用户信息脱敏=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("用户信息脱敏:=%s", utils.Format4Output(result, false))
-	fmt.Println(err)
+	request.Execute(a.accessTokenObj)
 }

 // GetProductUpdateRule 查询分类是否支持七天无理由退货
@@ -520,8 +504,10 @@ func (a *API) CreateSubProduct(mainProductId int64, storeId int64) (int64, error
 	}

 	if result.Code != RequestSuccessCode {
+		globals.SugarLogger.Debugf("=CreateSubProduct  logID ========= %s", utils.Format4Output(result, false))
 		return 0, errors.New(result.SubMsg)
 	}
+	globals.SugarLogger.Debugf("result CreateSubProduct %s", utils.Format4Output(result, false))

 	return result.Data.SubProductId, nil
 }
--- a/platformapi/tiktok_shop/tiktok_api/sku_delete_test.go
+++ b/platformapi/tiktok_shop/tiktok_api/sku_delete_test.go
@@ -0,0 +1,246 @@
+package tiktok_api
+
+import (
+	"fmt"
+	product_listV2_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/product_listV2/request"
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/globals"
+	"strings"
+	"testing"
+)
+
+func TestCreateSubProduct(t *testing.T) {
+	fmt.Println(2&(model.SyncFlagDeletedMask|model.SyncFlagNewMask|model.SyncFlagModifiedMask) != 0)
+	fmt.Println((2 & 2) != 0)
+}
+
+// 删除已经创建商品,重新同步
+func TestDeleteSkuAndUploadSku2(t *testing.T) {
+	var errList = make([]error, 0, 0)
+	var storeList = make([]string, 0, 0)
+	for _, v := range c {
+		for i := 1; i < 100; i++ {
+			result, err := a.GetSkuDetailList(&product_listV2_request.ProductListV2Param{
+				Status:      0,
+				CheckStatus: 4, // 1-未提交；2-待审核；3-审核通过；4-审核未通过；5-封禁；7-审核通过待上架
+				Page:        int64(i),
+				Size:        100,
+				StoreId:     v,
+			})
+			if err != nil {
+				globals.SugarLogger.Debugf("=index := %d ,err := %s", i, utils.Format4Output(err, false))
+				continue
+			}
+			if len(result.Data) == 0 {
+				globals.SugarLogger.Debugf("====没有商品的门店 %d", v)
+				break
+			}
+			storeList = append(storeList, utils.Int64ToStr(v))
+			for _, v := range result.Data {
+				err := a.DeleteStoreCommodity(v.ProductId)
+				if err != nil {
+					errList = append(errList, err)
+				}
+			}
+		}
+	}
+
+	for _, v := range errList {
+		globals.SugarLogger.Debugf("err := %s", utils.Format4Output(v, false))
+	}
+	fmt.Println(strings.Join(storeList, ","))
+}
+
+// 删除已经创建商品,重新同步
+func TestDeleteSkuAndUploadSku5(t *testing.T) {
+	var errList = make([]error, 0, 0)
+	for i := 1; i < 100; i++ {
+		result, err := a.GetSkuDetailList(&product_listV2_request.ProductListV2Param{
+			Status:      0,
+			CheckStatus: 3, // 1-未提交；2-待审核；3-审核通过；4-审核未通过；5-封禁；7-审核通过待上架
+			Page:        int64(i),
+			Size:        100,
+		})
+		if err != nil {
+			globals.SugarLogger.Debugf("=index := %d ,err := %s", i, utils.Format4Output(err, false))
+			continue
+		}
+		if len(result.Data) == 0 {
+			globals.SugarLogger.Debugf("====没有商品的门店 %d", 1)
+			break
+		}
+		for _, v := range result.Data {
+			err := a.DeleteStoreCommodity(v.ProductId)
+			if err != nil {
+				errList = append(errList, err)
+			}
+		}
+	}
+
+	for _, v := range errList {
+		globals.SugarLogger.Debugf("err := %s", utils.Format4Output(v, false))
+	}
+}
+
+// 删除已经创建商品,重新同步
+func TestDeleteSkuAndUploadSku3(t *testing.T) {
+	var errList = make([]error, 0, 0)
+	for v := len(c) - 1; v > 0; v-- {
+		for i := 1; i < 100; i++ {
+			result, err := a.GetSkuDetailList(&product_listV2_request.ProductListV2Param{
+				CheckStatus: 1, // 1-未提交；2-待审核；3-审核通过；4-审核未通过；5-封禁；7-审核通过待上架
+				Page:        int64(i),
+				Size:        100,
+				StoreId:     c[v],
+			})
+			if err != nil {
+				globals.SugarLogger.Debugf("=index := %d ,err := %s", i, utils.Format4Output(err, false))
+				continue
+			}
+			if len(result.Data) == 0 {
+				globals.SugarLogger.Debugf("====没有商品的门店 %d", c[v])
+				break
+			}
+			for _, v := range result.Data {
+				err := a.DeleteStoreCommodity(v.ProductId)
+				if err != nil {
+					errList = append(errList, err)
+				}
+			}
+		}
+	}
+
+	for _, v := range errList {
+		globals.SugarLogger.Debugf("err := %s", utils.Format4Output(v, false))
+	}
+}
+
+/**/
+
+// 删除已经创建商品,重新同步
+func TestDeleteSkuAndUploadSku4(t *testing.T) {
+	var errList = make([]error, 0, 0)
+	for v := len(c) - 1; v > 0; v-- {
+		for i := 1; i < 100; i++ {
+			result, err := a.GetSkuDetailList(&product_listV2_request.ProductListV2Param{
+				Status:      1,
+				CheckStatus: 5, // 1-未提交；2-待审核；3-审核通过；4-审核未通过；5-封禁；7-审核通过待上架
+				Page:        int64(i),
+				Size:        100,
+				StoreId:     c[v],
+			})
+			if err != nil {
+				globals.SugarLogger.Debugf("=index := %d ,err := %s", i, utils.Format4Output(err, false))
+				continue
+			}
+			if len(result.Data) == 0 {
+				globals.SugarLogger.Debugf("====没有商品的门店 %d", c[v])
+				break
+			}
+			for _, v := range result.Data {
+				err := a.DeleteStoreCommodity(v.ProductId)
+				if err != nil {
+					errList = append(errList, err)
+				}
+			}
+		}
+	}
+
+	for _, v := range errList {
+		globals.SugarLogger.Debugf("err := %s", utils.Format4Output(v, false))
+	}
+}
+
+var storeList2GD = []int64{
+	65402632,
+	63841927,
+	63841426,
+	63825967,
+	63783027,
+	63783026,
+	63783025,
+	63783023,
+	63783021,
+	63521502,
+	63521394,
+	63520894,
+	63520826,
+	63517652,
+	63517290,
+	63504497,
+	63504222,
+	63503537,
+	63503199,
+	63463365,
+	63463026,
+	63462817,
+	63179331,
+	62493432,
+}
+
+// 删除已经创建商品,重新同步
+func TestDeleteSkuAndUploadSku666(t *testing.T) {
+	var errList = make([]error, 0, 0)
+	for _, v := range storeList2GD {
+		for i := 1; i < 100; i++ {
+			result, err := a.GetSkuDetailList(&product_listV2_request.ProductListV2Param{
+				CheckStatus: 3, // 1-未提交；2-待审核；3-审核通过；4-审核未通过；5-封禁；7-审核通过待上架
+				Page:        int64(i),
+				Size:        100,
+				StoreId:     v,
+			})
+			if err != nil {
+				globals.SugarLogger.Debugf("=index := %d ,err := %s", i, utils.Format4Output(err, false))
+				continue
+			}
+			if len(result.Data) == 0 {
+				globals.SugarLogger.Debugf("====没有商品的门店 %d", v)
+				break
+			}
+			for _, v := range result.Data {
+				err := a.DeleteStoreCommodity(v.ProductId)
+				if err != nil {
+					errList = append(errList, err)
+				}
+			}
+		}
+	}
+
+	for _, v := range errList {
+		globals.SugarLogger.Debugf("err := %s", utils.Format4Output(v, false))
+	}
+}
+
+// 删除已经创建商品,重新同步
+func TestDeleteSkuAndUploadSku7777(t *testing.T) {
+	var errList = make([]error, 0, 0)
+	for _, v := range storeList2GD {
+		for i := 1; i < 100; i++ {
+			result, err := a.GetSkuDetailList(&product_listV2_request.ProductListV2Param{
+				CheckStatus: 3, // 1-未提交；2-待审核；3-审核通过；4-审核未通过；5-封禁；7-审核通过待上架
+				Page:        int64(i),
+				Size:        100,
+				StoreId:     v,
+			})
+			if err != nil {
+				globals.SugarLogger.Debugf("=index := %d ,err := %s", i, utils.Format4Output(err, false))
+				continue
+			}
+			if len(result.Data) == 0 {
+				globals.SugarLogger.Debugf("====没有商品的门店 %d", v)
+				break
+			}
+			for _, v := range result.Data {
+				err := a.DeleteStoreCommodity(v.ProductId)
+				if err != nil {
+					errList = append(errList, err)
+				}
+			}
+		}
+	}
+
+	for _, v := range errList {
+		globals.SugarLogger.Debugf("err := %s", utils.Format4Output(v, false))
+	}
+}
--- a/platformapi/tiktok_shop/tiktok_api/sku_test.go
+++ b/platformapi/tiktok_shop/tiktok_api/sku_test.go
--- a/platformapi/tiktok_shop/tiktok_api/sku_type.go
+++ b/platformapi/tiktok_shop/tiktok_api/sku_type.go
@@ -7,7 +7,7 @@ type Imgs struct {

 // 抖店文件夹id写死两个
 const (
-	TiktokFolder1               = "71580417560930552391570" // 文件夹(京西菜市)
+	TiktokFolder1               = "71847620611255503751570" // 文件夹(京西菜市)
 	TiktokFolder2               = "71482723234545339291960"
 	TiktokFolder3               = "71762017122139835211688" // (方案二测试文件夹)
 	TiktokShoppingFolder        = "71802347591117703711619" // (方案二测试文件夹)
--- a/platformapi/tiktok_shop/tiktok_api/sku_warehouse_test.go
+++ b/platformapi/tiktok_shop/tiktok_api/sku_warehouse_test.go
@@ -24,7 +24,7 @@ func init() {
 }

 func TestCreateFolad(t *testing.T) {
-	data, err := a.CreateFolder("shopping_folder")
+	data, err := a.CreateFolder("京西菜市图片文件库2")
 	fmt.Println("err=====", err)
 	fmt.Println("LogId====", data.LogId)              //2022092811422001020812109607601B77
 	fmt.Println("data====", data.Data.Name)           // jxcs_folder
--- a/platformapi/tiktok_shop/tiktok_api/store.go
+++ b/platformapi/tiktok_shop/tiktok_api/store.go
@@ -26,6 +26,7 @@ import (
 	shop_getStoreDetail_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_getStoreDetail/response"
 	shop_getStoreFreight_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_getStoreFreight/request"
 	shop_getStoreList_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_getStoreList/request"
+	shop_getStoreList_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_getStoreList/response"
 	shop_getStoreSaleLimit_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_getStoreSaleLimit/request"
 	shop_setStorePackageFee_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_setStorePackageFee/request"
 	shop_storeSuspend_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_storeSuspend/request"
@@ -78,8 +79,6 @@ func (a *API) BatchCreateStore(param *shop_batchCreateStore_request.ShopBatchCre
 	request := shop_batchCreateStore_request.New()
 	request.Param = param
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("批量创建门店=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("批量创建门店:=%s", utils.Format4Output(response, false))
 	if err != nil {
 		return nil, err
 	}
@@ -98,8 +97,6 @@ func (a *API) EditStore(param *shop_editStore_request.ShopEditStoreParam) error
 	request := shop_editStore_request.New()
 	request.Param = param
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("编辑门店=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("编辑门店:=%s", utils.Format4Output(response, false))
 	if err != nil {
 		return err
 	}
@@ -114,8 +111,6 @@ func (a *API) StoreSuspend(param *shop_storeSuspend_request.ShopStoreSuspendPara
 	request := shop_storeSuspend_request.New()
 	request.Param = param
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("暂停营业=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("暂停营业:=%s", utils.Format4Output(response, false))
 	if err != nil {
 		return nil, err
 	}
@@ -130,8 +125,6 @@ func (a *API) UnsuspendStore(param *shop_unsuspendStore_request.ShopUnsuspendSto
 	request := shop_unsuspendStore_request.New()
 	request.Param = param
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("门店恢复营业=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("门店恢复营业:=%s", utils.Format4Output(response, false))
 	if err != nil {
 		return nil, err
 	}
@@ -167,13 +160,26 @@ func (a *API) GetStoreList(param *shop_getStoreList_request.ShopGetStoreListPara
 	return resp, err
 }

+//门店列表分页查询
+func (a *API) GetStoreList2(param *shop_getStoreList_request.ShopGetStoreListParam) (*shop_getStoreList_response.ShopGetStoreListResponse, error) {
+	request := shop_getStoreList_request.New()
+	request.Param = param
+	response, err := request.Execute(a.accessTokenObj)
+	if err != nil {
+		return nil, err
+	}
+	if response.Code != RequestSuccessCode {
+		return nil, errors.New(response.SubMsg)
+	}
+
+	return response, err
+}
+
 //创建限售规则模板
 func (a *API) CreateTradeLimitTemplate(param *trade_createTradeLimitTemplate_request.TradeCreateTradeLimitTemplateParam) (*trade_createTradeLimitTemplate_response.TradeCreateTradeLimitTemplateData, error) {
 	request := trade_createTradeLimitTemplate_request.New()
 	request.Param = param
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("创建限售规则模板=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("创建限售规则模板:=%s", utils.Format4Output(response, false))
 	if err != nil {
 		return nil, err
 	}
@@ -188,9 +194,6 @@ func (a *API) UpdateTradeLimitTemplate(param *trade_UpdateTradeLimitTemplate_req
 	request := trade_UpdateTradeLimitTemplate_request.New()
 	request.Param = param
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("更新限售规则模板=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("更新限售规则模板:=%s", utils.Format4Output(response, false))
-	globals.SugarLogger.Debugf("打印限售规则参数 检查====%v", utils.Format4Output(request.Param, false))
 	if err != nil {
 		return nil, err
 	}
--- a/platformapi/tiktok_shop/tiktok_api/store_test.go
+++ b/platformapi/tiktok_shop/tiktok_api/store_test.go
--- a/platformapi/tiktok_shop/tiktok_api/transport.go
+++ b/platformapi/tiktok_shop/tiktok_api/transport.go
@@ -27,9 +27,6 @@ func (a *API) GetDispatcherInfo(storeID int64, shopOrderID string, dispatcherFee
 		DispatcherFeeType: dispatcherFeeType,
 	}
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("运力呼叫询价/运力取消询价(正向)=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("运力呼叫询价/运力取消询价(正向):=%s", utils.Format4Output(response, false))
-	globals.SugarLogger.Debugf("打印运力呼叫询价/运力取消询价(正向)参数 ====%v", utils.Format4Output(request.Param, false))
 	if err != nil {
 		return 0, err
 	}
@@ -48,9 +45,6 @@ func (a *API) ShopOrderDispatcher(storeID int64, shopOrderID string, dispatcherT
 		DispatcherType: dispatcherType,
 	}
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("呼叫运力并发货/重新发货、取消运力=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("呼叫运力并发货/重新发货、取消运力:=%s", utils.Format4Output(response, false))
-	globals.SugarLogger.Debugf("打印呼叫运力并发货/重新发货、取消运力参数 ====%v", utils.Format4Output(request.Param, false))
 	if err != nil {
 		return err
 	}
@@ -101,8 +95,6 @@ func (a *API) CreateVirtualMobile(shopOrderID int64) (*superm_createVirtualMobil
 		ShopOrderID: shopOrderID,
 	}
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("隐私小号获取=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("隐私小号获取:=%s", utils.Format4Output(response, false))
 	if err != nil {
 		return nil, err
 	}
@@ -120,9 +112,6 @@ func (a *API) GetPlatformPickUpEstimatedCharge(afterSaleID int64, inquiryType in
 		InquiryType: inquiryType,
 	}
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("运力呼叫询价/运力取消询价=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("运力呼叫询价/运力取消询价:=%s", utils.Format4Output(response, false))
-	globals.SugarLogger.Debugf("打印运力呼叫询价/运力取消询价参数 ====%v", utils.Format4Output(request.Param, false))
 	if err != nil {
 		return 0, err
 	}
@@ -139,8 +128,6 @@ func (a *API) ApplyPlatformPickUp(afterSaleID int64) (string, error) {
 		AfterSaleID: afterSaleID,
 	}
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("呼叫运力售后取件=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("呼叫运力售后取件:=%s", utils.Format4Output(response, false))
 	if err != nil {
 		return "", err
 	}
@@ -158,8 +145,6 @@ func (a *API) GetShipmentInfo(shopOrderID, afterSaleID, shipmentType int64) (*su
 		ShipmentType: shipmentType,
 	}
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("查询运力订单信息=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("查询运力订单信息:=%s", utils.Format4Output(response, false))
 	if err != nil {
 		return nil, err
 	}
@@ -176,8 +161,6 @@ func (a *API) CancelPlatformPickUp(afterSaleID int64) error {
 		AfterSaleID: afterSaleID,
 	}
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("取消运力=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("取消运力:=%s", utils.Format4Output(response, false))
 	if err != nil {
 		return err
 	}
--- a/utils/typeconv.go
+++ b/utils/typeconv.go
@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"git.rosy.net.cn/jx-callback/globals"
 	"math"
 	"net/url"
 	"reflect"
@@ -44,7 +43,6 @@ func TryUnmarshalUseNumber(data []byte, result interface{}) error {

 // 这个函数将解析json，返回的map中的字段类型与structObj中的完全一样的
 func Unmarshal2Map(data []byte, structObj interface{}) (resultMap map[string]interface{}, err error) {
-	globals.SugarLogger.Debugf("进入Unmarshal2Map")
 	if err = json.Unmarshal(data, structObj); err == nil {
 		if err = json.Unmarshal(data, &resultMap); err == nil {
 			m := Struct2MapByJson(structObj)
@@ -57,7 +55,6 @@ func Unmarshal2Map(data []byte, structObj interface{}) (resultMap map[string]int
 			}
 		}
 	}
-	globals.SugarLogger.Debugf("resultMap===========%v  err=======%v", resultMap, err)
 	return resultMap, err
 }