订单状态过滤

doFreeClueSign/job/job.go

@@ -86,7 +86,7 @@ func (jm *JobManager) LoadAgainSubUser() {
 // @Description 过滤订单 筛选活动注册用户
 // @Date 2024/11/18
 func loadOrder() {
-	sql := `SELECT id, filter, order_code, product_type, user_id, user_phone, vip_starttime, vip_endtime FROM jianyu.dataexport_order WHERE id > ? ORDER BY id ASC`
+	sql := `SELECT id, filter, order_code, product_type, user_id, user_phone, vip_starttime, vip_endtime FROM dataexport_order WHERE id > ? AND order_status = 1 ORDER BY id ASC`
 	res, err := g.DB("jianyu").Query(ctx, sql, LastId)
 	if err == nil && !res.IsEmpty() {
 		for _, m := range res.List() {
@@ -129,9 +129,9 @@ func loadOrder() {
 }
 
 func LoadOrderOther() {
-	sql := `SELECT id, filter, order_code, product_type, user_id, user_phone, vip_starttime, vip_endtime FROM dataexport_order WHERE vip_endtime > ? AND vip_endtime < ? AND (filter LIKE '%邀请好友成功%' OR filter LIKE '%被邀请注册成功%' OR filter LIKE '%2024年新用户注册赠送7天超级订阅%') ORDER BY id ASC`
-	sql1 := `SELECT count(1) FROM dataexport_order WHERE vip_endtime > ? AND vip_endtime < ? AND (filter LIKE '%邀请好友成功%' OR filter LIKE '%被邀请注册成功%' OR filter LIKE '%2024年新用户注册赠送7天超级订阅%')`
-	sql2 := `SELECT id, filter, order_code, product_type, user_id, user_phone, vip_starttime, vip_endtime FROM jianyu.dataexport_order WHERE product_type = 'VIP订阅' AND product_type = '大会员' AND id > ? AND user_id = ? ORDER BY id ASC`
+	sql := `SELECT id, filter, order_code, product_type, user_id, user_phone, vip_starttime, vip_endtime FROM dataexport_order WHERE vip_endtime > ? AND vip_endtime < ? AND order_status = 1 AND (filter LIKE '%邀请好友成功%' OR filter LIKE '%被邀请注册成功%' OR filter LIKE '%2024年新用户注册赠送7天超级订阅%') ORDER BY id ASC`
+	sql1 := `SELECT count(1) FROM dataexport_order WHERE vip_endtime > ? AND vip_endtime < ? AND order_status = 1 AND (filter LIKE '%邀请好友成功%' OR filter LIKE '%被邀请注册成功%' OR filter LIKE '%2024年新用户注册赠送7天超级订阅%')`
+	sql2 := `SELECT id, order_code, product_type, user_id, vip_starttime, vip_endtime FROM jianyu.dataexport_order WHERE product_type = 'VIP订阅' AND product_type = '大会员' AND id > ? AND user_id = ? AND order_status = 1 ORDER BY id ASC`
 	now := time.Now().Format(time.DateTime)
 	end := time.Now().AddDate(0, 0, 1).Format(time.DateTime)
 	c, _ := g.DB("jianyu").GetCount(ctx, sql1, now, end)
@@ -162,7 +162,7 @@ func verifyDate(v int64) bool {
 // @Date 2024/11/19
 func LoadOrderHis() {
 	g.Log().Infof(ctx, "LoadOrderHis start")
-	sql := `SELECT id, filter, order_code, product_type, user_id, user_phone, vip_starttime, vip_endtime FROM dataexport_order WHERE id <= ? AND filter LIKE '%邀请好友成功%' ORDER BY id DESC`
+	sql := `SELECT id, filter, order_code, product_type, user_id, user_phone, vip_starttime, vip_endtime FROM dataexport_order WHERE id <= ? AND order_status = 1 AND filter LIKE '%邀请好友成功%' ORDER BY id DESC`
 	res, err := g.DB("jianyu").Query(ctx, sql, LastId)
 	if err == nil && !res.IsEmpty() {
 		for _, m := range res.List() {
@@ -184,7 +184,7 @@ func LoadOrderHis() {
 func LoadOrderHisMore() {
 	g.Log().Infof(ctx, "LoadOrderHisMore start")
 	now := time.Now().Format(time.DateTime)
-	sql := `SELECT id, filter, order_code, product_type, user_id, user_phone, vip_starttime, vip_endtime FROM dataexport_order WHERE vip_endtime > '2024-11-16 00:00:00' AND vip_endtime < ? AND filter LIKE '%2024年新用户注册赠送7天超级订阅%' ORDER BY id DESC`
+	sql := `SELECT id, filter, order_code, product_type, user_id, user_phone, vip_starttime, vip_endtime FROM dataexport_order WHERE order_status = 1 AND vip_endtime > '2024-11-16 00:00:00' AND vip_endtime < ? AND filter LIKE '%2024年新用户注册赠送7天超级订阅%' ORDER BY id DESC`
 	res, err := g.DB("jianyu").Query(ctx, sql, now)
 	if err == nil && !res.IsEmpty() {
 		for _, m := range res.List() {