|
@@ -308,22 +308,24 @@ func (self *ProductController) GetProductSizesByPid() {
|
|
|
if productKeyConfig != nil {
|
|
if productKeyConfig != nil {
|
|
|
if item.SizeType == product_model.SIZE_TYPE_1 {
|
|
if item.SizeType == product_model.SIZE_TYPE_1 {
|
|
|
attrList := product_model.GetProductAttrsByKId(productKeyConfig.Id)
|
|
attrList := product_model.GetProductAttrsByKId(productKeyConfig.Id)
|
|
|
- /*for _, attr := range attrList {
|
|
|
|
|
- if attr.Id == product.SizeId {
|
|
|
|
|
- attr.IsSelect = true
|
|
|
|
|
|
|
+ for _, attr := range attrList {
|
|
|
|
|
+ prod := product_model.GetProductByIdAndSizeId(product.RelateProductId, attr.Id, true)
|
|
|
|
|
+ if prod == nil {
|
|
|
|
|
+ continue
|
|
|
}
|
|
}
|
|
|
- }*/
|
|
|
|
|
- productKeyConfig.ProductAttr = attrList
|
|
|
|
|
|
|
+ productKeyConfig.ProductAttr = append(productKeyConfig.ProductAttr, attr)
|
|
|
|
|
+ }
|
|
|
ret.Size = productKeyConfig
|
|
ret.Size = productKeyConfig
|
|
|
}
|
|
}
|
|
|
if item.SizeType == product_model.SIZE_TYPE_2 {
|
|
if item.SizeType == product_model.SIZE_TYPE_2 {
|
|
|
attrList := product_model.GetProductAttrsByKId(productKeyConfig.Id)
|
|
attrList := product_model.GetProductAttrsByKId(productKeyConfig.Id)
|
|
|
- /* for _, attr := range attrList {
|
|
|
|
|
- if attr.Id == product.ColorId {
|
|
|
|
|
- attr.IsSelect = true
|
|
|
|
|
|
|
+ for _, attr := range attrList {
|
|
|
|
|
+ prod := product_model.GetProductByIdAndColorId(product.RelateProductId, attr.Id, true)
|
|
|
|
|
+ if prod == nil {
|
|
|
|
|
+ continue
|
|
|
}
|
|
}
|
|
|
- }*/
|
|
|
|
|
- productKeyConfig.ProductAttr = attrList
|
|
|
|
|
|
|
+ productKeyConfig.ProductAttr = append(productKeyConfig.ProductAttr, attr)
|
|
|
|
|
+ }
|
|
|
ret.Color = productKeyConfig
|
|
ret.Color = productKeyConfig
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|