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:
邹宗楠
2024-10-16 09:17:05 +08:00
parent a6e6222075
commit 32cde499da
28 changed files with 271 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
business/jxstore/cms/sku.go
View File

@@ -1153,9 +1153,9 @@ type aa struct {
func getCategoryByName(name string) string {
handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IPurchasePlatformStoreSkuHandler)
vendorOrgCode := ""
if beego.BConfig.RunMode == "jxgy" {
if beego.BConfig.RunMode == model.ServerTypeFruits {
vendorOrgCode = "339032"
} else if beego.BConfig.RunMode == "jxpet" {
} else if beego.BConfig.RunMode == model.ServerTypePet {
vendorOrgCode = "jxpet_apporg_code"
} else {
vendorOrgCode = "320406"
@@ -1175,9 +1175,9 @@ func getCategoryByImg(img ...string) string {
}
handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDDD).(partner.IPurchasePlatformStoreSkuHandler)
vendorOrgCode := ""
if beego.BConfig.RunMode == "jxgy" {
if beego.BConfig.RunMode == model.ServerTypeFruits {
vendorOrgCode = "57939570"
} else if beego.BConfig.RunMode == "jxpet" {
} else if beego.BConfig.RunMode == model.ServerTypePet {
vendorOrgCode = "57939570"
} else {
vendorOrgCode = "57939570"

2
business/jxstore/cms/store.go
View File

@@ -4667,7 +4667,7 @@ func RefreshTiktokShopToken(ctx *jxcontext.Context) (err error) {
v.UpdatedAt = time.Now()
v.StoreBrandName = "定时任务更新"
dao.UpdateEntity(db, v, "Token", "UpdatedAt", "StoreBrandName")
tiktok_store.HttpToGuoYuan(utils.Struct2MapByJson(v), tiktok_store.CaiShiPushGyTagToken)
tiktok_store.HttpToGuoYuan(utils.Struct2MapByJson(v), tiktok_store.CaiShiPushGyTagToken, model.ServerTypeFruits)
}
}
}

2
business/jxstore/cms/store_sku.go
View File

@@ -1726,7 +1726,7 @@ func UpdateStoreSkus(ctx *jxcontext.Context, causeFlag, storeID int, skuBindInfo
}
func UpdateStoresSkus(ctx *jxcontext.Context, causeFlag int, storeIDs []int, skuBindInfos []*StoreSkuBindInfo, isScale, isRefreshHigh, isAsync, isContinueWhenError bool) (hint string, err error) {
if beego.BConfig.RunMode == "jxgy" || beego.BConfig.RunMode == "jxpet" {
if beego.BConfig.RunMode == model.ServerTypeFruits || beego.BConfig.RunMode == model.ServerTypePet {
doStoreSkuAuditForGy(ctx, storeIDs, skuBindInfos)
var num int64
db := dao.GetDB()

8
business/jxstore/cms/sync_store_sku.go
View File

@@ -76,10 +76,10 @@ func SyncStoreCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendo
if storeID != 668594 && storeID != 668469 && vendorID == model.VendorIDTaoVegetable {
var totalCategory []*model.StoreSkuCategoryMap
switch beego.BConfig.RunMode {
case "dev":
case model.ServerTypeVegetable: // "dev"
totalCategory, _ = dao.GetDetailStoreSkuCategoryMap(db, 668469)
case "jxgy":
case "jxpet":
case model.ServerTypeFruits:
case model.ServerTypePet:
default:
totalCategory, _ = dao.GetDetailStoreSkuCategoryMap(db, 668594)
@@ -390,7 +390,7 @@ func formalizeStoreSkuList(inSkuList []*dao.StoreSkuSyncInfo) []*dao.StoreSkuSyn
skuItem.SkuName = jxutils.ComposeSkuNameSync(skuItem.Prefix, skuItem.Name, skuItem.Comment, skuItem.Unit, skuItem.SpecQuality, skuItem.SpecUnit, 0, skuItem.ExPrefix, skuItem.ExPrefixBegin, skuItem.ExPrefixEnd, (skuItem.BrandID == skuItem.ExBrandID && skuItem.ExBrandID != 0) || skuItem.ExBrandID == 0)
}
//水果美团标品用原名字
if skuItem.VendorID == model.VendorIDMTWM && web.BConfig.RunMode == "jxgy" && skuItem.Unit != model.UnitNames[0] {
if skuItem.VendorID == model.VendorIDMTWM && web.BConfig.RunMode == model.ServerTypeFruits && skuItem.Unit != model.UnitNames[0] {
skuItem.SkuName = skuItem.Name
}
skuItem.SkuNameOrigin = jxutils.ComposeSkuNameOriginal(skuItem.Prefix, skuItem.Name, skuItem.Comment, skuItem.Unit, skuItem.SpecQuality, skuItem.SpecUnit, 0)

2
business/jxstore/cms/user2.go
View File

@@ -1280,7 +1280,7 @@ func SendQywxPeopleCount(ctx *jxcontext.Context) (err error) {
db = dao.GetDB()
groupIDMap = make(map[string][]interface{})
)
if beego.BConfig.RunMode == "jxgy" {
if beego.BConfig.RunMode == model.ServerTypeFruits {
groupIDMap[qywxapi.GyGroupID] = []interface{}{1, "京西果园"}
} else {
groupIDMap[qywxapi.BldGroupID] = []interface{}{7, "京西超市"}

17
business/jxstore/misc/misc.go
View File

@@ -294,7 +294,7 @@ func Init() {
// }, []string{"13:00:00"})
//}
if beego.BConfig.RunMode != "jxgy" {
if beego.BConfig.RunMode != model.ServerTypeFruits && beego.BConfig.RunMode != model.ServerTypePet {
ScheduleTimerFunc("RefreshSyncSkuListTao", func() {
syncStoreSkuTao()
}, []string{
@@ -303,7 +303,7 @@ func Init() {
}
// 刷新抖音门店token
if beego.BConfig.RunMode != "jxgy" {
if beego.BConfig.RunMode != model.ServerTypeFruits && beego.BConfig.RunMode != model.ServerTypePet {
ScheduleTimerFuncByInterval(func() {
cms.RefreshTiktokShopToken(jxcontext.AdminCtx)
}, 60*time.Second, 30*time.Minute)
@@ -495,7 +495,8 @@ func Init() {
cms.AutoSaleStoreSku(jxcontext.AdminCtx, nil, true)
}, autoSaleStoreSkuTimeList)
if beego.BConfig.RunMode == "jxgy" {
// 菜市无聊信息同步到果园
if beego.BConfig.RunMode == model.ServerTypeFruits {
ScheduleTimerFunc("SyncMatterC4ToGy", func() {
cms.SyncMatterC4ToGy(jxcontext.AdminCtx, true, true)
}, dailyWorkTimeList)
@@ -579,11 +580,7 @@ func Init() {
func syncStoreSku() {
syncFlag := 0
if beego.BConfig.RunMode == "jxgy" {
syncFlag |= model.SyncFlagPriceMask // SyncFlagSaleMask
} else {
syncFlag |= model.SyncFlagPriceMask // SyncFlagSaleMask
}
syncFlag |= model.SyncFlagPriceMask // SyncFlagSaleMask
task := tasksch.NewParallelTask("同步京西与平台数据", nil, jxcontext.AdminCtx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
step := batchItemList[0].(int)
@@ -591,7 +588,7 @@ func syncStoreSku() {
db := dao.GetDB()
switch step {
case 0:
if beego.BConfig.RunMode != "jxgy" {
if beego.BConfig.RunMode != model.ServerTypeFruits && beego.BConfig.RunMode != model.ServerTypePet {
errList.AddErr(cms.DeleteSkuNameExPrefixOverdue(db))
errList.AddErr(cms.SetMultiStoreSkuSyncModifyStatus(db, partner.GetMultiStoreVendorIDs()))
@@ -640,7 +637,7 @@ func syncStoreSkuTiktok() {
db := dao.GetDB()
switch step {
case 0:
if beego.BConfig.RunMode != "jxgy" {
if beego.BConfig.RunMode != model.ServerTypeFruits && beego.BConfig.RunMode != model.ServerTypePet {
_, err = cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, nil, 0, db, []int{model.VendorIDDD}, nil, false, nil, nil, syncFlag, true, true)
errList.AddErr(err)
}