liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
richboo111
2022-10-08 14:29:54 +08:00
parent 7a55240b84
commit e153ac80ba
1 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
business/partner/purchase/tiktok_store/store.go
View File

@@ -46,7 +46,6 @@ func splicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) (
if openTime1 != 0 && closeTime1 != 0 { if openTime1 != 0 && closeTime1 != 0 {
tOpenTime1 := utils.Int64ToStr(int64(openTime1)) tOpenTime1 := utils.Int64ToStr(int64(openTime1))
len1 := len(tOpenTime1) - 2 len1 := len(tOpenTime1) - 2
<<<<<<< HEAD
if utils.Str2Int(tOpenTime1[:len1]) <= 9 { if utils.Str2Int(tOpenTime1[:len1]) <= 9 {
s1 += "0" s1 += "0"
} }
@@ -63,17 +62,10 @@ func splicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) (
close1 += "0" + tCloseTime1[len2+1:] close1 += "0" + tCloseTime1[len2+1:]
} }
s2 = tCloseTime1[:len2] + ":" + close1 + "0" 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 timeStr += s1 + "-" + s2
if openTime2 != 0 && closeTime2 != 0 { if openTime2 != 0 && closeTime2 != 0 {
tOpenTime2 := utils.Int64ToStr(int64(openTime2)) tOpenTime2 := utils.Int64ToStr(int64(openTime2))
len3 := len(tOpenTime2) - 2 len3 := len(tOpenTime2) - 2
<<<<<<< HEAD
if utils.Str2Int(tOpenTime2[:len3]) <= 9 { if utils.Str2Int(tOpenTime2[:len3]) <= 9 {
s3 += "0" s3 += "0"
} }
@@ -89,16 +81,8 @@ func splicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) (
if utils.Str2Int(tCloseTime2[len4+1:]) <= 9 { if utils.Str2Int(tCloseTime2[len4+1:]) <= 9 {
close2 += "0" + tCloseTime2[len4+1:] close2 += "0" + tCloseTime2[len4+1:]
} }
s4 = tCloseTime2[:len4] + ":" + close2 + "0" s4 = tCloseTime2[:len4] + ":" + close2 + "0"
timeStr += "," + s3 + "-" + s4 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 return timeStr
@@ -119,13 +103,9 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
} }
m := make(map[int64]string) m := make(map[int64]string)
for j := 1; j <= 7; j++ { for j := 1; j <= 7; j++ {
<<<<<<< HEAD
globals.SugarLogger.Debug("我在==========timeStr") globals.SugarLogger.Debug("我在==========timeStr")
m[int64(j)] = timeStr m[int64(j)] = timeStr
//globals.SugarLogger.Debug("================", m[1]) //globals.SugarLogger.Debug("================", m[1])
=======
m[int64(j)] = timeStr
>>>>>>> 0d93520be39ae41e26cbc68786994fc7dd0b4db9
} }
list := shop_batchCreateStore_request.StoreListItem{ list := shop_batchCreateStore_request.StoreListItem{
RowId: 1, RowId: 1,