fix:调试修改活动内容

handler/activity/inviteRegister.go

@@ -55,7 +55,7 @@ func InviteActivity(msg *model.Message) {
 
 	//投标人专属免费计划-邀请任务
 	key := fmt.Sprintf(BidderPlanInviteMissionsStatus, msg.E_userId)
-	if _, inActivity := MembershipDay.InActivity(); inActivity && redis.Get(BidderPlanRedis, key) == nil {
+	if _, inActivity, _ := MembershipDay.InActivity(); inActivity && redis.Get(BidderPlanRedis, key) == nil {
 		redis.Incr(BidderPlanRedis, key)
 		_ = redis.SetExpire(BidderPlanRedis, key, MembershipDay.cacheLong())
 	}

handler/activity/jyActivity.go

@@ -73,9 +73,11 @@ func init() {
 // InActivity 是否在活动时间内
 // bTime 是否在预热时间段内
 // iTime 是否在正式活动时间内
-func (BP *JyActivity) InActivity() (bTime, iTime bool) {
+// aTime  是否在全部活动时间内
+func (BP *JyActivity) InActivity() (bTime, iTime, aTime bool) {
 	now := time.Now()
 	bTime = now.After(MembershipDay.T1) && now.Before(MembershipDay.T2)
+	aTime = now.After(MembershipDay.T1) && now.Before(MembershipDay.Ed)
 	if bTime {
 		return
 	}
@@ -122,7 +124,7 @@ func (BP *JyActivity) GetScheduleQuery(userId string, schedule int) (status int)
 
 // ScheduleGiven 活动任务进度奖励
 func (BP *JyActivity) ScheduleGiven(userId string, schedule int) error {
-	if _, inActivity := BP.InActivity(); !inActivity {
+	if _, inActivity, _ := BP.InActivity(); !inActivity {
 		return fmt.Errorf("不在活动时间内")
 	}
 	if BP.GetScheduleQuery(userId, schedule) != 1 {
@@ -195,7 +197,7 @@ func (BP *JyActivity) MissionsSVipBuyQuery(userId string) (status int) {
 
 // MissionsSVipBuyGiven 订阅任务领取奖励
 func (BP *JyActivity) MissionsSVipBuyGiven(userId string) error {
-	if _, inActivity := BP.InActivity(); !inActivity {
+	if _, inActivity, _ := BP.InActivity(); !inActivity {
 		return fmt.Errorf("不在活动时间内")
 	}
 	status := BP.MissionsSVipBuyQuery(userId)
@@ -232,7 +234,7 @@ func (BP *JyActivity) MissionsInviteQuery(userId string) (status int) {
 
 // MissionsInviteGiven 邀请任务奖励领取
 func (BP *JyActivity) MissionsInviteGiven(userId string) error {
-	if _, inActivity := BP.InActivity(); !inActivity {
+	if _, inActivity, _ := BP.InActivity(); !inActivity {
 		return fmt.Errorf("不在活动时间内")
 	}
 	status := BP.MissionsInviteQuery(userId)
@@ -279,7 +281,7 @@ func (BP *JyActivity) MissionsShareQuery(userId string) (status int) {
 
 // MissionsShareGiven 分享活动
 func (BP *JyActivity) MissionsShareGiven(userId string) error {
-	if _, inActivity := BP.InActivity(); !inActivity {
+	if _, inActivity, _ := BP.InActivity(); !inActivity {
 		return fmt.Errorf("不在活动时间内")
 	}
 	status := BP.MissionsShareQuery(userId)

handler/activity/jyActivityOther.go

@@ -12,7 +12,7 @@ import (
 
 // ShareFinish 分享完成
 func (BP *JyActivity) ShareFinish(userId string) error {
-	if _, inActivity := BP.InActivity(); !inActivity {
+	if _, inActivity, _ := BP.InActivity(); !inActivity {
 		return fmt.Errorf("不在活动时间内")
 	}
 	if redis.Put(BidderPlanRedis, fmt.Sprintf(BidderPlanShare, userId), 1, BP.cacheLong()) != true {
@@ -26,7 +26,7 @@ func (BP *JyActivity) ShareFinish(userId string) error {
 // todayBalance 今日余额
 // err 异常
 func (BP *JyActivity) GetDailyBoonDetail(userId string) (has bool, todayBalance int, err error) {
-	if preHeatTime, _ := BP.InActivity(); !preHeatTime {
+	if preHeatTime, _, _ := BP.InActivity(); !preHeatTime {
 		err = fmt.Errorf("不在预热活动时间内")
 		return
 	}

handler/activity/lotteryService.go

@@ -32,7 +32,7 @@ type LotteryDetail struct {
 }
 
 func (BP *JyActivity) GetActivityLotteryList(userId string) ([]LotteryDetail, error) {
-	if _, inActivity := BP.InActivity(); !inActivity {
+	if _, _, inActivity := BP.InActivity(); !inActivity {
 		return nil, fmt.Errorf("不在活动时间内")
 	}
 	req, err := activityLotteryRequest(userId, "0")
@@ -50,7 +50,7 @@ func (BP *JyActivity) GetActivityLotteryList(userId string) ([]LotteryDetail, er
 
 //GetLottery 领取卡券
 func (BP *JyActivity) GetLottery(userId, userName, lotteryIds string) error {
-	if _, inActivity := BP.InActivity(); !inActivity {
+	if _, inActivity, _ := BP.InActivity(); !inActivity {
 		return fmt.Errorf("不在活动时间内")
 	}
 	lotteryRep := config.LotteryReceiveReq{

handler/award/record.go

@@ -52,7 +52,7 @@ func GetActivityAwardList(userId, activityCode, award string, pageSize, pageNum
 	if award != "" {
 		q["award"] = award
 	}
-	data, _ := db.Mgo.Find("activity_award", q, `{"date":-1}`, `{"activity_code":1,"award":1,"date":1,"getway":1,"num":1}`, false, pageNum*pageSize, pageSize)
+	data, _ := db.Mgo.Find("activity_award", q, `{"date":-1}`, "", false, pageNum*pageSize, pageSize)
 	total = db.Mgo.Count("activity_award", q)
 	if pageSize != -1 {
 		hasNext = (pageNum+1)*pageSize < total
@@ -64,6 +64,8 @@ func GetActivityAwardList(userId, activityCode, award string, pageSize, pageNum
 			v["award"] = common.InterfaceToStr(v["num"]) + config.PushConfig.Subvip
 		} else if v["award"] == "points" {
 			v["award"] = common.InterfaceToStr(v["num"]) + config.PushConfig.Points
+		} else if v["award"] == "lottery-fullReduce" {
+			v["award"] = v["detail"]
 		}
 	}
 	return *data, total, hasNext