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

1

Browse Source
This commit is contained in:
richboo111
2022-10-08 14:26:48 +08:00
parent bad3c99aa1 0d93520be3
commit 7a55240b84
3 changed files with 101 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
business/partner/purchase/tiktok_store/mtwm.go
View File

@@ -47,44 +47,41 @@ func (c *PurchaseHandler) GetVendorID() int {
}
func (p *PurchaseHandler) GetVendorCategories(ctx *jxcontext.Context) (vendorCats []*model.SkuVendorCategory, err error) {
cats, err := api.MtwmAPI.RetailGetSpTagIds()
cats, err := getAPI("53802960", 0, "").GetShopCategory(0)
if err != nil {
return nil, err
}
vendorCatMapList := make([]map[string]*model.SkuVendorCategory, 3)
manID := 10000
for i := 0; i < 3; i++ {
vendorCatMapList[i] = make(map[string]*model.SkuVendorCategory)
for _, v := range cats {
if v.Level == 3 {
namePathList := strings.Split(strings.Trim(v.NamePath, ","), ",")
if len(namePathList) != 3 {
panic(fmt.Sprintf("%s没有三级结构", v.NamePath))
}
name := namePathList[i]
if _, ok := vendorCatMapList[i][name]; !ok {
cat := &model.SkuVendorCategory{
VendorID: model.VendorIDMTWM,
Name: name, //utils.Interface2String(v["name"]),
Level: i + 1, //int(utils.MustInterface2Int64(v["level"])),
}
vendorCats = append(vendorCats, cat)
vendorCatMapList[i][name] = cat
if i == 2 {
cat.IsLeaf = 1
cat.VendorCategoryID = utils.Int64ToStr(v.ID)
} else {
cat.VendorCategoryID = utils.Int2Str(manID) // 非叶子结点编码没有实际使用
manID++
}
if i > 0 {
cat.ParentID = vendorCatMapList[i-1][namePathList[i-1]].VendorCategoryID
}
}
}
vendorCats = skuCategory(cats)
return vendorCats, nil
}
func skuCategory(param1 []*tiktok_api.RetailCategoryInfo) (vendorCats []*model.SkuVendorCategory) {
size := make([]*model.SkuVendorCategory, 0)
for _, v := range param1 {
param := &model.SkuVendorCategory{
VendorCategoryID: utils.Int64ToStr(v.Id),
VendorID: model.VendorIDDD,
Name: v.Name,
Level: int(v.Level),
ParentID: utils.Int64ToStr(v.ParentId),
}
if v.Enable == false {
param.IsLeaf = 0
} else {
param.IsLeaf = 1
}
if param.Name != "" {
size = append(size, param)
}
if len(v.Children) != 0 {
kk := skuCategory(v.Children)
vendorCats = append(vendorCats, kk...)
}
}
return vendorCats, nil
vendorCats = append(vendorCats, size...)
return
}
func rangeMtwm2JX(areaStr string) string {

97
business/partner/purchase/tiktok_store/mtwm_test.go
View File

@@ -1,50 +1,51 @@
package tiktok_store
//import (
// "git.rosy.net.cn/jx-callback/business/model"
// "git.rosy.net.cn/jx-callback/business/model/dao"
// "testing"
// "time"
//
// "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
//
// "git.rosy.net.cn/baseapi/utils"
// _ "git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
// "git.rosy.net.cn/jx-callback/globals/testinit"
//)
//
//const (
// testShopVendorID = "2523687"
// testShopID = 2
//)
//
//func init() {
// testinit.Init()
//}
//
//// 获取平台分类属性(三级分类标签)
//func TestGetVendorCategories(t *testing.T) {
// result, err := new(PurchaseHandler).GetVendorCategories(jxcontext.AdminCtx)
// if err != nil {
// t.Fatal(err)
// }
// for _, v := range result {
// data := model.SkuVendorCategory{
// ModelIDCUL: model.ModelIDCUL{
// CreatedAt: time.Now(),
// UpdatedAt: time.Now(),
// LastOperator: "刘磊",
// },
// VendorCategoryID: v.VendorCategoryID,
// VendorID: v.VendorID,
// Name: v.Name,
// IsLeaf: v.IsLeaf,
// Level: v.Level,
// ParentID: v.ParentID,
// }
// if err := dao.CreateEntity(dao.GetDB(), &data); err != nil {
// t.Log(utils.Format4Output(err, false))
// }
// }
// t.Log(utils.Format4Output(result, false))
//}
import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao"
"testing"
"time"
)
import (
_ "git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
"git.rosy.net.cn/jx-callback/globals/testinit"
)
const (
testShopVendorID = "2523687"
testShopID = 2
)
func init() {
testinit.Init()
}
// 获取平台分类属性(三级分类标签)
func TestGetVendorCategories(t *testing.T) {
result, err := new(PurchaseHandler).GetVendorCategories(jxcontext.AdminCtx)
if err != nil {
t.Fatal(err)
}
for _, v := range result {
data := model.SkuVendorCategory{
ModelIDCUL: model.ModelIDCUL{
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
LastOperator: "刘磊",
},
VendorCategoryID: v.VendorCategoryID,
VendorID: v.VendorID,
Name: v.Name,
IsLeaf: v.IsLeaf,
Level: v.Level,
ParentID: v.ParentID,
}
if err := dao.CreateEntity(dao.GetDB(), &data); err != nil {
t.Log(utils.Format4Output(err, false))
}
}
t.Log(utils.Format4Output(result, false))
}

30
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 {
tOpenTime1 := utils.Int64ToStr(int64(openTime1))
len1 := len(tOpenTime1) - 2
<<<<<<< HEAD
if utils.Str2Int(tOpenTime1[:len1]) <= 9 {
s1 += "0"
}
@@ -62,10 +63,17 @@ func splicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) (
close1 += "0" + tCloseTime1[len2+1:]
}
s2 = tCloseTime1[:len2] + ":" + close1 + "0"
=======
s1 := tOpenTime1[:len1] + ":" + tOpenTime1[len1+1:]
tCloseTime1 := utils.Int64ToStr(int64(closeTime1))
len2 := len(tCloseTime1) - 2
s2 := tCloseTime1[:len2] + ":" + tCloseTime1[len2+1:]
>>>>>>> 0d93520be39ae41e26cbc68786994fc7dd0b4db9
timeStr += s1 + "-" + s2
if openTime2 != 0 && closeTime2 != 0 {
tOpenTime2 := utils.Int64ToStr(int64(openTime2))
len3 := len(tOpenTime2) - 2
<<<<<<< HEAD
if utils.Str2Int(tOpenTime2[:len3]) <= 9 {
s3 += "0"
}
@@ -84,6 +92,13 @@ func splicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) (
s4 = tCloseTime2[:len4] + ":" + close2 + "0"
timeStr += "," + s3 + "-" + s4
=======
s3 := tOpenTime2[:len3] + ":" + tOpenTime2[len3+1:]
tCloseTime2 := utils.Int64ToStr(int64(closeTime2))
len4 := len(tCloseTime2) - 2
s4 := tCloseTime2[:len4] + ":" + tCloseTime2[len4+1:]
timeStr += " " + s3 + "-" + s4
>>>>>>> 0d93520be39ae41e26cbc68786994fc7dd0b4db9
}
}
return timeStr
@@ -101,18 +116,21 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
return "", fmt.Errorf("营业时间必填")
} else {
timeStr = splicingTimeToDoudian(storeDetail.OpenTime1, storeDetail.CloseTime1, storeDetail.OpenTime2, storeDetail.CloseTime2)
globals.SugarLogger.Debug("timeStr", timeStr)
}
m := make(map[int64]string)
for j := 1; j <= 7; j++ {
<<<<<<< HEAD
globals.SugarLogger.Debug("我在==========timeStr")
m[int64(j)] = timeStr
//globals.SugarLogger.Debug("================", m[1])
=======
m[int64(j)] = timeStr
>>>>>>> 0d93520be39ae41e26cbc68786994fc7dd0b4db9
}
list := shop_batchCreateStore_request.StoreListItem{
RowId: 1,
Name: storeDetail.Name,
StoreCode: utils.Int2Str(storeDetail.ID),
StoreCode: utils.Int2Str(storeDetail.Store.ID),
Longitude: utils.Float64ToStr(jxutils.IntCoordinate2Standard(storeDetail.Lng)),
Latitude: utils.Float64ToStr(jxutils.IntCoordinate2Standard(storeDetail.Lat)),
Province: storeDetail.ProvinceName,
@@ -124,25 +142,21 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
DayMap: m,
},
}
globals.SugarLogger.Debug("检测list========", list)
lists = append(lists, list)
ShopBatchCreateStoreParam = &shop_batchCreateStore_request.ShopBatchCreateStoreParam{
StoreList: lists,
}
globals.SugarLogger.Debug("检测param========", ShopBatchCreateStoreParam)
globals.SugarLogger.Debug("-=-======================", storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID)
if resp, err := getAPI(storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID).BatchCreateStore(ShopBatchCreateStoreParam); err != nil {
globals.SugarLogger.Debug("检测resp1==========", resp)
return "", err
} else {
globals.SugarLogger.Debug("检测resp2==========", resp)
for k, v := range resp.ResultList {
if k != len(resp.ResultList) {
storeIDs += utils.Int64ToStr(v.Store.StoreId) + ","
}
storeIDs += utils.Int64ToStr(v.Store.StoreId)
}
return storeIDs, err
return storeIDs, nil
}
}