判断活动价

service/service_ly_common.go

@@ -316,19 +316,20 @@ func (ls *LyService) GetCoefficientAndPrice(sku model.LySku) model.LySku {
 			if (sku.GoodsType == 1 || sku.GoodsType == 2 || sku.GoodsType == 6) && sku.AcType > 1 && sku.Ratio > 0 {
 				tempAcPrice := c.MyRound(c.MulFloat(price.PriceCn, sku.Ratio/100), 4)
 				data[key].PriceAc = tempAcPrice
-				data[key].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
 
 				//优惠价后等于0,就代表没有搞活动
-				if tempAcPrice <= 0 {
+				if tempAcPrice <= 0 && priceAcUs <= 0 {
 					sku.AcType = 0
 				}
 				//价格与原价一样
-				//if data[key].PriceCn == tempAcPrice && key < 2 {
-				//	flag++
-				//	if flag >= 2 || (len(ladderPrice) < 2) {
-				//		sku.AcType = 0
-				//	}
-				//}
+				if data[key].PriceCn == tempAcPrice && key < 2 {
+					flag++
+					if flag >= 2 || (len(ladderPrice) < 2) {
+						sku.AcType = 0
+					}
+				}
 			}
 		}
 	} else {