瀏覽代碼

Merge branch 'cygx_check_table' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

xingzai 1 年之前
父節點
當前提交
5cd722600b
共有 3 個文件被更改,包括 4 次插入6 次删除
  1. 2 4
      models/activity.go
  2. 1 1
      models/user_record.go
  3. 1 1
      services/activity.go

+ 2 - 4
models/activity.go

@@ -624,14 +624,12 @@ func GetActivitySendMsgListAll(endDate string) (items []*WxMsgCygxActivityList,
 FROM
 	cygx_activity AS a
 	INNER JOIN cygx_activity_signup AS s ON s.activity_id = a.activity_id
-	INNER   JOIN user_record AS c ON c.bind_account = s.mobile 
-	INNER JOIN cygx_user_record AS cr ON cr.union_id = c.union_id 
+	INNER JOIN cygx_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 c.create_platform = 4
+	AND a.publish_status = 1
 	AND a.activity_time <= ? AND a.activity_time >= NOW() 
 	AND s.is_cancel = 0
 	AND( a.activity_type_id IN (4,5,6) OR (a.activity_type_id = 3 AND a.is_limit_people = 1 )) 	GROUP BY s.id`

+ 1 - 1
models/user_record.go

@@ -121,7 +121,7 @@ func GetUserRecordListByMobile(platform int, bindAccount string) (items []*OpenI
 		FROM
 		  cygx_user_record  as cr 
 		WHERE 1= 1	AND cygx_bind_account IN (` + bindAccount + `)`
-	_, err = orm.NewOrm().Raw(sql, platform).QueryRows(&items)
+	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
 	return
 }
 

+ 1 - 1
services/activity.go

@@ -32,7 +32,7 @@ func SendActivityBeginMsg(cont context.Context) (err error) {
 	//func SendActivityBeginMsg() (err error) {
 	defer func() {
 		if err != nil {
-			go utils.SendAlarmMsg("60分钟会议消息提醒失败", 2)
+			go utils.SendAlarmMsg("60分钟会议消息提醒失败"+err.Error(), 2)
 			fmt.Println("发送失败,Err:", err.Error())
 		}
 	}()