diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index c54c951e6..3a2a1021e 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -1491,42 +1491,45 @@ func SumExianDaDepot(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) globals.SugarLogger.Debugf("GetExianDaSku,[%v]", v.ElemeGoodsID) return result, err } - sku := &model.Sku{} - sku.ExdSkuID = v.ElemeGoodsID - dao.GetEntity(db, sku, "ExdSkuID") - // skuNameExt := &model.SkuName{} - // sql2 := ` - // SELECT a.* - // FROM sku_name a - // JOIN sku b ON b.name_id = a.id - // WHERE a.upc = ? - // ` - // sqlParams2 := []interface{}{ - // skus.UpcIds[0], - // } - // dao.GetRow(db, skuNameExt, sql2, sqlParams2) + // sku := &model.Sku{} + // sku.ExdSkuID = v.ElemeGoodsID + // sku.DeletedAt = utils.DefaultTimeValue + // dao.GetEntity(db, sku, "ExdSkuID","DeletedAt") + skuNameExt := &model.SkuName{} + sql2 := ` + SELECT a.* + FROM sku_name a + JOIN sku b ON b.name_id = a.id + WHERE a.upc = ? + AND a.deleted_at = ? AND b.deleted_at = ? + ` + sqlParams2 := []interface{}{ + skus.UpcIds[0], + utils.DefaultTimeValue, utils.DefaultTimeValue, + } + dao.GetRow(db, skuNameExt, sql2, sqlParams2) prefix, _, _, specUnit, unit, specQuality := jxutils.SplitSkuName(v.GoodsName) //京西库中存在此商品 - if sku.ID != 0 { - // var flag = false - // if skuNameExt.Name != v.GoodsName { - // skuNameExt.Name = v.GoodsName - // skuNameExt.Prefix = prefix - // skuNameExt.SpecUnit = specUnit - // skuNameExt.Unit = unit - // skuNameExt.SpecQuality = specQuality - // flag = true - // } - // if skuNameExt.Img != v.ImageURL { - // skuNameExt.Img = v.ImageURL - // flag = true - // } - // if flag { - // _, err = dao.UpdateEntity(db, skuNameExt, "Name", "Prefix", "SpecUnit", "Unit", "SpecQuality", "Img") - // if err != nil { - // return result, err - // } - // } + if skuNameExt.ID != 0 { + var flag = false + if skuNameExt.Name != v.GoodsName { + skuNameExt.Name = v.GoodsName + skuNameExt.Prefix = prefix + skuNameExt.SpecUnit = specUnit + skuNameExt.Unit = unit + skuNameExt.SpecQuality = specQuality + flag = true + } + if skuNameExt.Img != v.ImageURL { + skuNameExt.Img = v.ImageURL + flag = true + } + if flag { + _, err = dao.UpdateEntity(db, skuNameExt, "Name", "Prefix", "SpecUnit", "Unit", "SpecQuality", "Img") + if err != nil { + return result, err + } + } } else { skuName := &model.SkuName{ Prefix: prefix,