From bad3c99aa13c7185b6cf2c4ee375a2d0e683cac1 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Sat, 8 Oct 2022 14:24:35 +0800 Subject: [PATCH 1/4] debug --- .../partner/purchase/tiktok_store/store.go | 63 ++++++++++++++----- 1 file changed, 46 insertions(+), 17 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index d0fa94233..c7a131f7a 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -31,23 +31,58 @@ import ( ) func splicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) (timeList string) { - //700 1200 -> 7:00-12:00 - timeStr := "" + //700 1200 -> 07:00-12:00 + var ( + s1 = "" + s2 = "" + s3 = "" + s4 = "" + timeStr = "" + open1 = "" + close1 = "" + open2 = "" + close2 = "" + ) if openTime1 != 0 && closeTime1 != 0 { tOpenTime1 := utils.Int64ToStr(int64(openTime1)) len1 := len(tOpenTime1) - 2 - s1 := tOpenTime1[:len1] + ":" + tOpenTime1[len1+1:] + "0" + if utils.Str2Int(tOpenTime1[:len1]) <= 9 { + s1 += "0" + } + if utils.Str2Int(tOpenTime1[len1+1:]) <= 9 { + open1 += "0" + tOpenTime1[len1+1:] + } + s1 = tOpenTime1[:len1] + ":" + open1 + "0" tCloseTime1 := utils.Int64ToStr(int64(closeTime1)) len2 := len(tCloseTime1) - 2 - s2 := tCloseTime1[:len2] + ":" + tCloseTime1[len2+1:] + "0" + if utils.Str2Int(tCloseTime1[:len2]) <= 9 { + s2 += "0" + } + if utils.Str2Int(tCloseTime1[len2+1:]) <= 9 { + close1 += "0" + tCloseTime1[len2+1:] + } + s2 = tCloseTime1[:len2] + ":" + close1 + "0" timeStr += s1 + "-" + s2 if openTime2 != 0 && closeTime2 != 0 { tOpenTime2 := utils.Int64ToStr(int64(openTime2)) len3 := len(tOpenTime2) - 2 - s3 := tOpenTime2[:len3] + ":" + tOpenTime2[len3+1:] + "0" + if utils.Str2Int(tOpenTime2[:len3]) <= 9 { + s3 += "0" + } + if utils.Str2Int(tOpenTime2[len3+1:]) <= 9 { + open2 += "0" + tOpenTime2[len3+1:] + } + s3 = tOpenTime2[:len3] + ":" + open2 + "0" tCloseTime2 := utils.Int64ToStr(int64(closeTime2)) len4 := len(tCloseTime2) - 2 - s4 := tCloseTime2[:len4] + ":" + tCloseTime2[len4+1:] + "0" + if utils.Str2Int(tCloseTime2[:len4]) <= 9 { + s4 += "0" + } + if utils.Str2Int(tCloseTime2[len4+1:]) <= 9 { + close2 += "0" + tCloseTime2[len4+1:] + } + + s4 = tCloseTime2[:len4] + ":" + close2 + "0" timeStr += "," + s3 + "-" + s4 } } @@ -69,17 +104,11 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri globals.SugarLogger.Debug("timeStr", timeStr) } m := make(map[int64]string) - //for j := 1; j <= 7; j++ { - globals.SugarLogger.Debug("我在==========timeStr") - m[1] = timeStr - m[2] = timeStr - m[3] = timeStr - m[4] = timeStr - m[5] = timeStr - m[6] = timeStr - m[7] = timeStr - globals.SugarLogger.Debug("================", m[1]) - //} + for j := 1; j <= 7; j++ { + globals.SugarLogger.Debug("我在==========timeStr") + m[int64(j)] = timeStr + //globals.SugarLogger.Debug("================", m[1]) + } list := shop_batchCreateStore_request.StoreListItem{ RowId: 1, Name: storeDetail.Name, From e153ac80ba6577a5f9c749e83def5dbaa79abf74 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Sat, 8 Oct 2022 14:29:54 +0800 Subject: [PATCH 2/4] 1 --- .../partner/purchase/tiktok_store/store.go | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index a7c8a04af..605f76395 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -46,7 +46,6 @@ func splicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) ( if openTime1 != 0 && closeTime1 != 0 { tOpenTime1 := utils.Int64ToStr(int64(openTime1)) len1 := len(tOpenTime1) - 2 -<<<<<<< HEAD if utils.Str2Int(tOpenTime1[:len1]) <= 9 { s1 += "0" } @@ -63,17 +62,10 @@ func splicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) ( close1 += "0" + tCloseTime1[len2+1:] } s2 = tCloseTime1[:len2] + ":" + close1 + "0" -======= - s1 := tOpenTime1[:len1] + ":" + tOpenTime1[len1+1:] - tCloseTime1 := utils.Int64ToStr(int64(closeTime1)) - len2 := len(tCloseTime1) - 2 - s2 := tCloseTime1[:len2] + ":" + tCloseTime1[len2+1:] ->>>>>>> 0d93520be39ae41e26cbc68786994fc7dd0b4db9 timeStr += s1 + "-" + s2 if openTime2 != 0 && closeTime2 != 0 { tOpenTime2 := utils.Int64ToStr(int64(openTime2)) len3 := len(tOpenTime2) - 2 -<<<<<<< HEAD if utils.Str2Int(tOpenTime2[:len3]) <= 9 { s3 += "0" } @@ -89,16 +81,8 @@ func splicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) ( if utils.Str2Int(tCloseTime2[len4+1:]) <= 9 { close2 += "0" + tCloseTime2[len4+1:] } - s4 = tCloseTime2[:len4] + ":" + close2 + "0" timeStr += "," + s3 + "-" + s4 -======= - s3 := tOpenTime2[:len3] + ":" + tOpenTime2[len3+1:] - tCloseTime2 := utils.Int64ToStr(int64(closeTime2)) - len4 := len(tCloseTime2) - 2 - s4 := tCloseTime2[:len4] + ":" + tCloseTime2[len4+1:] - timeStr += " " + s3 + "-" + s4 ->>>>>>> 0d93520be39ae41e26cbc68786994fc7dd0b4db9 } } return timeStr @@ -119,13 +103,9 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri } m := make(map[int64]string) for j := 1; j <= 7; j++ { -<<<<<<< HEAD globals.SugarLogger.Debug("我在==========timeStr") m[int64(j)] = timeStr //globals.SugarLogger.Debug("================", m[1]) -======= - m[int64(j)] = timeStr ->>>>>>> 0d93520be39ae41e26cbc68786994fc7dd0b4db9 } list := shop_batchCreateStore_request.StoreListItem{ RowId: 1, From b915b9071d273fc93c45900a91b84b6644f2cc42 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Sat, 8 Oct 2022 14:35:47 +0800 Subject: [PATCH 3/4] 1 --- business/partner/purchase/tiktok_store/store.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 605f76395..133f9da4f 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -51,6 +51,8 @@ func splicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) ( } if utils.Str2Int(tOpenTime1[len1+1:]) <= 9 { open1 += "0" + tOpenTime1[len1+1:] + } else { + open1 = tOpenTime1[len1+1:] } s1 = tOpenTime1[:len1] + ":" + open1 + "0" tCloseTime1 := utils.Int64ToStr(int64(closeTime1)) @@ -60,6 +62,8 @@ func splicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) ( } if utils.Str2Int(tCloseTime1[len2+1:]) <= 9 { close1 += "0" + tCloseTime1[len2+1:] + } else { + close1 = tCloseTime1[len2+1:] } s2 = tCloseTime1[:len2] + ":" + close1 + "0" timeStr += s1 + "-" + s2 @@ -71,6 +75,8 @@ func splicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) ( } if utils.Str2Int(tOpenTime2[len3+1:]) <= 9 { open2 += "0" + tOpenTime2[len3+1:] + } else { + open2 = tOpenTime2[len3+1:] } s3 = tOpenTime2[:len3] + ":" + open2 + "0" tCloseTime2 := utils.Int64ToStr(int64(closeTime2)) @@ -80,6 +86,8 @@ func splicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) ( } if utils.Str2Int(tCloseTime2[len4+1:]) <= 9 { close2 += "0" + tCloseTime2[len4+1:] + } else { + close2 = tCloseTime2[len4+1:] } s4 = tCloseTime2[:len4] + ":" + close2 + "0" timeStr += "," + s3 + "-" + s4 From 06e5aa76376c23282334ec16bdb0bf9a916af855 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Sat, 8 Oct 2022 14:37:35 +0800 Subject: [PATCH 4/4] 1 --- business/partner/purchase/tiktok_store/store.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 133f9da4f..635694c98 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -54,7 +54,7 @@ func splicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) ( } else { open1 = tOpenTime1[len1+1:] } - s1 = tOpenTime1[:len1] + ":" + open1 + "0" + s1 = tOpenTime1[:len1] + ":" + open1 tCloseTime1 := utils.Int64ToStr(int64(closeTime1)) len2 := len(tCloseTime1) - 2 if utils.Str2Int(tCloseTime1[:len2]) <= 9 { @@ -65,7 +65,7 @@ func splicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) ( } else { close1 = tCloseTime1[len2+1:] } - s2 = tCloseTime1[:len2] + ":" + close1 + "0" + s2 = tCloseTime1[:len2] + ":" + close1 timeStr += s1 + "-" + s2 if openTime2 != 0 && closeTime2 != 0 { tOpenTime2 := utils.Int64ToStr(int64(openTime2)) @@ -78,7 +78,7 @@ func splicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) ( } else { open2 = tOpenTime2[len3+1:] } - s3 = tOpenTime2[:len3] + ":" + open2 + "0" + s3 = tOpenTime2[:len3] + ":" + open2 tCloseTime2 := utils.Int64ToStr(int64(closeTime2)) len4 := len(tCloseTime2) - 2 if utils.Str2Int(tCloseTime2[:len4]) <= 9 { @@ -89,7 +89,7 @@ func splicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) ( } else { close2 = tCloseTime2[len4+1:] } - s4 = tCloseTime2[:len4] + ":" + close2 + "0" + s4 = tCloseTime2[:len4] + ":" + close2 timeStr += "," + s3 + "-" + s4 } }