liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
邹宗楠
2022-10-08 17:47:26 +08:00
parent 3466efa552 3a873222ea
commit c6e2ebe4e7
3 changed files with 114 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

179
business/partner/purchase/doudian/store_test.go
View File

@@ -1,44 +1,42 @@
package doudian package doudian
// import (
//import ( freightTemplate_create_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/freightTemplate_create/request"
// 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"
// 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/platformapi/tiktok_shop/tiktok_api" "git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store"
// "git.rosy.net.cn/baseapi/utils" "testing"
// "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 ":""}`
// a := tiktok_api.New("7136048270014416392", "c397aa9f-3927-47c4-8cfe-4d84e02602e0", accesstoken)
//func TestCreateStore(t *testing.T) { //request := shop_batchCreateStore_request.New()
// 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 ":""}` StoreList := shop_batchCreateStore_request.StoreListItem{
// tiktok_api.New("7136048270014416392", "c397aa9f-3927-47c4-8cfe-4d84e02602e0", accesstoken) RowId: 1,
// request := shop_batchCreateStore_request.New() Name: "京西菜市小时达测试店铺1008",
// //storeList := make([]*shop_batchCreateStore_request.StoreListItem, 0) StoreCode: "100002",
// storeInfo := model.Store{ Longitude: "128.443241",
// Name: "京西菜市小时达测试店铺0926", Latitude: "31.133237",
// Lng: utils.Str2Int("128.443241"), Address: "金牛区一环路北二段10号",
// Lat: utils.Str2Int("31.133237"), Contact: "17358644830",
// Address: "金牛区一环路北二段10号", Province: "四川省",
// Tel1: "17358644830", City: "成都市",
// OpenTime1: 700, District: "金牛区",
// CloseTime1: 1230, OpenTime: &shop_batchCreateStore_request.OpenTime{
// OpenTime2: 1300, DayMap: map[int64]string{1: "07:00-19:00", 2: "8:00-19:00"},
// CloseTime2: 1800, },
// //OpenTime: map[int64]string{1: "07:00-19:00", 2: "8:00-19:00"}, }
// } storeLists := []shop_batchCreateStore_request.StoreListItem{}
// list := &dao.StoreDetail{} storeLists = append(storeLists, StoreList)
// list.Store = storeInfo param := &shop_batchCreateStore_request.ShopBatchCreateStoreParam{
// list.ProvinceName = "四川省" StoreList: storeLists,
// list.CityName = "成都市" }
// list.DistrictName = "金牛区" resp, err := a.BatchCreateStore(param)
// list.VendorStoreID = "666667" t.Fatal("err===========", err)
// _, err := CurPurchaseHandler.CreateStore2(nil, 0, "", nil, list) t.Fatalf("resp===========:%v", resp)
// resp, err := request.Execute(tiktok_api.AccessToken) }
// t.Fatal("err===========", err)
// t.Fatalf("resp===========:%v", resp)
//}
// //
//func TestUpdateStore(t *testing.T) { //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 ":""}` // 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) // t.Fatalf("resp===========:%v", resp)
//} //}
//// ////
////func TestCreateFreightTemplate(t *testing.T) { 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":""}` 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":""}`
//// tiktok_api.New("7136048270014416392", "c397aa9f-3927-47c4-8cfe-4d84e02602e0", accesstoken) a := tiktok_api.New("7136048270014416392", "c397aa9f-3927-47c4-8cfe-4d84e02602e0", accesstoken)
//// t1 := freightTemplate_create_request.FreightTemplateCreateParam{ t1 := &freightTemplate_create_request.FreightTemplateCreateParam{
//// Columns: []freightTemplate_create_request.ColumnsItem{ Columns: []freightTemplate_create_request.ColumnsItem{
//// { {
//// AddWeight: 20, AddWeight: 20,
//// MinSkuAmount: -1, MinSkuAmount: -1,
//// FirstWeight: 20, FirstWeight: 20,
//// ProvinceInfos: []freightTemplate_create_request.ProvinceInfosItem{ ProvinceInfos: []freightTemplate_create_request.ProvinceInfosItem{
//// { {
//// Id: 51, Id: 51,
//// Children: []freightTemplate_create_request.ChildrenItem_4{ Children: []freightTemplate_create_request.ChildrenItem_4{
//// { {
//// Id: 510101, Id: 510101,
//// Children: []freightTemplate_create_request.ChildrenItem_5{ Children: []freightTemplate_create_request.ChildrenItem_5{
//// { {
//// Id: 510107, Id: 510107,
//// Children: []freightTemplate_create_request.ChildrenItem{ Children: []freightTemplate_create_request.ChildrenItem{
//// { {
//// Id: 610041, Id: 610041,
//// }, },
//// }, },
//// }, },
//// }, },
//// }, },
//// }, },
//// }, },
//// }, },
//// }, },
//// }, },
//// Template: &freightTemplate_create_request.Template{ Template: &freightTemplate_create_request.Template{
//// TemplateName: "运费模板创建测试0929", TemplateName: "运费模板创建测试0929",
//// ProductProvince: 51, ProductProvince: 51,
//// ProductCity: 510104, ProductCity: 510104,
//// CalculateType: 1, CalculateType: 1,
//// TransferType: 1, TransferType: 1,
//// RuleType: 0, RuleType: 0,
//// }, },
//// } }
//// //t2 := []freightTemplate_create_request.FreightTemplateCreateParam{} //t2 := []freightTemplate_create_request.FreightTemplateCreateParam{}
//// //t2 = append(t2, t1) //t2 = append(t2, t1)
//// freightID, err := CurPurchaseHandler.CreateFreightTemplate(t1) freightID, err := a.FreightTemplateCreate(t1)
//// //fmt.Println("freightID==", fmt.Sprintf("%v", freightID)) //fmt.Println("freightID==", fmt.Sprintf("%v", freightID))
//// t.Fatal("err===========", err) t.Fatal("err===========", err)
//// t.Fatalf("resp===========:%v", freightID) t.Fatalf("resp===========:%v", freightID)
////} }
// //
////func TestBindFreightTemplate(t *testing.T) { ////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":""}` //// 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: , //// //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)
}

