Merge branch 'master' of http://119.23.72.7/q578953158/go_sku_server

service/service_zy.go

@@ -115,8 +115,8 @@ func (qs *ZiyingService) ZyGoodsDetail(ctx *gin.Context, goodsIds []string, ch c
 			standardBrand = ly.GetStandardBrand(brandId)
 		}
 
-		A.Set("brand_id", brandId)
-		A.Set("brand_name", brandName)
+		A.Set("brand_id_spu", brandId)
+		A.Set("brand_name_spu", brandName)
 		A.Set("standard_brand", standardBrand)
 
 		A.Set("class_id1", classId1)                                  //
@@ -170,9 +170,10 @@ func (qs *ZiyingService) ZyGoodsDetail(ctx *gin.Context, goodsIds []string, ch c
 		A.Set("cn_delivery_time", cnDeliveryTime) // 货期
 
 		//查询品牌名称(作废,现在改成读联营的品牌库,之前有关联自营商品到spu_id)
-		// brand_id := gjson.Get(info, "brand_id").Int()
-		// brand_info, _ := gredis.String(redisConn.Do("HGET", "Self_Brand", brand_id))
-		// A.Set("brand_name", gjson.Get(brand_info, "brand_name").String())
+		brand_id := gjson.Get(info, "brand_id").Int()
+		brand_info, _ := gredis.String(redisConn.Do("HGET", "Self_Brand", brand_id))
+		A.Set("brand_name", gjson.Get(brand_info, "brand_name").String())
+		A.Set("brand_id", brand_id)
 
 		if fast != "1" { //不是快速查询
 			// 供应商名称