修复状态判断

model/ly_sku.go

@@ -69,10 +69,10 @@ type LySku struct {
 
 
 type PriceActivity struct {
 type PriceActivity struct {
 	ActivityCommon
 	ActivityCommon
-	Ratio    float64 `json:"ratio"`
-	SignText string  `json:"sign_text"`
-	Sign     string  `json:"sign"`
-	ShowName string  `json:"show_name"`
+	Ratio    float64 `json:"ratio,omitempty"`
+	SignText string  `json:"sign_text,omitempty"`
+	Sign     string  `json:"sign,omitempty"`
+	ShowName string  `json:"show_name,omitempty"`
 }
 }
 
 
 type GiftActivity struct {
 type GiftActivity struct {

service/service_activity.go

@@ -52,7 +52,9 @@ func (as *ActivityService) GetGiftActivity(checkData model.ActivityCheckData, ac
 	var hasActivity bool
 	var hasActivity bool
 	nowTimestamp := int(time.Now().Unix())
 	nowTimestamp := int(time.Now().Unix())
 	for _, activity := range activities {
 	for _, activity := range activities {
-
+		if activity.Status != 1 {
+			return
+		}
 		//判断时间是否过期
 		//判断时间是否过期
 		if activity.StartTime > nowTimestamp || activity.EndTime < nowTimestamp {
 		if activity.StartTime > nowTimestamp || activity.EndTime < nowTimestamp {
 			return
 			return
@@ -103,7 +105,7 @@ func (as *ActivityService) GetGiftActivity(checkData model.ActivityCheckData, ac
 					ActivityId:   activity.ActivityId,
 					ActivityId:   activity.ActivityId,
 					ActivityName: activity.ActivityName,
 					ActivityName: activity.ActivityName,
 					AllowCoupon:  activity.AllowCoupon,
 					AllowCoupon:  activity.AllowCoupon,
-					UserScope: activity.UserScope,
+					UserScope:    activity.UserScope,
 				},
 				},
 			}
 			}
 		}
 		}
@@ -116,7 +118,9 @@ func (as *ActivityService) GetPriceActivity(checkData model.ActivityCheckData, a
 	var hasActivity bool
 	var hasActivity bool
 	nowTimestamp := int(time.Now().Unix())
 	nowTimestamp := int(time.Now().Unix())
 	for _, activity := range activities {
 	for _, activity := range activities {
-
+		if activity.Status != 1 {
+			return
+		}
 		//判断时间是否过期
 		//判断时间是否过期
 		if activity.StartTime > nowTimestamp || activity.EndTime < nowTimestamp {
 		if activity.StartTime > nowTimestamp || activity.EndTime < nowTimestamp {
 			return
 			return
@@ -183,7 +187,7 @@ func (as *ActivityService) GetPriceActivity(checkData model.ActivityCheckData, a
 					ActivityId:   activity.ActivityId,
 					ActivityId:   activity.ActivityId,
 					ActivityName: activity.ActivityName,
 					ActivityName: activity.ActivityName,
 					AllowCoupon:  activity.AllowCoupon,
 					AllowCoupon:  activity.AllowCoupon,
-					UserScope: activity.UserScope,
+					UserScope:    activity.UserScope,
 				},
 				},
 			}
 			}
 		}
 		}