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

2022-10-08 17:47:26 +08:00
parent 3466efa552 3a873222ea
commit c6e2ebe4e7
3 changed files with 114 additions and 91 deletions
--- a/business/partner/purchase/doudian/store_test.go
+++ b/business/partner/purchase/doudian/store_test.go
@@ -1,44 +1,42 @@
 package doudian

-//
-//import (
-//	freightTemplate_create_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/freightTemplate_create/request"
-//	shop_batchCreateStore_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_batchCreateStore/request"
-//	"git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api"
-//	"git.rosy.net.cn/baseapi/utils"
-//	"git.rosy.net.cn/jx-callback/business/model"
-//	"git.rosy.net.cn/jx-callback/business/model/dao"
-//	"testing"
-//)
-//
-//func TestCreateStore(t *testing.T) {
-//	accesstoken := `{"access_token":"90868a42-1287-4453-ba71-34c72f22e886","expires_in":555553,"scope":"SCOPE","shop_id":"","shop_name":"小时达开放平台对接专用店","refresh_token":"4e8cf946-8df1-4489-be88-f96f2d4603a8","authority_id  ":""}`
-//	tiktok_api.New("7136048270014416392", "c397aa9f-3927-47c4-8cfe-4d84e02602e0", accesstoken)
-//	request := shop_batchCreateStore_request.New()
-//	//storeList := make([]*shop_batchCreateStore_request.StoreListItem, 0)
-//	storeInfo := model.Store{
-//		Name:       "京西菜市小时达测试店铺0926",
-//		Lng:        utils.Str2Int("128.443241"),
-//		Lat:        utils.Str2Int("31.133237"),
-//		Address:    "金牛区一环路北二段10号",
-//		Tel1:       "17358644830",
-//		OpenTime1:  700,
-//		CloseTime1: 1230,
-//		OpenTime2:  1300,
-//		CloseTime2: 1800,
-//		//OpenTime:  map[int64]string{1: "07:00-19:00", 2: "8:00-19:00"},
-//	}
-//	list := &dao.StoreDetail{}
-//	list.Store = storeInfo
-//	list.ProvinceName = "四川省"
-//	list.CityName = "成都市"
-//	list.DistrictName = "金牛区"
-//	list.VendorStoreID = "666667"
-//	_, err := CurPurchaseHandler.CreateStore2(nil, 0, "", nil, list)
-//	resp, err := request.Execute(tiktok_api.AccessToken)
-//	t.Fatal("err===========", err)
-//	t.Fatalf("resp===========:%v", resp)
-//}
+import (
+	freightTemplate_create_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/freightTemplate_create/request"
+	shop_batchCreateStore_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_batchCreateStore/request"
+	"git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api"
+	"git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store"
+	"testing"
+)
+
+func TestCreateStore(t *testing.T) {
+	accesstoken := `{"access_token":"90868a42-1287-4453-ba71-34c72f22e886","expires_in":555553,"scope":"SCOPE","shop_id":"","shop_name":"小时达开放平台对接专用店","refresh_token":"4e8cf946-8df1-4489-be88-f96f2d4603a8","authority_id  ":""}`
+	a := tiktok_api.New("7136048270014416392", "c397aa9f-3927-47c4-8cfe-4d84e02602e0", accesstoken)
+	//request := shop_batchCreateStore_request.New()
+	StoreList := shop_batchCreateStore_request.StoreListItem{
+		RowId:     1,
+		Name:      "京西菜市小时达测试店铺1008",
+		StoreCode: "100002",
+		Longitude: "128.443241",
+		Latitude:  "31.133237",
+		Address:   "金牛区一环路北二段10号",
+		Contact:   "17358644830",
+		Province:  "四川省",
+		City:      "成都市",
+		District:  "金牛区",
+		OpenTime: &shop_batchCreateStore_request.OpenTime{
+			DayMap: map[int64]string{1: "07:00-19:00", 2: "8:00-19:00"},
+		},
+	}
+	storeLists := []shop_batchCreateStore_request.StoreListItem{}
+	storeLists = append(storeLists, StoreList)
+	param := &shop_batchCreateStore_request.ShopBatchCreateStoreParam{
+		StoreList: storeLists,
+	}
+	resp, err := a.BatchCreateStore(param)
+	t.Fatal("err===========", err)
+	t.Fatalf("resp===========:%v", resp)
+}
+
 //
 //func TestUpdateStore(t *testing.T) {
 //	accesstoken := `{"access_token":"90868a42-1287-4453-ba71-34c72f22e886","expires_in":555553,"scope":"SCOPE","shop_id":"","shop_name":"小时达开放平台对接专用店","refresh_token":"4e8cf946-8df1-4489-be88-f96f2d4603a8","authority_id  ":""}`
