diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 651293978..b0bc59a97 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -2232,7 +2232,7 @@ func GetTopSkusByCityCode(ctx *jxcontext.Context, cityCode, storeID int) (skuNam skuNameAndPlace, err := dao.GetTopSkusByCityCode(db, cityCode, orderCreate) if storeID > 0 { var skuNameList []*model.SkuName - //未关注,不可售的商品nameID列表 + //不可售的商品nameID列表 sql := ` SELECT DISTINCT b.name_id id,1 brand_id FROM store_sku_bind a @@ -2281,8 +2281,8 @@ func GetTopSkusByCityCode(ctx *jxcontext.Context, cityCode, storeID int) (skuNam v.Type = skuNameMap[v.ID].BrandID skuList, _ := dao.GetSkus(db, nil, []int{v.ID}, nil, nil) v.Skus = skuList - var storeSkuNameExt []*dao.StoreSkuNameExt for _, vv := range skuList { + var storeSkuNameExt []*dao.StoreSkuNameExt var skusList []*dao.StoreSkuExt skus := &dao.StoreSkuExt{ SkuID: vv.ID, @@ -2294,14 +2294,16 @@ func GetTopSkusByCityCode(ctx *jxcontext.Context, cityCode, storeID int) (skuNam skuNamesInfo := &dao.StoreSkuNamesInfo{ SkuNames: storeSkuNameExt, } + storeSkuNameExt = append(storeSkuNameExt, storeSkuName) dao.UpdateActPrice4StoreSkuNameNew(db, []int{storeID}, []int{vv.ID}, skuNamesInfo, -1) vv.StoreSkuStatus = model.StoreSkuBindStatusDontSale - // vv.ActPrice = skuNamesInfo.SkuNames[0].Skus[0].ActPrice - // vv.ActID = skuNamesInfo.SkuNames[0].Skus[0].ActID - // vv.ActType = skuNamesInfo.SkuNames[0].Skus[0].ActType - // vv.EarningPrice = skuNamesInfo.SkuNames[0].Skus[0].EarningPrice - // vv.EarningActID = skuNamesInfo.SkuNames[0].Skus[0].EarningActID - storeSkuNameExt = append(storeSkuNameExt, storeSkuName) + if skuNamesInfo.SkuNames[0].Skus[0] != nil { + vv.ActPrice = skuNamesInfo.SkuNames[0].Skus[0].ActPrice + vv.ActID = skuNamesInfo.SkuNames[0].Skus[0].ActID + vv.ActType = skuNamesInfo.SkuNames[0].Skus[0].ActType + vv.EarningPrice = skuNamesInfo.SkuNames[0].Skus[0].EarningPrice + vv.EarningActID = skuNamesInfo.SkuNames[0].Skus[0].EarningActID + } } skuNameAndPlaceList = append(skuNameAndPlaceList, v) } diff --git a/business/model/sku.go b/business/model/sku.go index 3c6203e24..cd540411c 100644 --- a/business/model/sku.go +++ b/business/model/sku.go @@ -231,18 +231,18 @@ type Sku struct { type SkuAndName struct { Sku - Name string - Unit string - Prefix string - IsSpu int - ExPrefix string - ExPrefixBegin *time.Time - ExPrefixEnd *time.Time - Price int - StoreSkuStatus int - ActPrice int `json:"actPrice"` - ActID int `orm:"column(act_id)" json:"actID"` - ActType int `orm:"column(act_type)" json:"actType"` + Name string `json:"name"` + Unit string `json:"unit"` + Prefix string `json:"prefix"` + IsSpu int `json:"isSpu"` + ExPrefix string `json:"exPrefix"` + ExPrefixBegin *time.Time `json:"exPrefixBegin"` + ExPrefixEnd *time.Time `json:"eExPrefixEndxPrefixEnd"` + Price int `json:"price"` + StoreSkuStatus int `json:"storeSkuStatus"` + ActPrice int `json:"actPrice"` + ActID int `orm:"column(act_id)" json:"actID"` + ActType int `orm:"column(act_type)" json:"actType"` EarningPrice int `json:"earningPrice"` EarningActID int `orm:"column(earning_act_id)" json:"earningActID"`