diff --git a/business/jxstore/misc/store_sku_sales.go b/business/jxstore/misc/store_sku_sales.go index 97ca1c5a0..5ba3f19de 100644 --- a/business/jxstore/misc/store_sku_sales.go +++ b/business/jxstore/misc/store_sku_sales.go @@ -139,15 +139,26 @@ func GetStoreSkuSalesInfo(ctx *jxcontext.Context, storeID int) (outStoreSkuSales skuID := value.SkuID storeSkuSales := &model.StoreSkuSales{} storeSkuSales.SkuID = skuID - if storeSkuMapData[skuID] != nil { - storeSkuSales.SkuName = storeSkuMapData[skuID].Name - storeSkuSales.SkuPrice = jxutils.IntPrice2StandardCurrencyString(int64(storeSkuMapData[skuID].Skus2[0].BindPrice)) - } else if skuAndNameMapData[skuID] != nil { - storeSkuSales.SkuName = skuAndNameMapData[skuID].Name - storeSkuSales.SkuPrice = "0" + storeSkuInfo := storeSkuMapData[skuID] + skuAndNameInfo := skuAndNameMapData[skuID] + if storeSkuInfo != nil { + skuName := storeSkuInfo.SkuName + skuInfo := storeSkuInfo.Skus2[0] + storeSkuSales.SkuName = jxutils.ComposeSkuName(skuName.Prefix, skuName.Name, skuInfo.Comment, skuName.Unit, skuInfo.SkuSpecQuality, skuInfo.SkuSpecUnit, 0) + storeSkuSales.SkuImage = storeSkuInfo.Img + storeSkuSales.SkuPrice = jxutils.IntPrice2StandardCurrencyString(int64(storeSkuInfo.Skus2[0].BindPrice)) + } else if skuAndNameInfo != nil { + skuNameList, err := dao.GetSkuNames(db, []int{skuAndNameInfo.NameID}) + prefix := "" + if err == nil && len(skuNameList) > 0 { + storeSkuSales.SkuImage = skuNameList[0].Img + prefix = skuNameList[0].Prefix + } + storeSkuSales.SkuName = jxutils.ComposeSkuName(prefix, skuAndNameInfo.Name, skuAndNameInfo.Comment, skuAndNameInfo.Unit, skuAndNameInfo.SpecQuality, skuAndNameInfo.SpecUnit, 0) + storeSkuSales.SkuPrice = "N/A" } else { storeSkuSales.SkuName = "N/A" - storeSkuSales.SkuPrice = "0" + storeSkuSales.SkuPrice = "N/A" } storeSkuSales.SkuAvgPrice = jxutils.IntPrice2StandardCurrencyString(int64(skusAveragePrice[skuID])) storeSkuSales.BadCommentCnt = storeSkuBadCommentCntMap[skuID] diff --git a/business/model/store_sku_sales.go b/business/model/store_sku_sales.go index 909a7f574..2f6bc3bba 100644 --- a/business/model/store_sku_sales.go +++ b/business/model/store_sku_sales.go @@ -3,6 +3,7 @@ package model type StoreSkuSales struct { SkuID int `json:"skuID"` SkuName string `json:"skuName"` + SkuImage string `json:"skuImage"` SkuPrice string `json:"skuPrice"` SkuAvgPrice string `json:"skuAvgPrice"` BadCommentCnt int `json:"badCommentCnt"`