feat:代码调整

newuserGet/internal/logic/task.go

@@ -8,6 +8,7 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
 	"newuserGet/internal/dao"
+	"newuserGet/internal/model/do"
 	"newuserGet/internal/model/entity"
 	"strings"
 	"time"
@@ -78,10 +79,11 @@ func Task(ctx context.Context) {
 			userList = filterTest(ctx, testSet, userList)
 		}
 		if len(userList) > 0 {
+			saveList := processSaveUser(userList)
 			// 保存用户
-			_, err = dao.NewUserSendLog.Ctx(ctx).Data(userList).Insert()
+			_, err = dao.NewUserSendLog.Ctx(ctx).Data(saveList).Insert()
 			if err != nil {
-				g.Log().Errorf(ctx, "第%v个规则 保存失败 :id-%v name:%v err:%v  %v\n", i, rules[i].Id, rules[i].Name, err, userList)
+				g.Log().Errorf(ctx, "第%v个规则 保存失败 :id-%v name:%v err:%v  %v\n", i, rules[i].Id, rules[i].Name, err, saveList)
 				continue
 			}
 			g.Log().Infof(ctx, "完成--第%v个规则:id-%v name:%v \n", i, rules[i].Id, rules[i].Name)
@@ -93,6 +95,18 @@ func Task(ctx context.Context) {
 	}
 
 }
+func processSaveUser(userList []entity.NewUserSendLog) (saveList []do.NewUserSendLog) {
+	for i := 0; i < len(userList); i++ {
+		saveList = append(saveList, do.NewUserSendLog{
+			Phone:      userList[i].Phone,
+			UserId:     userList[i].UserId,
+			RuleId:     userList[i].RuleId,
+			Industry:   userList[i].Industry,
+			State:      0,
+		})
+	}
+	return
+}
 
 const (
 	OrSQL          = "SELECT   groupBitmapOrState(bitobj) from pub_tags.dwd_d_tag ddt WHERE  ddt.id in (%s) "
@@ -249,8 +263,6 @@ func filterTrailStatus(ctx context.Context, rule entity.NewUserSendRule, userLis
 			if (intersectSet != nil && intersectSet.Size() > 0) || industrySet.Contains("other") { // 行业匹配到了-发行业内容 或者包含other-未匹配到指定行业-则发送默认内容
 				flag = true
 			}
-		} else {
-			flag = true
 		}
 
 		// 匹配行业