From 32da0d6e3bfaada4e63c0891b0eae9e113873609 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 24 Oct 2022 19:17:56 +0800 Subject: [PATCH] 1 --- .../partner/purchase/tiktok_store/store.go | 49 ++++++++++--------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index f1b5c3605..415f9e4db 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -35,14 +35,14 @@ import ( func SplicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) (timeList string) { //700 1200 -> 07:00-12:00 var ( - s1 = "" - ts1 = "" - s2 = "" - ts2 = "" - //s3 = "" - //ts3 = "" - //s4 = "" - //ts4 = "" + s1 = "" + ts1 = "" + s2 = "" + ts2 = "" + s3 = "" + ts3 = "" + s4 = "" + ts4 = "" timeStr = "" ) if openTime1 != 0 && closeTime1 != 0 { @@ -54,27 +54,28 @@ func SplicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) ( s1 = ts1 + tOpenTime1[:len1] + ":" + tOpenTime1[len1+1:] + "0" tCloseTime1 := utils.Int64ToStr(int64(closeTime1)) len2 := len(tCloseTime1) - 2 + globals.SugarLogger.Debug("tCloseTime1,len2==========", tCloseTime1, len2) if utils.Str2Int(tCloseTime1[:len2]) <= 9 { ts2 = "0" } s2 = ts2 + tCloseTime1[:len2] + ":" + tCloseTime1[len2+1:] + "0" timeStr += s1 + "-" + s2 - //if openTime2 != 0 && closeTime2 != 0 { - // globals.SugarLogger.Debug("sdjksejfqujahfq", openTime2, closeTime2) - // tOpenTime2 := utils.Int64ToStr(int64(openTime2)) - // len3 := len(tOpenTime2) - 2 - // if utils.Str2Int(tOpenTime2[:len3]) <= 9 { - // ts3 = "0" - // } - // s3 = ts3 + tOpenTime2[:len3] + ":" + tOpenTime2[len3+1:] + "0" - // tCloseTime2 := utils.Int64ToStr(int64(closeTime2)) - // len4 := len(tCloseTime2) - 2 - // if utils.Str2Int(tCloseTime2[:len4]) <= 9 { - // ts4 = "0" - // } - // s4 = ts4 + tCloseTime2[:len4] + ":" + tCloseTime2[len4+1:] + "0" - // timeStr += "," + s3 + "-" + s4 - //} + if openTime2 != 0 && closeTime2 != 0 { + globals.SugarLogger.Debug("sdjksejfqujahfq", openTime2, closeTime2) + tOpenTime2 := utils.Int64ToStr(int64(openTime2)) + len3 := len(tOpenTime2) - 2 + if utils.Str2Int(tOpenTime2[:len3]) <= 9 { + ts3 = "0" + } + s3 = ts3 + tOpenTime2[:len3] + ":" + tOpenTime2[len3+1:] + "0" + tCloseTime2 := utils.Int64ToStr(int64(closeTime2)) + len4 := len(tCloseTime2) - 2 + if utils.Str2Int(tCloseTime2[:len4]) <= 9 { + ts4 = "0" + } + s4 = ts4 + tCloseTime2[:len4] + ":" + tCloseTime2[len4+1:] + "0" + timeStr += "," + s3 + "-" + s4 + } } return timeStr }