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

clueSync/autoTask.go

@@ -415,7 +415,7 @@ func Thaw() {
 			freezeInt64 := int64(0)
 			freezeStr := gconv.String(v["FREEZE_TIME"])
 			if freezeStr != "" {
-				t, _ := time.Parse(layout, freezeStr)
+				t, _ := time.ParseInLocation(layout, freezeStr, time.Local)
 				freezeInt64 = t.Unix()
 			}
 			if freezeInt64 < nowTime.Unix() {
@@ -432,7 +432,7 @@ func Thaw() {
 						"change_type":  "所属人变更",
 						"old_value":    nameMap[positionId],
 						"new_value":    "/",
-						"createtime":   nowTime,
+						"createtime":   time.Now().Format(date.Date_Full_Layout),
 						"BCPCID":       common.GetRandom(32),
 						"operator_id":  -1,
 					})
@@ -443,7 +443,7 @@ func Thaw() {
 					"change_field": "position_id",
 					"change_type":  "线索解冻",
 					"new_value":    "自动退回公海",
-					"createtime":   nowTime,
+					"createtime":   time.Now().Format(date.Date_Full_Layout),
 					"BCPCID":       common.GetRandom(32),
 					"operator_id":  -1,
 				})

clueSync/kc.go

@@ -604,7 +604,7 @@ func ordersClue() {
 								"clue_id":     clueId,
 								"position_id": positionId,
 								"change_type": "线索冻结",
-								"new_value":   "线索冻结",
+								"new_value":   "销售人员私海已达上限",
 								"createtime":  nowTime,
 								"BCPCID":      common.GetRandom(32),
 								"operator_id": -1,
@@ -822,7 +822,7 @@ func refundAuto() {
 								"clue_id":     clueId,
 								"position_id": saleId,
 								"change_type": "线索冻结",
-								"new_value":   "销售人员私海线索已释放",
+								"new_value":   "销售人员私海已达上限",
 								"createtime":  nowTime,
 								"BCPCID":      common.GetRandom(32),
 								"operator_id": -1,