fix

service/service_activity.go

@@ -100,7 +100,7 @@ func (as *ActivityService) GetGiftActivity(checkData model.ActivityCheckData, ac
 					ActivityName: activity.ActivityName,
 					ActivityName: activity.ActivityName,
 					AllowCoupon:  activity.AllowCoupon,
 					AllowCoupon:  activity.AllowCoupon,
 					SignText:     activity.SignText,
 					SignText:     activity.SignText,
-					Sign:     activity.Sign,
+					Sign:         activity.Sign,
 					ShowName:     activity.ShowName,
 					ShowName:     activity.ShowName,
 				},
 				},
 			}
 			}
@@ -131,20 +131,38 @@ func (as *ActivityService) GetPriceActivity(checkData model.ActivityCheckData, a
 			goto INFO
 			goto INFO
 		}
 		}
 
 
-		//判断是否是搞活动的品牌
-		if as.CheckBrand(checkData.BrandId, activity) {
-			hasActivity = true
-			goto INFO
-		}
-
 		//如果是专卖,则要去判断canal,如果是自营,则去判断分类
 		//如果是专卖,则要去判断canal,如果是自营,则去判断分类
 		if checkData.SupplierId == 17 {
 		if checkData.SupplierId == 17 {
 			if as.CheckCanal(checkData.Canal, activity) {
 			if as.CheckCanal(checkData.Canal, activity) {
-				hasActivity = true
-				goto INFO
+				//品牌不为空,还要去判断品牌,是同时满足的关系
+				if activity.BrandIds != "" {
+					//判断是否是搞活动的品牌
+					if as.CheckBrand(checkData.BrandId, activity) {
+						hasActivity = true
+						goto INFO
+					}
+				} else {
+					hasActivity = true
+					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
 			}
 			}
@@ -161,7 +179,7 @@ func (as *ActivityService) GetPriceActivity(checkData model.ActivityCheckData, a
 					ActivityName: activity.ActivityName,
 					ActivityName: activity.ActivityName,
 					AllowCoupon:  activity.AllowCoupon,
 					AllowCoupon:  activity.AllowCoupon,
 					SignText:     activity.SignText,
 					SignText:     activity.SignText,
-					Sign:     activity.Sign,
+					Sign:         activity.Sign,
 					ShowName:     activity.ShowName,
 					ShowName:     activity.ShowName,
 				},
 				},
 			}
 			}