|
@@ -1,7 +1,9 @@
|
|
|
package activity
|
|
|
|
|
|
import (
|
|
|
+ "app.yhyue.com/moapp/message/handler/award"
|
|
|
"fmt"
|
|
|
+ "github.com/gogf/gf/v2/os/gtime"
|
|
|
"log"
|
|
|
"net/rpc"
|
|
|
"strconv"
|
|
@@ -42,6 +44,31 @@ func Task(msg *model.Message) {
|
|
|
"type": types,
|
|
|
"user_id": baseUserId,
|
|
|
}
|
|
|
+ // p647新绑定用户送7天超级订阅
|
|
|
+ startTime := gtime.NewFromStrLayout(gcfg.Instance().MustGet(gctx.New(), "newRegister.startTime").String(), "2006-01-02T15:04:05Z").Time
|
|
|
+ entTime := gtime.NewFromStrLayout(gcfg.Instance().MustGet(gctx.New(), "newRegister.entTime").String(), "2006-01-02T15:04:05Z").Time
|
|
|
+ if time.Now().After(startTime) && time.Now().Before(entTime) {
|
|
|
+ _ = award.GivenSubVip(msg.E_userId, award.SubVip{
|
|
|
+ Num: gcfg.Instance().MustGet(gctx.New(), "newRegister.supVip", nil).Int64(),
|
|
|
+ ActivityCode: "newRegister",
|
|
|
+ Date: msg.E_time,
|
|
|
+ Desc: "2024年新用户注册赠送7天超级订阅",
|
|
|
+ })
|
|
|
+ SendMsg("新用户注册", &message.MultipleSaveMsgReq{
|
|
|
+ UserIds: msg.E_userId,
|
|
|
+ Title: gcfg.Instance().MustGet(gctx.New(), "newUserAward.message.title", nil).String(),
|
|
|
+ Content: gcfg.Instance().MustGet(gctx.New(), "newUserAward.message.content", nil).String(),
|
|
|
+ MsgType: gcfg.Instance().MustGet(gctx.New(), "newUserAward.message.msgType", nil).Int64(),
|
|
|
+ Appid: gcfg.Instance().MustGet(gctx.New(), "newUserAward.message.appid", nil).String(),
|
|
|
+ Link: gcfg.Instance().MustGet(gctx.New(), "newUserAward.message.pcUrl", nil).String() + "," +
|
|
|
+ gcfg.Instance().MustGet(gctx.New(), "newUserAward.message.mobileUrl", nil).String() + "," +
|
|
|
+ gcfg.Instance().MustGet(gctx.New(), "newUserAward.message.mobileUrl", nil).String() + "," +
|
|
|
+ gcfg.Instance().MustGet(gctx.New(), "newUserAward.message.mobileUrl", nil).String(),
|
|
|
+ AppPushUrl: gcfg.Instance().MustGet(gctx.New(), "newUserAward.message.mobileUrl", nil).String(),
|
|
|
+ WxPushUrl: gcfg.Instance().MustGet(gctx.New(), "newUserAward.message.mobileUrl", nil).String(),
|
|
|
+ IosPushUrl: gcfg.Instance().MustGet(gctx.New(), "newUserAward.message.mobileUrl", nil).String(),
|
|
|
+ })
|
|
|
+ }
|
|
|
//判断用户是否有任务
|
|
|
data, ok := db.Mgo.FindById("user", msg.E_userId, `{"l_registedate":1}`)
|
|
|
if data == nil || len(*data) == 0 || !ok {
|
|
@@ -177,7 +204,7 @@ func Task(msg *model.Message) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-//获取任务
|
|
|
+// 获取任务
|
|
|
func GetTaskRpc(isNew bool) (p *jrpc.TaskDataResp) {
|
|
|
defer common.Catch()
|
|
|
var repl jrpc.TaskDataResp
|
|
@@ -195,7 +222,6 @@ func GetTaskRpc(isNew bool) (p *jrpc.TaskDataResp) {
|
|
|
return &repl
|
|
|
}
|
|
|
|
|
|
-//
|
|
|
func createTask(baseUserId, positionId int64, isNew bool, now string) (int64, int, string) {
|
|
|
list := db.Tidb.SelectBySql(`select id,success_status,end_time from integral_task where user_id=?`, baseUserId)
|
|
|
if list == nil {
|