fix

service/service_activity.go

@@ -131,20 +131,38 @@ func (as *ActivityService) GetPriceActivity(checkData model.ActivityCheckData, a
 			goto INFO
 			goto INFO
 		}
 		}
 
 
+		//如果是专卖,则要去判断canal,如果是自营,则去判断分类
+		if checkData.SupplierId == 17 {
+			if as.CheckCanal(checkData.Canal, activity) {
+				//品牌不为空,还要去判断品牌,是同时满足的关系
+				if activity.BrandIds != "" {
 					//判断是否是搞活动的品牌
 					//判断是否是搞活动的品牌
 					if as.CheckBrand(checkData.BrandId, activity) {
 					if as.CheckBrand(checkData.BrandId, activity) {
 						hasActivity = true
 						hasActivity = true
 						goto INFO
 						goto INFO
 					}
 					}
-
-		//如果是专卖,则要去判断canal,如果是自营,则去判断分类
-		if checkData.SupplierId == 17 {
-			if as.CheckCanal(checkData.Canal, activity) {
+				} else {
 					hasActivity = true
 					hasActivity = true
 					goto INFO
 					goto INFO
 				}
 				}
-		} else {
+			}
+		} else if checkData.SupplierId == 10000 {
 			if as.CheckClass(checkData.ClassId, activity) {
 			if as.CheckClass(checkData.ClassId, activity) {
+				//品牌不为空,还要去判断品牌,是同时满足的关系
+				if activity.BrandIds != "" {
+					//判断是否是搞活动的品牌
+					if as.CheckBrand(checkData.BrandId, activity) {
+						hasActivity = true
+						goto INFO
+					}
+				} else {
+					hasActivity = true
+					goto INFO
+				}
+			}
+		} else {
+			//判断是否是搞活动的品牌
+			if as.CheckBrand(checkData.BrandId, activity) {
 				hasActivity = true
 				hasActivity = true
 				goto INFO
 				goto INFO
 			}
 			}