Merge branch 'ysx-测试分支-20230419' into dev

pkg/vars/sku.go

@@ -17,17 +17,17 @@ var GoodsTags = map[int]string{
 }
 }
 
 
 var StockInfoSupplierMap = map[int64]string{
 var StockInfoSupplierMap = map[int64]string{
-	6:    "element14",
-	7:    "digikey",
-	14:   "mouser",
-	21:   "rs",
-	1672: "master",
+	// 6:    "element14",
+	7: "digikey",
+	// 14:   "mouser",
+	// 21:   "rs",
+	// 1672: "master",
 }
 }
 
 
 var StockInfoSupplierIds = []int64{
 var StockInfoSupplierIds = []int64{
-	6,
+	// 6,
 	7,
 	7,
-	14,
-	21,
-	1672,
+	// 14,
+	// 21,
+	// 1672,
 }
 }

service/service_ly.go

@@ -124,9 +124,9 @@ func (ls *LyService) LyGoodsDetail(ctx *gin.Context, goodsIds []string, ch chan
 		sku.StandardBrand = ls.GetStandardBrand(brandId)
 		sku.StandardBrand = ls.GetStandardBrand(brandId)
 
 
 		//处理过期,todo 2022.7.13 专卖没有过期
 		//处理过期,todo 2022.7.13 专卖没有过期
-		if sku.SupplierId != 17 && gjson.Get(skuStr, "is_expire").Int() != 0 {
-			sku.LadderPrice = nil
-		}
+		// if sku.SupplierId != 17 && gjson.Get(skuStr, "is_expire").Int() != 0 {
+		// 	sku.LadderPrice = nil
+		// }
 
 
 		//处理活动
 		//处理活动
 		sku.AcType = 0
 		sku.AcType = 0