|
@@ -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`
|