bug

service/service_activity.go

@@ -68,8 +68,7 @@ func (as *ActivityService) GetGiftActivity(checkData model.ActivityCheckData, ac
 
 		//判断是否是排除的sku或者品牌,如果是的话,直接返回没活动
 		if as.CheckExcludeSku(checkData.GoodsId, activity) || as.CheckExcludeBrand(checkData.BrandId, activity) {
-			hasActivity = false
-			goto INFO
+			continue
 		}
 
 		//判断是否是搞活动的品牌
@@ -108,9 +107,9 @@ func (as *ActivityService) GetGiftActivity(checkData model.ActivityCheckData, ac
 					UserScope:    activity.UserScope,
 				},
 			}
-		}
 			break
 		}
+	}
 
 	return
 }
@@ -134,8 +133,7 @@ func (as *ActivityService) GetPriceActivity(checkData model.ActivityCheckData, a
 
 		//判断是否是排除的sku或者品牌,如果是的话,直接返回没活动
 		if as.CheckExcludeSku(checkData.GoodsId, activity) || as.CheckExcludeBrand(checkData.BrandId, activity) {
-			hasActivity = false
-			goto INFO
+			continue
 		}
 
 		//如果是专卖,则要去判断canal,如果是自营,则去判断分类
@@ -191,9 +189,9 @@ func (as *ActivityService) GetPriceActivity(checkData model.ActivityCheckData, a
 					UserScope:    activity.UserScope,
 				},
 			}
-		}
 			break
 		}
+	}
 
 	priceActivity.HasActivity = hasActivity
 	return