Merge branch 'dev/v1.2.6_zxl' of moapp/message into feature/v1.2.6

etc/task.json

@@ -4,9 +4,9 @@
 		{
 			"name":"绑定手机号",
 			"desc":"注册剑鱼标讯，完成手机号绑定",
-			"pcHref":"/page_workDesktop/work-bench/app/big/set-account-info?from=task",
-			"appHref":"/jyapp/account/phone/bind?mode=mergeBind&from=task",
-			"wxHref":"/front/account/phone/bind?from=task",
+			"pcHref":"/page_workDesktop/work-bench/app/big/set-account-info",
+			"appHref":"/jyapp/account/phone/bind?mode=mergeBind",
+			"wxHref":"/front/account/phone/bind",
 			"point":50,
 			"icon":"/common-module/task/task-bdsjh.png",
 			"type":"bindPhone",
@@ -16,7 +16,7 @@
 			"name":"关注“剑鱼标讯”公众号",
 			"desc":"首次扫码，（或在微信中搜索公众号：剑鱼标讯）关注公众号",
 			"pcHref":"",
-			"appHref":"",
+			"appHref":"/jy_mobile/push/setActive",
 			"wxHref":"",
 			"point":50,
 			"icon":"/common-module/task/task-gzh.png",
@@ -26,9 +26,9 @@
 		{
 			"name":"首次绑定邮箱",
 			"desc":"填写正确的邮箱信息并完成邮箱验证",
-			"pcHref":"/page_workDesktop/work-bench/app/big/set-account-info?from=task",
-			"appHref":"/jyapp/account/mail/bind?from=task",
-			"wxHref":"/front/account/mail/bind?from=task",
+			"pcHref":"/page_workDesktop/work-bench/app/big/set-account-info",
+			"appHref":"/jyapp/account/mail/bind",
+			"wxHref":"/front/account/mail/bind",
 			"point":50,
 			"icon":"/common-module/task/task-bdyx.png",
 			"type":"bindMail",
@@ -37,9 +37,9 @@
 		{
 			"name":"填写公司信息",
 			"desc":"填写公司名称、职位、单位类型可获得",
-			"pcHref":"/page_workDesktop/work-bench/app/big/set-identity-info?from=task",
-			"appHref":"/jy_mobile/identity/company?from=task",
-			"wxHref":"/jy_mobile/identity/company?from=task",
+			"pcHref":"/page_workDesktop/work-bench/app/big/set-identity-info",
+			"appHref":"/jy_mobile/identity/company",
+			"wxHref":"/jy_mobile/identity/company",
 			"point":50,
 			"icon":"/common-module/task/task-gsmc.png",
 			"type":"improveEntInfo",
@@ -48,9 +48,9 @@
 		{
 			"name":"完善业务类型",
 			"desc":"完善公司业务类型可获得",
-			"pcHref":"/page_workDesktop/work-bench/app/big/set-identity-info?from=task",
-			"appHref":"/jy_mobile/identity/business?from=task",
-			"wxHref":"/jy_mobile/identity/business?from=task",
+			"pcHref":"/page_workDesktop/work-bench/app/big/set-identity-info",
+			"appHref":"/jy_mobile/identity/business",
+			"wxHref":"/jy_mobile/identity/business",
 			"point":50,
 			"icon":"/common-module/task/task-ywlx.png",
 			"type":"improveBusiness",
@@ -60,7 +60,7 @@
 			"name":"完成订阅",
 			"desc":"首次完成订阅关键词设置可获得",
 			"pcHref":"",
-			"appHref":"/jy_mobile/push/setActive",
+			"appHref":"",
 			"wxHref":"",
 			"point":50,
 			"icon":"/common-module/task/task-wcdy.png",
@@ -70,9 +70,9 @@
 		{
 			"name":"关注企业",
 			"desc":"首次完成企业关注可获得",
-			"pcHref":"/jylab/entSearch/index.html?from=task",
-			"appHref":"/jy_mobile/search/middle/company?from=task",
-			"wxHref":"/jy_mobile/search/middle/company?from=task",
+			"pcHref":"/jylab/entSearch/index.html",
+			"appHref":"/jy_mobile/search/middle/company",
+			"wxHref":"/jy_mobile/search/middle/company",
 			"point":50,
 			"icon":"/common-module/task/task-gzqy.png",
 			"type":"followEnt",
@@ -81,9 +81,9 @@
 		{
 			"name":"关注项目",
 			"desc":"首次完成项目关注可获得",
-			"pcHref":"/jylab/supsearch/index.html?from=task",
-			"appHref":"/jy_mobile/search/middle/bidding?from=task",
-			"wxHref":"/jy_mobile/search/middle/bidding?from=task",
+			"pcHref":"/jylab/supsearch/index.html",
+			"appHref":"/jy_mobile/search/middle/bidding",
+			"wxHref":"/jy_mobile/search/middle/bidding",
 			"point":50,
 			"icon":"/common-module/task/task-gzxm.png",
 			"type":"followProject",
@@ -105,9 +105,9 @@
 		{
 			"name":"首次绑定邮箱",
 			"desc":"填写正确的邮箱信息并完成邮箱验证",
-			"pcHref":"/page_workDesktop/work-bench/app/big/set-account-info?from=task",
-			"appHref":"/jyapp/account/mail/bind?from=task",
-			"wxHref":"/front/account/mail/bind?from=task",
+			"pcHref":"/page_workDesktop/work-bench/app/big/set-account-info",
+			"appHref":"/jyapp/account/mail/bind",
+			"wxHref":"/front/account/mail/bind",
 			"point":50,
 			"icon":"/common-module/task/task-bdyx.png",
 			"type":"bindMail",
@@ -116,9 +116,9 @@
 		{
 			"name":"填写公司信息",
 			"desc":"填写公司名称、职位、单位类型可获得",
-			"pcHref":"/page_workDesktop/work-bench/app/big/set-identity-info?from=task",
-			"appHref":"/jy_mobile/identity/company?from=task",
-			"wxHref":"/jy_mobile/identity/company?from=task",
+			"pcHref":"/page_workDesktop/work-bench/app/big/set-identity-info",
+			"appHref":"/jy_mobile/identity/company",
+			"wxHref":"/jy_mobile/identity/company",
 			"point":50,
 			"icon":"/common-module/task/task-gsmc.png",
 			"type":"improveEntInfo",
@@ -127,9 +127,9 @@
 		{
 			"name":"完善业务类型",
 			"desc":"完善公司业务类型可获得",
-			"pcHref":"/page_workDesktop/work-bench/app/big/set-identity-info?from=task",
-			"appHref":"/jy_mobile/identity/business?from=task",
-			"wxHref":"/jy_mobile/identity/business?from=task",
+			"pcHref":"/page_workDesktop/work-bench/app/big/set-identity-info",
+			"appHref":"/jy_mobile/identity/business",
+			"wxHref":"/jy_mobile/identity/business",
 			"point":50,
 			"icon":"/common-module/task/task-ywlx.png",
 			"type":"improveBusiness",

services/activity/task/task.go

@@ -18,6 +18,7 @@ import (
 	"app.yhyue.com/moapp/message/handler/activity"
 	"app.yhyue.com/moapp/message/model"
 	. "app.yhyue.com/moapp/message/rpc"
+	mrpc "app.yhyue.com/moapp/message/rpc"
 	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 
 	"github.com/gogf/gf/v2/util/gconv"
@@ -253,6 +254,7 @@ func EntSubscribe(entUserId, entId int64) int {
 func (this *Task) ConfirmChallenge() {
 	sessVal := this.Session().GetMultiple()
 	baseUserId := gconv.Int64(sessVal["base_user_id"])
+	userId := gconv.String(sessVal["mgoUserId"])
 	rData, errMsg := func() (interface{}, error) {
 		infoMap := map[string]interface{}{}
 		if string(this.Body()) == "" {
@@ -274,7 +276,6 @@ func (this *Task) ConfirmChallenge() {
 			}) {
 				go func() {
 					//用户点击“确认挑战”给用户发消息
-					userId := gconv.String(sessVal["mgoUserId"])
 					wxUrl := "/front/sess/" + Se.EncodeString(userId+",_id,identityKeep,") + "__" + Se.EncodeString(config.PushConfig.Messages.ConfirmChallenge.MobileUrl)
 					appUrl := "/jyapp/free/sess/" + Se.EncodeString(userId+",id,"+strconv.Itoa(int(time.Now().Unix()))+",") + "__" + Se.EncodeString(config.PushConfig.Messages.ConfirmChallenge.MobileUrl)
 					req := &message.MultipleSaveMsgReq{
@@ -290,8 +291,48 @@ func (this *Task) ConfirmChallenge() {
 					}
 					SendMsg("确认挑战", req)
 				}()
-				return map[string]interface{}{"status": 1}, nil
 			}
+			//判断用户是否已经完成所有任务
+			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 stauts=1`, baseUserId)
+			taskMsg := db.Tidb.SelectBySql(`select id from integral_task where user_id =? LIMIT 1`, baseUserId)
+			if taskMsg == nil || len(*taskMsg) == 0 {
+				return map[string]interface{}{"status": -1}, fmt.Errorf("任务创建失败")
+			}
+			taskId := gconv.Int64((*taskMsg)[0]["id"])
+			if gconv.Int(taskDetailCount) == len(ts) {
+				//任务完成 赠送超级订阅
+				//判断是否完成所有任务且开启确认挑战
+				if mrpc.SubVipHarvest(userId, 7, "") == nil {
+					if db.Tidb.Update("integral_task", map[string]interface{}{"id": taskId}, map[string]interface{}{
+						"success_status": 1,
+					}) {
+						go func() {
+							wxUrl := "/front/sess/" + Se.EncodeString(userId+",_id,"+strconv.Itoa(int(time.Now().Unix()))+",") + "__" + Se.EncodeString(config.PushConfig.Messages.GetVip.MobileUrl)
+							appUrl := "/jyapp/free/sess/" + Se.EncodeString(userId+",_id,"+strconv.Itoa(int(time.Now().Unix()))+",") + "__" + Se.EncodeString(config.PushConfig.Messages.GetVip.MobileUrl)
+							SendMsg("获赠七天超级订阅服务", &message.MultipleSaveMsgReq{
+								UserIds:    userId,
+								Title:      config.PushConfig.Messages.GetVip.Title,
+								Content:    config.PushConfig.Messages.GetVip.Content,
+								MsgType:    config.PushConfig.Messages.GetVip.MsgType,
+								Link:       config.PushConfig.Messages.GetVip.PcUrl + "," + config.PushConfig.Messages.GetVip.MobileUrl + "," + config.PushConfig.Messages.GetVip.MobileUrl,
+								Appid:      config.PushConfig.Messages.GetVip.Appid,
+								AppPushUrl: appUrl,
+								WxPushUrl:  config.PushConfig.Webdomain + wxUrl,
+								IosPushUrl: appUrl,
+							})
+						}()
+					}
+				}
+			}
+			return map[string]interface{}{"status": 1}, nil
 		}
 		return map[string]interface{}{"status": 1}, nil
 	}()