Merge branch 'ysx-特殊币种人民币是否含税-20230828' into dev

service/service_ly_common.go

@@ -274,6 +274,7 @@ func (ls *LyService) GetCoefficientAndPrice(sku model.LySku) model.LySku {
 	//专卖价格获取
 	//专卖价格获取
 	if sku.SupplierId == 17 {
 	if sku.SupplierId == 17 {
 		ladderPrice := sku.LadderPrice
 		ladderPrice := sku.LadderPrice
+		sku = priceService.TransformSpecialSupplierPrice(sku)
 		//判断redis里面是否有成本价,有的话,那就直接去取价格,不需要生成阶梯价
 		//判断redis里面是否有成本价,有的话,那就直接去取价格,不需要生成阶梯价
 		//如果没有成本价字段,就要去生成阶梯价格
 		//如果没有成本价字段,就要去生成阶梯价格
 		if len(ladderPrice) > 0 {
 		if len(ladderPrice) > 0 {
@@ -285,9 +286,7 @@ func (ls *LyService) GetCoefficientAndPrice(sku model.LySku) model.LySku {
 		}
 		}
 		//获取折扣系数
 		//获取折扣系数
 		sku = priceService.GetDiscountRatio(sku)
 		sku = priceService.GetDiscountRatio(sku)
-
 		data = make([]model.LadderPrice, len(ladderPrice))
 		data = make([]model.LadderPrice, len(ladderPrice))
-		sku = priceService.TransformSpecialSupplierPrice(sku)
 
 
 		for key, price := range ladderPrice {
 		for key, price := range ladderPrice {
 			if price.Purchases == 0 {
 			if price.Purchases == 0 {