Merge branch 'dev_v1.5.5_wh' of jianyu/datatools into feature/v1.5.5

clueSync/jobutil.go

@@ -568,23 +568,25 @@ func users() {
 			//判断用户是否有小程序切使用过剑鱼其他产品
 			s_platform := gconv.String(v["s_platform"])
 			login_positionid := gconv.Int64(v["login_positionid"])
+			createtime := common.ObjToString(v["createtime"])
 			if s_platform == "xcx" && login_positionid == 0 {
 				log.Println(v, "用户是否有小程序且未使用过剑鱼其他产品")
-				continue
-			}
-			createtime := common.ObjToString(v["createtime"])
-			ok1, ok2 := FormatData(v, "users")
-			if !ok1 {
-				common.WriteSysConfig(&cfg)
-				log.Println("线索卡点", "users", v, selectTimeEnd)
-				break
 			} else {
-				if !ok2 {
-					log.Println("用户分配已达上限", "users", v, selectTimeEnd)
+				ok1, ok2 := FormatData(v, "users")
+				//ok1, ok2 := true, true
+				if !ok1 {
 					common.WriteSysConfig(&cfg)
+					log.Println("线索卡点", "users", v, selectTimeEnd)
 					break
+				} else {
+					if !ok2 {
+						log.Println("用户分配已达上限", "users", v, selectTimeEnd)
+						common.WriteSysConfig(&cfg)
+						break
+					}
 				}
 			}
+
 			if k == len(*data)-1 {
 				cfg.LastUserId = createtime
 			}
@@ -599,28 +601,29 @@ func users() {
 			//判断用户是否有小程序切使用过剑鱼其他产品
 			s_platform := gconv.String(v["s_platform"])
 			login_positionid := gconv.Int64(v["login_positionid"])
+			updatetime := common.ObjToString(v["updatetime"])
 			if s_platform == "xcx" && login_positionid == 0 {
 				log.Println(gconv.String(v["id"]), "用户是否有小程序且未使用过剑鱼其他产品")
-				continue
-			}
-			updatetime := common.ObjToString(v["updatetime"])
-			ok1, ok2 := FormatData(v, "xcxusers")
-			if !ok1 {
-				common.WriteSysConfig(&cfg)
-				log.Println("小程序用户分配线索卡点", "xcxusers", v, selectXcxTimeEnd)
-				break
 			} else {
-				if !ok2 {
-					log.Println("小程序用户分配已达上限", "xcxusers", v, selectXcxTimeEnd)
+				ok1, ok2 := FormatData(v, "xcxusers")
+				if !ok1 {
 					common.WriteSysConfig(&cfg)
+					log.Println("小程序用户分配线索卡点", "xcxusers", v, selectXcxTimeEnd)
 					break
+				} else {
+					if !ok2 {
+						log.Println("小程序用户分配已达上限", "xcxusers", v, selectXcxTimeEnd)
+						common.WriteSysConfig(&cfg)
+						break
+					}
 				}
+				TiDb.Update("dwd_f_userbase_baseinfo", map[string]interface{}{
+					"id": gconv.Int64(v["id"]),
+				}, map[string]interface{}{
+					"clue_operate_status": 1,
+				})
 			}
-			TiDb.Update("dwd_f_userbase_baseinfo", map[string]interface{}{
-				"id": gconv.Int64(v["id"]),
-			}, map[string]interface{}{
-				"clue_operate_status": 1,
-			})
+
 			if k == len(*xcxData)-1 {
 				cfg.LastXcxUserId = updatetime
 			}