订单查询

handler/activity/newUserAward.go

@@ -1,7 +1,9 @@
 package activity
 
 import (
+	qu "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/message/db"
+	"fmt"
 	"strconv"
 	"time"
 
@@ -59,7 +61,13 @@ func NewUserActivity(msg *model.Message) {
 	entTime := gtime.NewFromStrLayout(gcfg.Instance().MustGet(gctx.New(), "newRegister.entTime").String(), "2006-01-02T15:04:05Z").Time
 	now := time.Now()
 	if now.After(startTime) && now.Before(entTime) {
-		c := db.Mysql.CountBySql("SELECT count(1) FROM dataexport_order WHERE user_id = ? AND distribution_channel = 'x054'", msg.E_userId)
+		data, ok := db.Mgo.FindById("user", msg.E_userId, `{"l_registedate":1}`)
+		if data == nil || len(*data) == 0 || !ok {
+			logger.Info(fmt.Sprintf("未找到用户%s，无法增加积分%v。", msg.E_userId, msg.E_code))
+			return
+		}
+		phone := qu.If(qu.ObjToString((*data)["s_phone"]) != "", qu.ObjToString((*data)["s_phone"]), qu.ObjToString((*data)["s_m_phone"]))
+		c := db.Mysql.CountBySql("SELECT count(1) FROM dataexport_order WHERE (user_id = ? OR user_phone = ?) AND distribution_channel = 'x054'", msg.E_userId, phone)
 		if c <= 0 {
 			_ = award.GivenSubVip(msg.E_userId, award.SubVip{
 				Num:          gcfg.Instance().MustGet(gctx.New(), "newRegister.supVip", nil).Int64(),

handler/activity/task.go

@@ -7,9 +7,6 @@ import (
 	"strconv"
 	"time"
 
-	"app.yhyue.com/moapp/message/handler/award"
-	"github.com/gogf/gf/v2/os/gtime"
-
 	"app.yhyue.com/moapp/MessageCenter/rpc/type/message"
 	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/date"
@@ -17,12 +14,14 @@ import (
 	jrpc "app.yhyue.com/moapp/jybase/rpc"
 	"app.yhyue.com/moapp/message/config"
 	"app.yhyue.com/moapp/message/db"
+	"app.yhyue.com/moapp/message/handler/award"
 	"app.yhyue.com/moapp/message/model"
 	. "app.yhyue.com/moapp/message/rpc"
 	mrpc "app.yhyue.com/moapp/message/rpc"
 	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	"github.com/gogf/gf/v2/os/gcfg"
 	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/util/gconv"
 )
 
@@ -45,12 +44,19 @@ func Task(msg *model.Message) {
 		"type":    types,
 		"user_id": baseUserId,
 	}
+	//判断用户是否有任务
+	data, ok := db.Mgo.FindById("user", msg.E_userId, `{"l_registedate":1}`)
+	if data == nil || len(*data) == 0 || !ok {
+		logger.Info(fmt.Sprintf("未找到用户%s，无法增加积分%v。", msg.E_userId, code))
+		return
+	}
 	// p647新绑定用户送7天超级订阅
 	startTime := gtime.NewFromStrLayout(gcfg.Instance().MustGet(gctx.New(), "newRegister.startTime").String(), "2006-01-02T15:04:05Z").Time
 	entTime := gtime.NewFromStrLayout(gcfg.Instance().MustGet(gctx.New(), "newRegister.entTime").String(), "2006-01-02T15:04:05Z").Time
 	if time.Now().After(startTime) && time.Now().Before(entTime) && gconv.Bool(msg.E_body["isOnlyBind"]) {
 		//  查询该用户活动时间内是否赠送过
-		c := db.Mysql.CountBySql("SELECT count(1) FROM dataexport_order WHERE user_id = ? AND distribution_channel = 'x054'", msg.E_userId)
+		phone := common.If(common.ObjToString((*data)["s_phone"]) != "", common.ObjToString((*data)["s_phone"]), common.ObjToString((*data)["s_m_phone"]))
+		c := db.Mysql.CountBySql("SELECT count(1) FROM dataexport_order WHERE (user_id = ? OR user_phone = ?) AND distribution_channel = 'x054'", msg.E_userId, phone)
 		if c <= 0 {
 			_ = award.GivenSubVip(msg.E_userId, award.SubVip{
 				Num:          gcfg.Instance().MustGet(gctx.New(), "newRegister.supVip", nil).Int64(),
@@ -80,12 +86,6 @@ func Task(msg *model.Message) {
 		}
 
 	}
-	//判断用户是否有任务
-	data, ok := db.Mgo.FindById("user", msg.E_userId, `{"l_registedate":1}`)
-	if data == nil || len(*data) == 0 || !ok {
-		logger.Info(fmt.Sprintf("未找到用户%s，无法增加积分%v。", msg.E_userId, code))
-		return
-	}
 	l_registedate := gconv.Int64((*data)["l_registedate"])
 	isNew := l_registedate > taskStartTime //是否注册时间处于新手任务开始时间
 	taskData := config.TaskConf.OldTask