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-14 12:41:49 +08:00
parent 1c136089da
commit e17042afd0
11 changed files with 166 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -865,23 +865,6 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
}
}
//picType := true
//for _, imgName := range []string{skuNameExt.Img, skuNameExt.Img2, skuNameExt.Img3, skuNameExt.Img4, skuNameExt.Img5} {
// if imgName != "" {
// dataRes, err2 := datares.TryRegisterDataResource(ctx, skuNameExt.Name, imgName, model.ImgTypeMain, false)
// if err = err2; err != nil {
// return nil, err
// }
// if dataRes.ResourceType == model.MimeTypeJpeg || dataRes.ResourceType == model.MimeTypePng {
// picType = false
// }
// }
//}
//if picType {
// return nil, fmt.Errorf("商品图片应至少包含一张非gif格式的图片！")
//}
if skuNameExt.DescImg != "" {
dataRes, err2 := datares.TryRegisterDataResource(ctx, skuNameExt.Name+"desc", skuNameExt.DescImg, model.ImgTypeDesc, false)
if err = err2; err != nil {
@@ -912,12 +895,8 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
sku := v.Sku
dao.WrapAddIDCULDEntity(sku, userName)
sku.NameID = skuNameExt.ID
if beego.BConfig.RunMode == "jxgy" {
sku.LadderBoxPrice = 0
} else if beego.BConfig.RunMode == "prod" {
sku.LadderBoxPrice = 10
}
sku.LadderBoxNum = 1
sku.LadderBoxPrice = 0
sku.LadderBoxNum = 0
if err = dao.CreateEntity(db, sku); err != nil {
dao.Rollback(db, txDB)
return nil, err
@@ -1176,6 +1155,8 @@ func getCategoryByName(name string) string {
vendorOrgCode := ""
if beego.BConfig.RunMode == "jxgy" {
vendorOrgCode = "339032"
} else if beego.BConfig.RunMode == "jxpet" {
vendorOrgCode = "jxpet_apporg_code"
} else {
vendorOrgCode = "320406"
}
@@ -1196,6 +1177,8 @@ func getCategoryByImg(img ...string) string {
vendorOrgCode := ""
if beego.BConfig.RunMode == "jxgy" {
vendorOrgCode = "57939570"
} else if beego.BConfig.RunMode == "jxpet" {
vendorOrgCode = "57939570"
} else {
vendorOrgCode = "57939570"
}
@@ -1536,12 +1519,8 @@ func AddSku(ctx *jxcontext.Context, nameID int, sku *model.Sku, userName string)
// sku.JdSyncStatus = model.SyncFlagNewMask
// sku.JdID = 0
sku.NameID = nameID
if beego.BConfig.RunMode == "jxgy" {
sku.LadderBoxPrice = 0
} else if beego.BConfig.RunMode == "prod" {
sku.LadderBoxPrice = 10
}
sku.LadderBoxNum = 1
sku.LadderBoxPrice = 0
sku.LadderBoxNum = 0
txDB, _ := dao.Begin(db)
defer func() {
if r := recover(); r != nil {

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" {
if beego.BConfig.RunMode == "jxgy" || beego.BConfig.RunMode == "jxpet" {
doStoreSkuAuditForGy(ctx, storeIDs, skuBindInfos)
var num int64
db := dao.GetDB()

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

@@ -79,6 +79,7 @@ func SyncStoreCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendo
case "dev":
totalCategory, _ = dao.GetDetailStoreSkuCategoryMap(db, 668469)
case "jxgy":
case "jxpet":
default:
totalCategory, _ = dao.GetDetailStoreSkuCategoryMap(db, 668594)