Merge branch 'ysx-魔方改版-20230313' into dev

service/service_ly_common.go

@@ -497,13 +497,18 @@ func (ls *LyService) GetCoefficientAndPrice(sku model.LySku) model.LySku {
 			//美金成本价
 			//美金成本价
 			priceCostUs := c.MulFloat(price.PriceUs, usDiscountRatio)
 			priceCostUs := c.MulFloat(price.PriceUs, usDiscountRatio)
 			priceCostUs = c.MyRound(priceCostUs, 4)
 			priceCostUs = c.MyRound(priceCostUs, 4)
+			fmt.Println("美金成本价 :", priceCostUs)
 			//美金售价
 			//美金售价
 			priceUs := c.MulFloat(priceCostUs, priceRatio.RatioUsd)
 			priceUs := c.MulFloat(priceCostUs, priceRatio.RatioUsd)
+			fmt.Println("美金售价 :", priceUs)
 			//人民币成本价
 			//人民币成本价
-			priceCostCn := c.MulFloat(price.PriceUs, cnDiscountRatio, coefficient.Ratio, tax)
+			priceCostCn := c.MulFloat(price.PriceUs, coefficient.Ratio, tax)
+			priceCostCn = c.MulFloat(c.MyRound(priceCostCn, 4), cnDiscountRatio)
 			priceCostCn = c.MyRound(priceCostCn, 4)
 			priceCostCn = c.MyRound(priceCostCn, 4)
+			fmt.Println("人民币成本价 :", priceCostCn)
 			//人民币售价
 			//人民币售价
 			priceCn := c.MulFloat(priceCostCn, priceRatio.Ratio)
 			priceCn := c.MulFloat(priceCostCn, priceRatio.Ratio)
+			fmt.Println("人民币售价 :", priceCn)
 			data[key].PriceUs = c.MyRound(priceUs, 4)
 			data[key].PriceUs = c.MyRound(priceUs, 4)
 			data[key].PriceCostUs = priceCostUs
 			data[key].PriceCostUs = priceCostUs
 			//处理人民币
 			//处理人民币