zwxi 9 달 전
부모
커밋
b161899a8e
4개의 변경된 파일85개의 추가작업 그리고 6개의 파일을 삭제
  1. 26 0
      models/activity.go
  2. 31 0
      models/user_record.go
  3. 22 0
      models/wx_template_msg.go
  4. 6 6
      services/wx_category_template_msg.go

+ 26 - 0
models/activity.go

@@ -1326,4 +1326,30 @@ WHERE
 	GROUP BY s.id`
 	_, err = o.Raw(sql, endDate).QueryRows(&items)
 	return
+}
+
+// 获取买方研选这边的openid
+func GetMfyxActivitySendMsgListAll(endDate string) (items []*WxMsgCygxActivityList, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+	s.id,
+	s.user_id,
+	s.fail_type,
+	cr.open_id,
+	a.*
+FROM
+	cygx_activity AS a
+	INNER JOIN cygx_activity_signup AS s ON s.activity_id = a.activity_id
+	INNER JOIN cygx_mfyx_gzh_user_record AS cr ON cr.cygx_bind_account = s.mobile 
+WHERE
+	1 = 1 
+	AND s.is_send_wx_msg = 0 
+	AND s.do_fail_type = 0 
+	AND a.publish_status = 1
+	AND a.chart_permission_id = 31
+	AND a.activity_time <= ? AND a.activity_time >= NOW() 
+	AND s.is_cancel = 0
+	GROUP BY s.id`
+	_, err = o.Raw(sql, endDate).QueryRows(&items)
+	return
 }

+ 31 - 0
models/user_record.go

@@ -189,3 +189,34 @@ func GetUserRecordListByMobileArr(mobiles []string) (items []*OpenIdList, err er
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
+
+// 根据用户id和平台id获取用户关系
+func GetMfyxUserRecordByMobile(platform int, bindAccount string) (item *OpenIdList, err error) {
+	var sql string
+	sql = `SELECT open_id,cygx_user_id AS user_id  FROM	cygx_mfyx_gzh_user_record  WHERE	1 = 1  AND cygx_bind_account = ?`
+	err = orm.NewOrm().Raw(sql, bindAccount).QueryRow(&item)
+	return
+}
+
+
+// 根据手机号获取mfyx用户的openid
+func GetMfyxUserRecordListByMobileArr(mobiles []string) (items []*OpenIdList, err error) {
+	o := orm.NewOrm()
+	lenarr := len(mobiles)
+	if lenarr == 0 {
+		return
+	}
+	var condition string
+	var pars []interface{}
+	condition = ` AND u.cygx_bind_account IN (` + utils.GetOrmInReplace(lenarr) + `)`
+	pars = append(pars, mobiles)
+	sql := `SELECT
+			u.open_id,
+			u.cygx_user_id AS user_id 
+		FROM
+			cygx_mfyx_gzh_user_record AS u 
+		WHERE
+			1 = 1  ` + condition
+	_, err = o.Raw(sql, pars).QueryRows(&items)
+	return
+}

+ 22 - 0
models/wx_template_msg.go

@@ -96,3 +96,25 @@ func GetWxOpenIdByMobileSliceList(mobiles []string) (items []*OpenIdList, err er
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
+
+// 根据手机号获取用户的openid
+func GetMfyxWxOpenIdByMobileSliceList(mobiles []string) (items []*OpenIdList, err error) {
+	o := orm.NewOrm()
+	lenarr := len(mobiles)
+	if lenarr == 0 {
+		return
+	}
+	var condition string
+	var pars []interface{}
+	condition = ` AND u.cygx_bind_account IN (` + utils.GetOrmInReplace(lenarr) + `)`
+	pars = append(pars, mobiles)
+	sql := `SELECT
+			u.open_id,
+			u.cygx_user_id AS user_id 
+		FROM
+			cygx_mfyx_gzh_user_record AS u 
+		WHERE
+			1 = 1  ` + condition
+	_, err = o.Raw(sql, pars).QueryRows(&items)
+	return
+}

+ 6 - 6
services/wx_category_template_msg.go

@@ -71,7 +71,7 @@ func SendMfyxEmailFileForAskMsgResearch(cont context.Context) (err error) {
 	//var touser string
 	defer func() {
 		if err != nil {
-			go utils.SendAlarmMsg("发送附件模版消息失败", 2)
+			go utils.SendAlarmMsg("发送附件模版消息失败"+err.Error(), 2)
 			go utils.SendEmail("发送附件模版消息失败"+"【"+utils.APPNAME+"】"+time.Now().Format(utils.FormatDateTime), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
 		}
 		if msg != "" {
@@ -122,7 +122,7 @@ func SendMfyxEmailFileForAskMsgResearch(cont context.Context) (err error) {
 
 			//给所属销售推送消息
 			if sellerItem != nil && user != nil {
-				openIpItem, _ := models.GetUserRecordByMobile(4, sellerItem.Mobile)
+				openIpItem, _ := models.GetMfyxUserRecordByMobile(12, sellerItem.Mobile)
 				openIdList := make([]*models.OpenIdList,0)
 				openIdList = append(openIdList, openIpItem)
 				SendWxCategoryMsgWithActivityAsk(user.CompanyName, user.RealName, sellerItem.RealName, time.Now().Format(utils.FormatDateTimeMinute2), v2.Content, openIdList, v.ActivityId)
@@ -195,7 +195,7 @@ func SendMfyxActivityBeginMsg(cont context.Context) (err error) {
 		}
 	}()
 	endDate := time.Now().Add(+time.Minute * 60).Format(utils.FormatDateTime)
-	listActivity, err := models.GetYxActivitySendMsgListAll(endDate)
+	listActivity, err := models.GetMfyxActivitySendMsgListAll(endDate)
 	fmt.Println(len(listActivity))
 	if err != nil {
 		fmt.Println("GetActivitySendMsgListAll Err:", err.Error())
@@ -253,7 +253,7 @@ func SendMfyxActivityBeginMsgMeeting(cont context.Context) (err error) {
 	//func SendActivityBeginMsgMeeting() (err error) {
 	defer func() {
 		if err != nil {
-			go utils.SendAlarmMsg("15分钟会议消息提醒失败", 2)
+			go utils.SendAlarmMsg("15分钟会议消息提醒失败"+err.Error(), 2)
 			fmt.Println("发送失败,Err:", err.Error())
 		}
 	}()
@@ -304,7 +304,7 @@ func SendMfyxActivityBeginMsgMeeting(cont context.Context) (err error) {
 			mobiles = append(mobiles, vSignup.Mobile)
 		}
 		//获取这些手机号对应的Openid
-		listOpenid, e := models.GetUserRecordListByMobileArr(mobiles)
+		listOpenid, e := models.GetMfyxUserRecordListByMobileArr(mobiles)
 		if e != nil && e.Error() != utils.ErrNoRow() {
 			err = errors.New("GetUserRecordListByMobileArr, Err: " + e.Error())
 			return
@@ -371,7 +371,7 @@ func SendActivitieSignCategoryTemplateMsg(user *models.WxUserItem, activityDetai
 	keyword4 = utils.TruncateActivityNameString(activityDetail.ActivityName)
 	keyword5 = time.Now().Format(utils.FormatDateTimeMinute2)
 
-	openIdList, e := models.GetWxOpenIdByMobileSliceList(mobiles)
+	openIdList, e := models.GetMfyxWxOpenIdByMobileSliceList(mobiles)
 	if e != nil {
 		err = errors.New("GetWxOpenIdByMobileList, Err: " + e.Error())
 		return