This commit is contained in:
richboo111
2022-10-24 19:17:56 +08:00
parent 612d9c596f
commit 32da0d6e3b

View File

@@ -35,14 +35,14 @@ import (
func SplicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) (timeList string) { func SplicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) (timeList string) {
//700 1200 -> 07:00-12:00 //700 1200 -> 07:00-12:00
var ( var (
s1 = "" s1 = ""
ts1 = "" ts1 = ""
s2 = "" s2 = ""
ts2 = "" ts2 = ""
//s3 = "" s3 = ""
//ts3 = "" ts3 = ""
//s4 = "" s4 = ""
//ts4 = "" ts4 = ""
timeStr = "" timeStr = ""
) )
if openTime1 != 0 && closeTime1 != 0 { if openTime1 != 0 && closeTime1 != 0 {
@@ -54,27 +54,28 @@ func SplicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) (
s1 = ts1 + tOpenTime1[:len1] + ":" + tOpenTime1[len1+1:] + "0" s1 = ts1 + tOpenTime1[:len1] + ":" + tOpenTime1[len1+1:] + "0"
tCloseTime1 := utils.Int64ToStr(int64(closeTime1)) tCloseTime1 := utils.Int64ToStr(int64(closeTime1))
len2 := len(tCloseTime1) - 2 len2 := len(tCloseTime1) - 2
globals.SugarLogger.Debug("tCloseTime1,len2==========", tCloseTime1, len2)
if utils.Str2Int(tCloseTime1[:len2]) <= 9 { if utils.Str2Int(tCloseTime1[:len2]) <= 9 {
ts2 = "0" ts2 = "0"
} }
s2 = ts2 + tCloseTime1[:len2] + ":" + tCloseTime1[len2+1:] + "0" s2 = ts2 + tCloseTime1[:len2] + ":" + tCloseTime1[len2+1:] + "0"
timeStr += s1 + "-" + s2 timeStr += s1 + "-" + s2
//if openTime2 != 0 && closeTime2 != 0 { if openTime2 != 0 && closeTime2 != 0 {
// globals.SugarLogger.Debug("sdjksejfqujahfq", openTime2, closeTime2) globals.SugarLogger.Debug("sdjksejfqujahfq", openTime2, closeTime2)
// tOpenTime2 := utils.Int64ToStr(int64(openTime2)) tOpenTime2 := utils.Int64ToStr(int64(openTime2))
// len3 := len(tOpenTime2) - 2 len3 := len(tOpenTime2) - 2
// if utils.Str2Int(tOpenTime2[:len3]) <= 9 { if utils.Str2Int(tOpenTime2[:len3]) <= 9 {
// ts3 = "0" ts3 = "0"
// } }
// s3 = ts3 + tOpenTime2[:len3] + ":" + tOpenTime2[len3+1:] + "0" s3 = ts3 + tOpenTime2[:len3] + ":" + tOpenTime2[len3+1:] + "0"
// tCloseTime2 := utils.Int64ToStr(int64(closeTime2)) tCloseTime2 := utils.Int64ToStr(int64(closeTime2))
// len4 := len(tCloseTime2) - 2 len4 := len(tCloseTime2) - 2
// if utils.Str2Int(tCloseTime2[:len4]) <= 9 { if utils.Str2Int(tCloseTime2[:len4]) <= 9 {
// ts4 = "0" ts4 = "0"
// } }
// s4 = ts4 + tCloseTime2[:len4] + ":" + tCloseTime2[len4+1:] + "0" s4 = ts4 + tCloseTime2[:len4] + ":" + tCloseTime2[len4+1:] + "0"
// timeStr += "," + s3 + "-" + s4 timeStr += "," + s3 + "-" + s4
//} }
} }
return timeStr return timeStr
} }