Merge remote-tracking branch 'origin/feature/v4.9.9' into feature/v4.9.9

src/jfw/modules/publicapply/src/activityday/config.json

@@ -38,5 +38,6 @@
     "weChatUrl": ""
   },
   "webhookURL": ["https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=78864582-d770-452f-a55d-e8d17c647f31"],
-  "drawNum": 20
+  "drawNum": 20,
+  "firstAccessSwitch": true
 }

src/jfw/modules/publicapply/src/activityday/config/config.go

@@ -36,7 +36,8 @@ type config struct {
 		WeChatUrl    string `json:"weChatUrl"`
 	} `json:"siteMsg"`
 	WebhookURL []string `json:"webhookURL"`
-	DrawNum    int      `json:"drawNum"` //一次最大抽奖次数
+	DrawNum    int      `json:"drawNum"`           //一次最大抽奖次数
+	FASwitch   bool     `json:"firstAccessSwitch"` //首次访问 是否赠送剑鱼币 开关
 }
 
 var (

src/jfw/modules/publicapply/src/activityday/dao/dao.go

@@ -6,6 +6,7 @@ import (
 	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 	"app.yhyue.com/moapp/jybase/redis"
 	"fmt"
+	"jy/src/jfw/modules/publicapply/src/activityday/config"
 	"jy/src/jfw/modules/publicapply/src/activityday/consts"
 	"jy/src/jfw/modules/publicapply/src/activityday/util"
 	"jy/src/jfw/modules/publicapply/src/db"
@@ -45,13 +46,17 @@ func GetLotteryActiveInfo(activeId int64, sess map[string]interface{}, session *
 		return
 	}
 	//活动期间
-	if r.DLai.ActiveStartTime <= now.Unix() && r.DLai.ActiveEndTime >= now.Unix() {
+	if r.DLai.ActiveStartTime <= now.Unix() && r.DLai.ActiveEndTime >= now.Unix() && config.Config.FASwitch {
 		//首次访问活动页面 赠送剑鱼币100
 		onceKey := fmt.Sprintf("activity_day_once_%s", r.UserInfo.UserId)
 		if ok, err := redis.Exists(consts.RedisNewCode, onceKey); err == nil && !ok {
 			err = r.PointHarvest(r.DLai.Cost)
 			if err == nil {
-				redis.Put(consts.RedisNewCode, onceKey, now.Day(), 30*24*60*60)
+				expireTime := 10 * 24 * 60 * 60
+				if r.DLai.ActiveEndTime > now.Unix() {
+					expireTime = int(r.DLai.ActiveEndTime - now.Unix())
+				}
+				redis.Put(consts.RedisNewCode, onceKey, now.Day(), expireTime)
 			} else {
 				log.Println("--首次 赠送--err -:", err.Error())
 			}