Merge branch 'master' of http://git.ichunt.net/q578953158/go_sku_server

service/service_ly.go

@@ -66,6 +66,11 @@ func (ls *LyService) LyGoodsDetail(ctx *gin.Context, goodsIds []string, ch chan
 		sku = ls.GetGoodsImages(sku, spu)
 		sku = ls.GetGoodsImages(sku, spu)
 		sku = ls.GetPdf(sku, spu)
 		sku = ls.GetPdf(sku, spu)
 
 
+		//todo 2023.11.20 DGK商品的包装若为“Tape & Reel (TR)”，则递增量=起订量
+		if sku.SupplierId == 7 && sku.Packing == "Tape & Reel (TR)"{
+			sku.Multiple = sku.Moq
+		}
+
 		//获取商品名称
 		//获取商品名称
 		//1688就是mro的sku spuName和GoodsName不是一个东西，不能公用
 		//1688就是mro的sku spuName和GoodsName不是一个东西，不能公用
 		if sku.GoodsName != "" && sku.SupplierId == 1688 {
 		if sku.GoodsName != "" && sku.SupplierId == 1688 {

service/service_ly_common.go

@@ -320,13 +320,12 @@ func (ls *LyService) GetCoefficientAndPrice(sku model.LySku) model.LySku {
 				}
 				}
 				tempAcPrice := c.MyRound(c.MulFloat(price.PriceCn, sku.Ratio/100), 4)
 				tempAcPrice := c.MyRound(c.MulFloat(price.PriceCn, sku.Ratio/100), 4)
 				//价格与原价一样
 				//价格与原价一样
-				if data[key].PriceCn == tempAcPrice && key < 2 {
-					flag++
-					if flag >= 2 || (len(ladderPrice) < 2) {
-						sku.AcType = 0
-						continue
-					}
-				}
+				//if data[key].PriceCn == tempAcPrice && key < 2 {
+				//	flag++
+				//	if flag >= 2 || (len(ladderPrice) < 2) {
+				//		sku.AcType = 0
+				//	}
+				//}
 				data[key].PriceAc = tempAcPrice
 				data[key].PriceAc = tempAcPrice
 				priceAcUs := c.MyRound(c.MulFloat(price.PriceUs, sku.RatioUs/100), 4)
 				priceAcUs := c.MyRound(c.MulFloat(price.PriceUs, sku.RatioUs/100), 4)
 				data[key].PriceAcUs = priceAcUs
 				data[key].PriceAcUs = priceAcUs