Merge remote-tracking branch 'origin/jdshop' into jdshop

business/partner/purchase/tiktok_store/store.go

@@ -31,24 +31,66 @@ import (
 )
 
 func splicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) (timeList string) {
-	//700 1200 -> 7:00-12:00
+	//700 1200 -> 07:00-12:00
-	timeStr := ""
+	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:]
+		if utils.Str2Int(tOpenTime1[:len1]) <= 9 {
+			s1 += "0"
+		}
+		if utils.Str2Int(tOpenTime1[len1+1:]) <= 9 {
+			open1 += "0" + tOpenTime1[len1+1:]
+		} else {
+			open1 = tOpenTime1[len1+1:]
+		}
+		s1 = tOpenTime1[:len1] + ":" + open1
 		tCloseTime1 := utils.Int64ToStr(int64(closeTime1))
 		len2 := len(tCloseTime1) - 2
-		s2 := tCloseTime1[:len2] + ":" + tCloseTime1[len2+1:]
+		if utils.Str2Int(tCloseTime1[:len2]) <= 9 {
+			s2 += "0"
+		}
+		if utils.Str2Int(tCloseTime1[len2+1:]) <= 9 {
+			close1 += "0" + tCloseTime1[len2+1:]
+		} else {
+			close1 = tCloseTime1[len2+1:]
+		}
+		s2 = tCloseTime1[:len2] + ":" + close1
 		timeStr += s1 + "-" + s2
 		if openTime2 != 0 && closeTime2 != 0 {
 			tOpenTime2 := utils.Int64ToStr(int64(openTime2))
 			len3 := len(tOpenTime2) - 2
-			s3 := tOpenTime2[:len3] + ":" + tOpenTime2[len3+1:]
+			if utils.Str2Int(tOpenTime2[:len3]) <= 9 {
+				s3 += "0"
+			}
+			if utils.Str2Int(tOpenTime2[len3+1:]) <= 9 {
+				open2 += "0" + tOpenTime2[len3+1:]
+			} else {
+				open2 = tOpenTime2[len3+1:]
+			}
+			s3 = tOpenTime2[:len3] + ":" + open2
 			tCloseTime2 := utils.Int64ToStr(int64(closeTime2))
 			len4 := len(tCloseTime2) - 2
-			s4 := tCloseTime2[:len4] + ":" + tCloseTime2[len4+1:]
+			if utils.Str2Int(tCloseTime2[:len4]) <= 9 {
-			timeStr += " " + s3 + "-" + s4
+				s4 += "0"
+			}
+			if utils.Str2Int(tCloseTime2[len4+1:]) <= 9 {
+				close2 += "0" + tCloseTime2[len4+1:]
+			} else {
+				close2 = tCloseTime2[len4+1:]
+			}
+			s4 = tCloseTime2[:len4] + ":" + close2
+			timeStr += "," + s3 + "-" + s4
 		}
 	}
 	return timeStr
@@ -69,7 +111,9 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
 	}
 	m := make(map[int64]string)
 	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,