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

aa

Browse Source
This commit is contained in:
苏尹岚
2021-03-17 16:22:03 +08:00
parent 2c92e8ec94
commit 556fa0913d
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -850,7 +850,7 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
} }
picType := true picType := true
for _, imgName := range []string{skuNameExt.Img, skuNameExt.Img2} { for _, imgName := range []string{skuNameExt.Img, skuNameExt.Img2, skuNameExt.Img3, skuNameExt.Img4, skuNameExt.Img5} {
if imgName != "" { if imgName != "" {
dataRes, err2 := datares.TryRegisterDataResource(ctx, skuNameExt.Name, imgName, model.ImgTypeMain, false) dataRes, err2 := datares.TryRegisterDataResource(ctx, skuNameExt.Name, imgName, model.ImgTypeMain, false)
if err = err2; err != nil { if err = err2; err != nil {
@@ -973,7 +973,7 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
} }
} }
globals.SugarLogger.Debugf("UpdateSkuName valid:%s", utils.Format4Output(valid, false)) globals.SugarLogger.Debugf("UpdateSkuName valid:%s", utils.Format4Output(valid, false))
for _, imgName := range []string{"img", "img2", "img3"} { for _, imgName := range []string{"img", "img2", "img3", "img4", "img5"} {
if valid[imgName] != nil { if valid[imgName] != nil {
if imgStr := utils.Interface2String(valid[imgName]); imgStr != "" { if imgStr := utils.Interface2String(valid[imgName]); imgStr != "" {
_, err2 := datares.TryRegisterDataResource(ctx, skuName.Name, valid[imgName].(string), model.ImgTypeMain, true) _, err2 := datares.TryRegisterDataResource(ctx, skuName.Name, valid[imgName].(string), model.ImgTypeMain, true)
@@ -2309,6 +2309,14 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
result, _ := api.MtwmAPI.GetStandardProductListWithCond(*skuName.Upc) result, _ := api.MtwmAPI.GetStandardProductListWithCond(*skuName.Upc)
if result != nil { if result != nil {
imgs := strings.Split(result.Pic, ",") imgs := strings.Split(result.Pic, ",")
switch len(imgs) {
case 1:
skuName.Img = imgs[0]
case 2:
case 3:
case 4:
case 5:
}
if len(imgs) == 1 { if len(imgs) == 1 {
skuName.Img = imgs[0] skuName.Img = imgs[0]
} }
@@ -2316,7 +2324,7 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
skuName.Img = imgs[0] skuName.Img = imgs[0]
skuName.Img2 = imgs[1] skuName.Img2 = imgs[1]
} }
if len(imgs) >= 3 { if len(imgs) == 3 {
skuName.Img = imgs[0] skuName.Img = imgs[0]
skuName.Img2 = imgs[1] skuName.Img2 = imgs[1]
skuName.Img3 = imgs[2] skuName.Img3 = imgs[2]

3
business/partner/purchase/jdshop/store_sku.go
View File

@@ -156,6 +156,9 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
if v.VendorOrgCode == "1" { if v.VendorOrgCode == "1" {
createSkuResult, err2 := getAPI(v.VendorOrgCode).CreateWare(createSkuParamWare, createSkuParamSkus) createSkuResult, err2 := getAPI(v.VendorOrgCode).CreateWare(createSkuParamWare, createSkuParamSkus)
err = err2 err = err2
if strings.Contains(err.Error(), "cookie可能过期了") {
err = nil
}
wareID = createSkuResult.WareID wareID = createSkuResult.WareID
var paramAttrs = make(map[string]*jdshopapi.CreateSkuParamSkus) var paramAttrs = make(map[string]*jdshopapi.CreateSkuParamSkus)