|
|
@@ -308,6 +308,14 @@ func (this *Task) ConfirmChallenge() {
|
|
|
return map[string]interface{}{"status": -1}, fmt.Errorf(Error_msg_1002)
|
|
|
}
|
|
|
if gconv.Int(infoMap["challenge"]) == 1 {
|
|
|
+ //判断用户是否已经完成所有任务
|
|
|
+ userMsg, ok := db.Mgo.FindById("user", userId, `{"l_registedate":1}`)
|
|
|
+ if userMsg == nil || len(*userMsg) == 0 || !ok {
|
|
|
+ return map[string]interface{}{"status": -1}, fmt.Errorf("未查询到用户")
|
|
|
+ }
|
|
|
+ //注册时间 判断是新手任务还是老用户限时任务
|
|
|
+ l_registedate := gconv.Int64((*userMsg)["l_registedate"])
|
|
|
+ isNew := l_registedate > config.TaskConf.TaskStartTime //是否注册时间处于新手任务开始时间
|
|
|
dayLater := time.Now().Add(time.Duration(config.TaskConf.TaskDayTime-1) * time.Hour * 24)
|
|
|
endTime := time.Date(dayLater.Year(), dayLater.Month(), dayLater.Day(), 23, 59, 59, 0, time.Local)
|
|
|
if db.Tidb.Update("integral_task", map[string]interface{}{
|
|
|
@@ -322,7 +330,7 @@ func (this *Task) ConfirmChallenge() {
|
|
|
req := &message.MultipleSaveMsgReq{
|
|
|
UserIds: userId,
|
|
|
Title: config.PushConfig.Messages.ConfirmChallenge.Title,
|
|
|
- Content: config.PushConfig.Messages.ConfirmChallenge.Content,
|
|
|
+ Content: fmt.Sprintf(config.PushConfig.Messages.ConfirmChallenge.Content, qu.If(isNew, "新手", "限时").(string)),
|
|
|
MsgType: config.PushConfig.Messages.ConfirmChallenge.MsgType,
|
|
|
Link: config.PushConfig.Messages.ConfirmChallenge.PcUrl + "," + config.PushConfig.Messages.ConfirmChallenge.MobileUrl + "," + config.PushConfig.Messages.ConfirmChallenge.MobileUrl + "," + config.PushConfig.Messages.ConfirmChallenge.MobileUrl,
|
|
|
Appid: config.PushConfig.Messages.ConfirmChallenge.Appid,
|
|
|
@@ -333,14 +341,6 @@ func (this *Task) ConfirmChallenge() {
|
|
|
SendMsg("确认挑战", req)
|
|
|
}()
|
|
|
}
|
|
|
- //判断用户是否已经完成所有任务
|
|
|
- userMsg, ok := db.Mgo.FindById("user", userId, `{"l_registedate":1}`)
|
|
|
- if userMsg == nil || len(*userMsg) == 0 || !ok {
|
|
|
- return map[string]interface{}{"status": -1}, fmt.Errorf("未查询到用户")
|
|
|
- }
|
|
|
- //注册时间 判断是新手任务还是老用户限时任务
|
|
|
- l_registedate := gconv.Int64((*userMsg)["l_registedate"])
|
|
|
- isNew := l_registedate > config.TaskConf.TaskStartTime //是否注册时间处于新手任务开始时间
|
|
|
ts := this.InitTask(isNew)
|
|
|
taskDetailCount := db.Tidb.CountBySql(`select count(1) from integral_task_detail where user_id =? and status=1`, baseUserId)
|
|
|
taskMsg := db.Tidb.SelectBySql(`select id from integral_task where user_id =? LIMIT 1`, baseUserId)
|
|
|
@@ -361,7 +361,7 @@ func (this *Task) ConfirmChallenge() {
|
|
|
SendMsg("获赠七天超级订阅服务", &message.MultipleSaveMsgReq{
|
|
|
UserIds: userId,
|
|
|
Title: config.PushConfig.Messages.GetVip.Title,
|
|
|
- Content: config.PushConfig.Messages.GetVip.Content,
|
|
|
+ Content: fmt.Sprintf(config.PushConfig.Messages.GetVip.Content, qu.If(isNew, "新手", "限时").(string)),
|
|
|
MsgType: config.PushConfig.Messages.GetVip.MsgType,
|
|
|
Link: config.PushConfig.Messages.GetVip.PcUrl + "," + config.PushConfig.Messages.GetVip.MobileUrl + "," + config.PushConfig.Messages.GetVip.MobileUrl + "," + config.PushConfig.Messages.GetVip.MobileUrl,
|
|
|
Appid: config.PushConfig.Messages.GetVip.Appid,
|
