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

services/activity/task/task.go

@@ -96,7 +96,7 @@ func (this *Task) Task() {
 				dataM[types] = tf
 			}
 		}
-		userMsg, ok := db.Mgo.FindById("user", mgoUserId, `{"l_registedate":1,"s_m_phone":1,"s_phone":1,"s_myemail":1,"s_nickname":1,"s_headimageurl":1,"s_password":1,"s_company":1,"s_unionid":1,"o_jy":1,"o_vipjy":1,"o_member_jy":1,"i_app_login_task":1}`)
+		userMsg, ok := db.Mgo.FindById("user", mgoUserId, `{"s_m_openid":1,"l_registedate":1,"s_m_phone":1,"s_phone":1,"s_myemail":1,"s_nickname":1,"s_headimageurl":1,"s_password":1,"s_company":1,"s_unionid":1,"o_jy":1,"o_vipjy":1,"o_member_jy":1,"i_app_login_task":1}`)
 		if userMsg == nil || len(*userMsg) == 0 || !ok {
 			return nil, fmt.Errorf("未查询到用户")
 		}
@@ -121,6 +121,7 @@ func (this *Task) Task() {
 			}
 		}
 		mail := gconv.String((*userMsg)["s_myemail"])
+		openid := gconv.String((*userMsg)["s_m_openid"])
 		if !isNew {
 			//邮箱是否绑定
 			if mail != "" {
@@ -139,6 +140,24 @@ func (this *Task) Task() {
 					},
 				})
 			}
+		} else {
+			//openid是否绑定
+			if mail != "" {
+				dataM[model.FollowWx].Status = 1
+				dataM[model.FollowWx].FinishTime = now
+				activity.Task(&model.Message{
+					E_code:   "followWx",
+					E_userId: userId,
+					E_time:   time.Now().Unix(),
+					E_app:    "jyweb_node2",
+					E_body: map[string]interface{}{
+						"code":       1008, //首次订阅
+						"types":      "followWx",
+						"baseUserId": baseUserId,
+						"positionId": positionId,
+					},
+				})
+			}
 		}
 		//判断是否已经创建任务
 		integralTaskData := db.Tidb.SelectBySql(`select * from integral_task where user_id =? limit 1`, baseUserId)