Merge branch 'master' into ysx-价格体系修改-20230815

# Conflicts:
#	service/service_price.go

service/service_ly.go

@@ -58,7 +58,7 @@ func (ls *LyService) LyGoodsDetail(ctx *gin.Context, goodsIds []string, ch chan
 		sku.GoodsId = goodsId
 		sku.GoodsId = goodsId
 		spu := spuList[sku.SpuId]
 		spu := spuList[sku.SpuId]
 		//读取包装字段的缓存
 		//读取包装字段的缓存
-		if sku.SupplierId == 7 || sku.SupplierId == 13 {
+		if sku.SupplierId == 7 || sku.SupplierId == 13 || sku.SupplierId == 1688 {
 			//sku_raw_map哪里写入(成意写的)
 			//sku_raw_map哪里写入(成意写的)
 			packing, _ := redis.String(redisConnSpu.Do("HGET", "sku_raw_map", goodsId))
 			packing, _ := redis.String(redisConnSpu.Do("HGET", "sku_raw_map", goodsId))
 			sku.Packing = gjson.Get(packing, "pack").String()
 			sku.Packing = gjson.Get(packing, "pack").String()