wip:提交

handler/activity/jyActivity.go

@@ -58,6 +58,7 @@ func init() {
 		T2: gtime.NewFromStrLayout(gcfg.Instance().MustGet(gctx.New(), "jyactivity.dateRange.t2").String(), "2006-01-02T15:04:05Z").Time,
 		Ed: gtime.NewFromStrLayout(gcfg.Instance().MustGet(gctx.New(), "jyactivity.dateRange.ed").String(), "2006-01-02T15:04:05Z").Time,
 	}
+	MembershipDay.DailyClock = gcfg.Instance().MustGet(gctx.New(), "jyactivity.dailyBoon.clock").String()
 	MembershipDay.ActivityCode = gcfg.Instance().MustGet(gctx.New(), "jyactivity.code").String()
 	//加载任务
 	if loadMissionsErr := gcfg.Instance().MustGet(gctx.New(), "jyactivity.missions").Scan(&MembershipDay.Missions); loadMissionsErr != nil {
@@ -122,7 +123,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 {
-		return fmt.Errorf("活动已结束")
+		return fmt.Errorf("不在活动时间内")
 	}
 	if BP.GetScheduleQuery(userId, schedule) != 1 {
 		return fmt.Errorf("非领取状态")
@@ -195,7 +196,7 @@ func (BP *JyActivity) MissionsSVipBuyQuery(userId string) (status int) {
 // MissionsSVipBuyGiven 订阅任务领取奖励
 func (BP *JyActivity) MissionsSVipBuyGiven(userId string) error {
 	if _, inActivity := BP.InActivity(); !inActivity {
-		return fmt.Errorf("活动已结束")
+		return fmt.Errorf("不在活动时间内")
 	}
 	status := BP.MissionsSVipBuyQuery(userId)
 	if status != 1 {
@@ -232,7 +233,7 @@ func (BP *JyActivity) MissionsInviteQuery(userId string) (status int) {
 // MissionsInviteGiven 邀请任务奖励领取
 func (BP *JyActivity) MissionsInviteGiven(userId string) error {
 	if _, inActivity := BP.InActivity(); !inActivity {
-		return fmt.Errorf("活动已结束")
+		return fmt.Errorf("不在活动时间内")
 	}
 	status := BP.MissionsInviteQuery(userId)
 	if status != 1 {
@@ -279,7 +280,7 @@ func (BP *JyActivity) MissionsShareQuery(userId string) (status int) {
 // MissionsShareGiven 分享活动
 func (BP *JyActivity) MissionsShareGiven(userId string) error {
 	if _, inActivity := BP.InActivity(); !inActivity {
-		return fmt.Errorf("活动已结束")
+		return fmt.Errorf("不在活动时间内")
 	}
 	status := BP.MissionsShareQuery(userId)
 	if status != 1 {

handler/activity/jyActivityOther.go

@@ -13,7 +13,7 @@ import (
 // ShareFinish 分享完成
 func (BP *JyActivity) ShareFinish(userId string) error {
 	if _, inActivity := BP.InActivity(); !inActivity {
-		return fmt.Errorf("活动已结束")
+		return fmt.Errorf("不在活动时间内")
 	}
 	if redis.Put(BidderPlanRedis, fmt.Sprintf(BidderPlanShare, userId), 1, BP.cacheLong()) != true {
 		return fmt.Errorf("存储异常")
@@ -27,7 +27,7 @@ func (BP *JyActivity) ShareFinish(userId string) error {
 // err 异常
 func (BP *JyActivity) GetDailyBoonDetail(userId string) (has bool, todayBalance int, err error) {
 	if preHeatTime, _ := BP.InActivity(); !preHeatTime {
-		err = fmt.Errorf("预热活动已结束")
+		err = fmt.Errorf("不在预热活动时间内")
 		return
 	}
 	//查询是否领取
@@ -81,7 +81,7 @@ func (BP *JyActivity) GetDailyBoonSVip(userId string) (err error) {
 			}
 			if err := award.GivenSubVip(userId, award.SubVip{
 				Num:          gcfg.Instance().MustGet(gctx.New(), "jyactivity.dailyBoon.reward.svip", nil).Int64(),
-				ActivityCode: InviteRegisterActivityCode,
+				ActivityCode: BP.ActivityCode,
 				Date:         time.Now().Unix(),
 				Desc:         "预热福利",
 			}); err != nil {

services/activity/bidderPlan/services.go

@@ -115,7 +115,7 @@ func (act *Activity) DoShare() {
 	rData, errMsg := func() (bool, error) {
 		err := activity.MembershipDay.ShareFinish(userId)
 		if err != nil {
-			return false, nil
+			return false, err
 		}
 		return true, nil
 	}()
@@ -153,7 +153,7 @@ func (act *Activity) GetDailyBoonSVip() {
 		}
 		err := activity.MembershipDay.GetDailyBoonSVip(userId)
 		if err != nil {
-			return false, nil
+			return false, err
 		}
 		return true, nil
 	}()