merge

clueSync/config.json

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 {
   "lastOrderId": 258784,
   "lastOrderClueId": "2024-05-25 02:23:21",
@@ -21,6 +20,4 @@
   "activeTime": "2024-07-01 14:59:37",
   "rebindTime": "2024-07-01 14:59:37"
 }
-=======
-{"lastOrderId":258784,"lastOrderClueId":"2024-05-25 02:23:21","lastUserId":"2024-07-11 13:38:02","lastXcxUserId":"2024-07-10 16:30:03","lastId":"668e2be1d1f99a10cd6416a9","lastOrderTime":"2024-07-10 18:10:33","lastUserTime":"2024-07-10 17:55:03","lastSubscribeId":"668e3ec29a9f357bd3e3da06","lastMessageTime":"2024-07-09 17:24:47","lastkcTime":"","lastEverythingTime":"","lastEventRegTime":"","lastReadClueTime":"","bigSaleTime":1718241923,"bigOrderTime":"2024-06-12 17:01:39","marketSaleTime":1708160200,"allocationTime":"2024-07-01 14:59:37","allocationRatio":2}
->>>>>>> master
+

clueSync/db.json

@@ -59,7 +59,6 @@
     "maxidle": 40,
     "maxleft": 40
   },
-<<<<<<< HEAD
   "biService": {
     "host": "192.168.3.14",
     "port": 4000,
@@ -70,8 +69,6 @@
     "maxidle": 40,
     "maxleft": 40
   },
-=======
->>>>>>> master
   "thirdParty": {
     "host": "192.168.3.14",
     "port": 4000,

clueSync/job.go

@@ -434,6 +434,8 @@ func FormatData(data map[string]interface{}, item string) (bool, bool) {
 }
 
 func SaveClue(item, userId, uId, top_cluetype, sub_cluetype, topname, subname, cluename, name, saleName, phone, position, department, departments, industry, follow_project_area, role, seatNumber string, positionId int64, source, sourceCode, remark string, keyword []string, belong_to string, isGroup, isCommerce int, isFreeze bool, demand string) bool {
+	log.Println("线索修改前", item, userId, uId, top_cluetype, sub_cluetype, topname, subname, cluename, name, saleName, phone, position, department, departments, industry, follow_project_area, role, seatNumber, positionId, source, sourceCode, remark)
+	return true
 	nowTime := time.Now().Format("2006-01-02 15:04:05")
 	nowTimes := time.Unix(time.Now().Unix()+3600*12, 0).Format("2006-01-02 15:04:05")
 	clueId, uodateId1, uodateId2, uodateId3, uodateId4, uodateId5, uodateId6 := int64(0), int64(0), int64(0), int64(0), int64(0), int64(0), int64(0)
@@ -1236,7 +1238,8 @@ func WorkUpdateClue(data map[string]interface{}, saleData []map[string]interface
 }
 func UpdateClue(data map[string]interface{}, saleData []map[string]interface{}, item, userId, uId, top_cluetype, sub_cluetype, topname, subname, cluename, name, saleName, phone, position, department, departments, industry, follow_project_area, role, seatNumber, level string, positionId int64, source, sourceCode, remark string, keyword []string, belong_to string, isGroup, isCommerce int, pIsOk bool) bool {
 	name = strings.ReplaceAll(name, " ", "")
-	log.Println("线索修改前", data)
+	log.Println("线索修改前", data, item, userId, uId, top_cluetype, sub_cluetype, topname, subname, cluename, name, saleName, phone, position, department, departments, industry, follow_project_area, role, seatNumber, level, positionId, source, sourceCode, remark)
+	return true
 	nowTime := time.Now().Format("2006-01-02 15:04:05")
 	nowTimes := time.Unix(time.Now().Unix()+3600*12, 0).Format("2006-01-02 15:04:05")
 	trailstatus := common.ObjToString(data["trailstatus"]) //data都为原线索数据

clueSync/main.go

@@ -14,24 +14,6 @@ import (
 )
 
 var (
-<<<<<<< HEAD
-	cfg          = new(Config)
-	db           = new(DB)
-	Mysql        *mysql.Mysql
-	TiDb         *mysql.Mysql
-	TiDbData     *mysql.Mysql
-	TiDbPower    *mysql.Mysql
-	WorkOrder    *mysql.Mysql
-	ThirdParty   *mysql.Mysql
-	Jyactivities *mysql.Mysql
-	Base         *mysql.Mysql
-	BiService    *mysql.Mysql
-	Es           elastic.Es
-	Mgo          *mongodb.MongodbSim
-	MgoLog       *mongodb.MongodbSim
-	MgoQyxy      *mongodb.MongodbSim
-	mode         = flag.Int("m", 1, "")
-=======
 	cfg                = new(Config)
 	db                 = new(DB)
 	Mysql              *mysql.Mysql
@@ -42,13 +24,13 @@ var (
 	ThirdParty         *mysql.Mysql
 	Jyactivities       *mysql.Mysql
 	Base               *mysql.Mysql
+	BiService          *mysql.Mysql
 	Es                 elastic.Es
 	Mgo                *mongodb.MongodbSim
 	MgoLog             *mongodb.MongodbSim
 	MgoQyxy            *mongodb.MongodbSim
 	mode               = flag.Int("m", 1, "")
 	startTime, endTime = "00:00", "23:59"
->>>>>>> master
 )
 
 func main() {