diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 6a12e03b9..a547120ba 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -1378,6 +1378,7 @@ func changeList2Jds(list []*dao.StoreSkuSyncInfo) (rList []*dao.StoreSkuSyncInfo storeSku.UnitPrice = v[0].UnitPrice storeSku.Img = v[0].Img storeSku.Img2 = v[0].Img2 + storeSku.DescImg = v[0].DescImg rList = append(rList, storeSku) } return rList diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index 02fe77f82..dd3161782 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -501,8 +501,6 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo sql = fmt.Sprintf(sql, fmtParams...) sql += " ORDER BY t1.price" // globals.SugarLogger.Debug(sql) - fmt.Println(sql) - fmt.Println(sqlParams) if err = GetRows(db, &skus, sql, sqlParams...); err != nil { return nil, err } diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go index 894760b3b..fc9dd7e54 100644 --- a/business/partner/purchase/jdshop/store_sku.go +++ b/business/partner/purchase/jdshop/store_sku.go @@ -26,36 +26,36 @@ var ( func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) { if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID { for _, v := range storeSkuList { - _, _, err = buildCreateWareParam(v) - // if err != nil { - // failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品") - // return failedList, err - // } - // createSkuResult, err := api.JdShopAPI.CreateWare(createSkuParamWare, createSkuParamSkus) - // if err != nil { - // failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品") - // return failedList, err - // } - // var paramAttrs = make(map[string]*jdshopapi.CreateSkuParamSkus) - // var resultAttrs = make(map[string]int64) - // for _, vv := range createSkuParamSkus { - // for _, vvv := range vv.SaleAttrs { - // paramAttrs[vvv.AttrValues[0]] = vv - // } - // } - // for _, vv1 := range createSkuResult.Skus { - // for _, vvv1 := range vv1.SaleAttrs { - // if paramAttrs[vvv1.AttrValues[0]] != nil { - // resultAttrs[paramAttrs[vvv1.AttrValues[0]].OuterID] = vv1.SkuID - // } - // } - // } - // for _, vv2 := range v.StoreSkuSyncInfoJds { - // vv2.JdsWareID = createSkuResult.WareID - // if resultAttrs[utils.Int2Str(vv2.SkuID)] != 0 { - // vv2.VendorSkuID = utils.Int64ToStr(resultAttrs[utils.Int2Str(vv2.SkuID)]) - // } - // } + createSkuParamWare, createSkuParamSkus, err := buildCreateWareParam(v) + if err != nil { + failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品") + return failedList, err + } + createSkuResult, err := api.JdShopAPI.CreateWare(createSkuParamWare, createSkuParamSkus) + if err != nil { + failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品") + return failedList, err + } + var paramAttrs = make(map[string]*jdshopapi.CreateSkuParamSkus) + var resultAttrs = make(map[string]int64) + for _, vv := range createSkuParamSkus { + for _, vvv := range vv.SaleAttrs { + paramAttrs[vvv.AttrValues[0]] = vv + } + } + for _, vv1 := range createSkuResult.Skus { + for _, vvv1 := range vv1.SaleAttrs { + if paramAttrs[vvv1.AttrValues[0]] != nil { + resultAttrs[paramAttrs[vvv1.AttrValues[0]].OuterID] = vv1.SkuID + } + } + } + for _, vv2 := range v.StoreSkuSyncInfoJds { + vv2.JdsWareID = createSkuResult.WareID + if resultAttrs[utils.Int2Str(vv2.SkuID)] != 0 { + vv2.VendorSkuID = utils.Int64ToStr(resultAttrs[utils.Int2Str(vv2.SkuID)]) + } + } } } return failedList, err