bug

service/service_activity.go

@@ -53,11 +53,11 @@ func (as *ActivityService) GetGiftActivity(checkData model.ActivityCheckData, ac
 	nowTimestamp := int(time.Now().Unix())
 	nowTimestamp := int(time.Now().Unix())
 	for _, activity := range activities {
 	for _, activity := range activities {
 		if activity.Status != 1 {
 		if activity.Status != 1 {
-			return
+			continue
 		}
 		}
 		//判断时间是否过期
 		//判断时间是否过期
 		if activity.StartTime > nowTimestamp || activity.EndTime < nowTimestamp {
 		if activity.StartTime > nowTimestamp || activity.EndTime < nowTimestamp {
-			return
+			continue
 		}
 		}
 
 
 		//如果是整个供应商搞活动,则直接返回系数
 		//如果是整个供应商搞活动,则直接返回系数
@@ -109,6 +109,7 @@ func (as *ActivityService) GetGiftActivity(checkData model.ActivityCheckData, ac
 				},
 				},
 			}
 			}
 		}
 		}
+		break
 	}
 	}
 
 
 	return
 	return
@@ -119,11 +120,11 @@ func (as *ActivityService) GetPriceActivity(checkData model.ActivityCheckData, a
 	nowTimestamp := int(time.Now().Unix())
 	nowTimestamp := int(time.Now().Unix())
 	for _, activity := range activities {
 	for _, activity := range activities {
 		if activity.Status != 1 {
 		if activity.Status != 1 {
-			return
+			continue
 		}
 		}
 		//判断时间是否过期
 		//判断时间是否过期
 		if activity.StartTime > nowTimestamp || activity.EndTime < nowTimestamp {
 		if activity.StartTime > nowTimestamp || activity.EndTime < nowTimestamp {
-			return
+			continue
 		}
 		}
 		//如果是整个供应商搞活动,则直接返回系数
 		//如果是整个供应商搞活动,则直接返回系数
 		if activity.EntireSupplierActivity {
 		if activity.EntireSupplierActivity {