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:26:48 +08:00
parent bad3c99aa1 0d93520be3
commit 7a55240b84
3 changed files with 101 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,7 @@ 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"
}
@@ -62,10 +63,17 @@ 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"
}
@@ -84,6 +92,13 @@ func splicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) (
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
@@ -101,18 +116,21 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
return "", fmt.Errorf("营业时间必填")
} else {
timeStr = splicingTimeToDoudian(storeDetail.OpenTime1, storeDetail.CloseTime1, storeDetail.OpenTime2, storeDetail.CloseTime2)
globals.SugarLogger.Debug("timeStr", timeStr)
}
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,
Name: storeDetail.Name,
StoreCode: utils.Int2Str(storeDetail.ID),
StoreCode: utils.Int2Str(storeDetail.Store.ID),
Longitude: utils.Float64ToStr(jxutils.IntCoordinate2Standard(storeDetail.Lng)),
Latitude: utils.Float64ToStr(jxutils.IntCoordinate2Standard(storeDetail.Lat)),
Province: storeDetail.ProvinceName,
@@ -124,25 +142,21 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
DayMap: m,
},
}
globals.SugarLogger.Debug("检测list========", list)
lists = append(lists, list)
ShopBatchCreateStoreParam = &shop_batchCreateStore_request.ShopBatchCreateStoreParam{
StoreList: lists,
}
globals.SugarLogger.Debug("检测param========", ShopBatchCreateStoreParam)
globals.SugarLogger.Debug("-=-======================", storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID)
if resp, err := getAPI(storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID).BatchCreateStore(ShopBatchCreateStoreParam); err != nil {
globals.SugarLogger.Debug("检测resp1==========", resp)
return "", err
} else {
globals.SugarLogger.Debug("检测resp2==========", resp)
for k, v := range resp.ResultList {
if k != len(resp.ResultList) {
storeIDs += utils.Int64ToStr(v.Store.StoreId) + ","
}
storeIDs += utils.Int64ToStr(v.Store.StoreId)
}
return storeIDs, err
return storeIDs, nil
}
}