21
business/partner/purchase/tiktok_store/store.go
View File

@@ -46,6 +46,7 @@ func splicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) (
if openTime1 != 0 && closeTime1 != 0 { if openTime1 != 0 && closeTime1 != 0 {
tOpenTime1 := utils.Int64ToStr(int64(openTime1)) tOpenTime1 := utils.Int64ToStr(int64(openTime1))
len1 := len(tOpenTime1) - 2 len1 := len(tOpenTime1) - 2
globals.SugarLogger.Debug("====len1====len(tOpenTime1)", tOpenTime1, int64(openTime1), len1, len(tOpenTime1))
if utils.Str2Int(tOpenTime1[:len1]) <= 9 { if utils.Str2Int(tOpenTime1[:len1]) <= 9 {
s1 += "0" s1 += "0"
} }
@@ -107,6 +108,7 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
if storeDetail.OpenTime1 == 0 || storeDetail.CloseTime1 == 0 { if storeDetail.OpenTime1 == 0 || storeDetail.CloseTime1 == 0 {
return "", fmt.Errorf("营业时间必填") return "", fmt.Errorf("营业时间必填")
} else { } else {
globals.SugarLogger.Debug("storeDetail.OpenTime1, storeDetail.CloseTime1======", storeDetail.OpenTime1, storeDetail.CloseTime1)
timeStr = splicingTimeToDoudian(storeDetail.OpenTime1, storeDetail.CloseTime1, storeDetail.OpenTime2, storeDetail.CloseTime2) timeStr = splicingTimeToDoudian(storeDetail.OpenTime1, storeDetail.CloseTime1, storeDetail.OpenTime2, storeDetail.CloseTime2)
} }
m := make(map[int64]string) 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{ ShopBatchCreateStoreParam = &shop_batchCreateStore_request.ShopBatchCreateStoreParam{
StoreList: lists, StoreList: lists,
} }
if resp, err := getAPI(storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID).BatchCreateStore(ShopBatchCreateStoreParam); err != nil { if resp, err := getAPI(storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID).BatchCreateStore(ShopBatchCreateStoreParam); err != nil {
return "", err return "", err
} else { } 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 { for k, v := range resp.ResultList {
if k != len(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) storeIDs += utils.Int64ToStr(v.Store.StoreId) + v.Store.Name + v.Store.StoreCode
//ans := resp.ResultList[0].Store
} }
return storeIDs, nil return storeIDs, nil
} }

5
business/partner/purchase/tiktok_store/warehouse.go
View File

@@ -13,7 +13,6 @@ import (
"strings" "strings"
) )
// todo
// /warehouse/createBatch 批量创建区域仓 // /warehouse/createBatch 批量创建区域仓
func (P *PurchaseHandler) BatchCreateWarehouse(param warehouse_createBatch_request.WarehouseCreateBatchParam) error { func (P *PurchaseHandler) BatchCreateWarehouse(param warehouse_createBatch_request.WarehouseCreateBatchParam) error {
infos := []warehouse_createBatch_request.OutWarehouseListItem{} infos := []warehouse_createBatch_request.OutWarehouseListItem{}
@@ -62,7 +61,7 @@ type LocalStore struct {
} }
// /warehouse/createFence 以门店方式创建电子围栏 // /warehouse/createFence 以门店方式创建电子围栏
func (P *PurchaseHandler) CreateFenceByStore(storeID int) (fenceID string, err error) { func CreateFenceByStore(storeID int) (fenceID string, err error) {
var ( var (
db *dao.DaoDB db *dao.DaoDB
localStore *LocalStore 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{ param := &warehouse_bindFencesByStore_request.WarehouseBindFencesByStoreParam{
StoreId: storeID, StoreId: storeID,
AddOutFenceIds: addOutFenceIDs, AddOutFenceIds: addOutFenceIDs,