@@ -50,53 +48,54 @@ package doudian
 //	t.Fatalf("resp===========:%v", resp)
 //}
 ////
-////func TestCreateFreightTemplate(t *testing.T) {
-////	accesstoken := `{"access_token":"6c4d71b3-831c-4a96-8d2e-977e37afba5a","expires_in":462248,"scope":"SCOPE","shop_id":"","shop_name":"小时达开放平台对接          专用店","refresh_token":"65aae144-4cc0-44d2-89ba-5d3062caca41","authority_   id":""}`
-////	tiktok_api.New("7136048270014416392", "c397aa9f-3927-47c4-8cfe-4d84e02602e0", accesstoken)
-////	t1 := freightTemplate_create_request.FreightTemplateCreateParam{
-////		Columns: []freightTemplate_create_request.ColumnsItem{
-////			{
-////				AddWeight:    20,
-////				MinSkuAmount: -1,
-////				FirstWeight:  20,
-////				ProvinceInfos: []freightTemplate_create_request.ProvinceInfosItem{
-////					{
-////						Id: 51,
-////						Children: []freightTemplate_create_request.ChildrenItem_4{
-////							{
-////								Id: 510101,
-////								Children: []freightTemplate_create_request.ChildrenItem_5{
-////									{
-////										Id: 510107,
-////										Children: []freightTemplate_create_request.ChildrenItem{
-////											{
-////												Id: 610041,
-////											},
-////										},
-////									},
-////								},
-////							},
-////						},
-////					},
-////				},
-////			},
-////		},
-////		Template: &freightTemplate_create_request.Template{
-////			TemplateName:    "运费模板创建测试0929",
-////			ProductProvince: 51,
-////			ProductCity:     510104,
-////			CalculateType:   1,
-////			TransferType:    1,
-////			RuleType:        0,
-////		},
-////	}
-////	//t2 := []freightTemplate_create_request.FreightTemplateCreateParam{}
-////	//t2 = append(t2, t1)
-////	freightID, err := CurPurchaseHandler.CreateFreightTemplate(t1)
-////	//fmt.Println("freightID==", fmt.Sprintf("%v", freightID))
-////	t.Fatal("err===========", err)
-////	t.Fatalf("resp===========:%v", freightID)
-////}
+func TestCreateFreightTemplate(t *testing.T) {
+	accesstoken := `{"access_token":"a1746210-a8a3-4497-a87b-09d1f10dbb95","expires_in":1665652252,"scope":"SCOPE","shop_id":"","shop_name":"小时达开放平台对 接专用店","refresh_token":"c1cf8d88-0983-4f2a-b969-3746fae6b0cd","authorit    y_id":""}`
+	a := tiktok_api.New("7136048270014416392", "c397aa9f-3927-47c4-8cfe-4d84e02602e0", accesstoken)
+	t1 := &freightTemplate_create_request.FreightTemplateCreateParam{
+		Columns: []freightTemplate_create_request.ColumnsItem{
+			{
+				AddWeight:    20,
+				MinSkuAmount: -1,
+				FirstWeight:  20,
+				ProvinceInfos: []freightTemplate_create_request.ProvinceInfosItem{
+					{
+						Id: 51,
+						Children: []freightTemplate_create_request.ChildrenItem_4{
+							{
+								Id: 510101,
+								Children: []freightTemplate_create_request.ChildrenItem_5{
+									{
+										Id: 510107,
+										Children: []freightTemplate_create_request.ChildrenItem{
+											{
+												Id: 610041,
+											},
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Template: &freightTemplate_create_request.Template{
+			TemplateName:    "运费模板创建测试0929",
+			ProductProvince: 51,
+			ProductCity:     510104,
+			CalculateType:   1,
+			TransferType:    1,
+			RuleType:        0,
+		},
+	}
+	//t2 := []freightTemplate_create_request.FreightTemplateCreateParam{}
+	//t2 = append(t2, t1)
+	freightID, err := a.FreightTemplateCreate(t1)
+	//fmt.Println("freightID==", fmt.Sprintf("%v", freightID))
+	t.Fatal("err===========", err)
+	t.Fatalf("resp===========:%v", freightID)
+}
+
 //
 ////func TestBindFreightTemplate(t *testing.T) {
 ////	accesstoken := `{"access_token":"6c4d71b3-831c-4a96-8d2e-977e37afba5a","expires_in":462248,"scope":"SCOPE","shop_id":"","shop_name":"小时达开放平台对接          专用店","refresh_token":"65aae144-4cc0-44d2-89ba-5d3062caca41","authority_   id":""}`
@@ -107,3 +106,11 @@ package doudian
 ////		//FreightId: ,
 ////	}
 ////}
+
+func TestCreateFences(t *testing.T) {
+	//accesstoken := `{"access_token":"a1746210-a8a3-4497-a87b-09d1f10dbb95","expires_in":1665652252,"scope":"SCOPE","shop_id":"","shop_name":"小时达开放平台对 接专用店","refresh_token":"c1cf8d88-0983-4f2a-b969-3746fae6b0cd","authorit    y_id":""}`
+	//a := tiktok_api.New("7136048270014416392", "c397aa9f-3927-47c4-8cfe-4d84e02602e0", accesstoken)
+	resp, err := tiktok_store.CreateFenceByStore(668472)
+	t.Fatal("err===========", err)
+	t.Fatalf("resp===========:%v", resp)
+}
--- a/business/partner/purchase/tiktok_store/store.go
+++ b/business/partner/purchase/tiktok_store/store.go
@@ -46,6 +46,7 @@ func splicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) (
 	if openTime1 != 0 && closeTime1 != 0 {
 		tOpenTime1 := utils.Int64ToStr(int64(openTime1))
 		len1 := len(tOpenTime1) - 2
+		globals.SugarLogger.Debug("====len1====len(tOpenTime1)", tOpenTime1, int64(openTime1), len1, len(tOpenTime1))
 		if utils.Str2Int(tOpenTime1[:len1]) <= 9 {
 			s1 += "0"
 		}
@@ -107,6 +108,7 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
 	if storeDetail.OpenTime1 == 0 || storeDetail.CloseTime1 == 0 {
 		return "", fmt.Errorf("营业时间必填")
 	} else {
+		globals.SugarLogger.Debug("storeDetail.OpenTime1, storeDetail.CloseTime1======", storeDetail.OpenTime1, storeDetail.CloseTime1)
 		timeStr = splicingTimeToDoudian(storeDetail.OpenTime1, storeDetail.CloseTime1, storeDetail.OpenTime2, storeDetail.CloseTime2)
 	}
 	m := make(map[int64]string)
@@ -134,15 +136,30 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
 	ShopBatchCreateStoreParam = &shop_batchCreateStore_request.ShopBatchCreateStoreParam{
 		StoreList: lists,
 	}
-
 	if resp, err := getAPI(storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID).BatchCreateStore(ShopBatchCreateStoreParam); err != nil {
 		return "", err
 	} else {
+		//if len(resp.ResultList) == 0 {
+		//	return "", errors.New("创建店铺失败")
+		//}
+		////创建成功即创建并绑定电子围栏
+		//fences := []string{}
+		//if fenceID, err := CreateFenceByStore(int(resp.ResultList[0].Store.StoreId)); err != nil {
+		//	return "", err
+		//} else {
+		//	fences = append(fences, fenceID)
+		//	if err := BindFenceByStore(resp.ResultList[0].Store.StoreId, fences); err != nil {
+		//		return "", err
+		//	}
+		//}
+		//ans := ""
+		globals.SugarLogger.Debug("resp.ResultList========", resp.ResultList[0])
 		for k, v := range resp.ResultList {
 			if k != len(resp.ResultList) {
 				storeIDs += utils.Int64ToStr(v.Store.StoreId) + ","
 			}
-			storeIDs += utils.Int64ToStr(v.Store.StoreId)
+			storeIDs += utils.Int64ToStr(v.Store.StoreId) + v.Store.Name + v.Store.StoreCode
+			//ans := resp.ResultList[0].Store
 		}
 		return storeIDs, nil
 	}
--- a/business/partner/purchase/tiktok_store/warehouse.go
+++ b/business/partner/purchase/tiktok_store/warehouse.go
@@ -13,7 +13,6 @@ import (
 	"strings"
 )

-// todo
 //  /warehouse/createBatch 批量创建区域仓
 func (P *PurchaseHandler) BatchCreateWarehouse(param warehouse_createBatch_request.WarehouseCreateBatchParam) error {
 	infos := []warehouse_createBatch_request.OutWarehouseListItem{}
@@ -62,7 +61,7 @@ type LocalStore struct {
 }

 // /warehouse/createFence 以门店方式创建电子围栏
-func (P *PurchaseHandler) CreateFenceByStore(storeID int) (fenceID string, err error) {
+func CreateFenceByStore(storeID int) (fenceID string, err error) {
 	var (
 		db         *dao.DaoDB
 		localStore *LocalStore
@@ -132,7 +131,7 @@ func (P *PurchaseHandler) CreateFenceDirectly(param warehouse_createFence_reques
 }

 //门店直接绑定围栏
-func (P *PurchaseHandler) BindFenceByStore(storeID int64, addOutFenceIDs []string) error {
+func BindFenceByStore(storeID int64, addOutFenceIDs []string) error {
 	param := &warehouse_bindFencesByStore_request.WarehouseBindFencesByStoreParam{
 		StoreId:        storeID,
 		AddOutFenceIds: addOutFenceIDs,