Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop
This commit is contained in:
邹宗楠
@@ -114,3 +114,7 @@ func TestCreateFences(t *testing.T) {
|
||||
t.Fatal("err===========", err)
|
||||
t.Fatalf("resp===========:%v", resp)
|
||||
}
|
||||
func TestSplice(t *testing.T) {
|
||||
resp := tiktok_store.SplicingTimeToDoudian(100, 1100, 1200, 2100)
|
||||
t.Fatalf("resp===========:%v", resp)
|
||||
}
|
||||
|
||||
@@ -30,67 +30,46 @@ import (
|
||||
"git.rosy.net.cn/jx-callback/globals/api"
|
||||
)
|
||||
|
||||
func splicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) (timeList string) {
|
||||
func SplicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) (timeList string) {
|
||||
//700 1200 -> 07:00-12:00
|
||||
var (
|
||||
s1 = ""
|
||||
ts1 = ""
|
||||
s2 = ""
|
||||
ts2 = ""
|
||||
s3 = ""
|
||||
ts3 = ""
|
||||
s4 = ""
|
||||
ts4 = ""
|
||||
timeStr = ""
|
||||
open1 = ""
|
||||
close1 = ""
|
||||
open2 = ""
|
||||
close2 = ""
|
||||
)
|
||||
if openTime1 != 0 && closeTime1 != 0 {
|
||||
tOpenTime1 := utils.Int64ToStr(int64(openTime1))
|
||||
len1 := len(tOpenTime1) - 2
|
||||
globals.SugarLogger.Debug("====len1====len(tOpenTime1)", tOpenTime1, int64(openTime1), len1, len(tOpenTime1))
|
||||
if utils.Str2Int(tOpenTime1[:len1]) <= 9 {
|
||||
s1 += "0"
|
||||
ts1 = "0"
|
||||
}
|
||||
if utils.Str2Int(tOpenTime1[len1+1:]) <= 9 {
|
||||
open1 += "0" + tOpenTime1[len1+1:]
|
||||
} else {
|
||||
open1 = tOpenTime1[len1+1:]
|
||||
}
|
||||
s1 = tOpenTime1[:len1] + ":" + open1
|
||||
s1 = ts1 + tOpenTime1[:len1] + ":" + tOpenTime1[len1+1:] + "0"
|
||||
tCloseTime1 := utils.Int64ToStr(int64(closeTime1))
|
||||
len2 := len(tCloseTime1) - 2
|
||||
if utils.Str2Int(tCloseTime1[:len2]) <= 9 {
|
||||
s2 += "0"
|
||||
ts2 = "0"
|
||||
}
|
||||
if utils.Str2Int(tCloseTime1[len2+1:]) <= 9 {
|
||||
close1 += "0" + tCloseTime1[len2+1:]
|
||||
} else {
|
||||
close1 = tCloseTime1[len2+1:]
|
||||
}
|
||||
s2 = tCloseTime1[:len2] + ":" + close1
|
||||
s2 = ts2 + tCloseTime1[:len2] + ":" + tCloseTime1[len2+1:] + "0"
|
||||
timeStr += s1 + "-" + s2
|
||||
if openTime2 != 0 && closeTime2 != 0 {
|
||||
tOpenTime2 := utils.Int64ToStr(int64(openTime2))
|
||||
len3 := len(tOpenTime2) - 2
|
||||
if utils.Str2Int(tOpenTime2[:len3]) <= 9 {
|
||||
s3 += "0"
|
||||
ts3 = "0"
|
||||
}
|
||||
if utils.Str2Int(tOpenTime2[len3+1:]) <= 9 {
|
||||
open2 += "0" + tOpenTime2[len3+1:]
|
||||
} else {
|
||||
open2 = tOpenTime2[len3+1:]
|
||||
}
|
||||
s3 = tOpenTime2[:len3] + ":" + open2
|
||||
s3 = ts3 + tOpenTime2[:len3] + ":" + tOpenTime2[len3+1:] + "0"
|
||||
tCloseTime2 := utils.Int64ToStr(int64(closeTime2))
|
||||
len4 := len(tCloseTime2) - 2
|
||||
if utils.Str2Int(tCloseTime2[:len4]) <= 9 {
|
||||
s4 += "0"
|
||||
ts4 = "0"
|
||||
}
|
||||
if utils.Str2Int(tCloseTime2[len4+1:]) <= 9 {
|
||||
close2 += "0" + tCloseTime2[len4+1:]
|
||||
} else {
|
||||
close2 = tCloseTime2[len4+1:]
|
||||
}
|
||||
s4 = tCloseTime2[:len4] + ":" + close2
|
||||
s4 = ts4 + tCloseTime2[:len4] + ":" + tCloseTime2[len4+1:] + "0"
|
||||
timeStr += "," + s3 + "-" + s4
|
||||
}
|
||||
}
|
||||
@@ -109,13 +88,11 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
|
||||
return "", fmt.Errorf("营业时间必填")
|
||||
} else {
|
||||
globals.SugarLogger.Debug("storeDetail.OpenTime1, storeDetail.CloseTime1======", storeDetail.OpenTime1, storeDetail.CloseTime1)
|
||||
timeStr = splicingTimeToDoudian(storeDetail.OpenTime1, storeDetail.CloseTime1, storeDetail.OpenTime2, storeDetail.CloseTime2)
|
||||
timeStr = SplicingTimeToDoudian(storeDetail.OpenTime1, storeDetail.CloseTime1, storeDetail.OpenTime2, storeDetail.CloseTime2)
|
||||
}
|
||||
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,
|
||||
@@ -139,27 +116,27 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
|
||||
if resp, err := getAPI(storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID).BatchCreateStore(ShopBatchCreateStoreParam); err != nil {
|
||||
return "", err
|
||||
} else {
|
||||
//if len(resp.ResultList) == 0 {
|
||||
// return "", errors.New("创建店铺失败")
|
||||
//}
|
||||
////创建成功即创建并绑定电子围栏
|
||||
//fences := []string{}
|
||||
//if fenceID, err := CreateFenceByStore(int(resp.ResultList[0].Store.StoreId)); err != nil {
|
||||
// return "", err
|
||||
//} else {
|
||||
// fences = append(fences, fenceID)
|
||||
// if err := BindFenceByStore(resp.ResultList[0].Store.StoreId, fences); err != nil {
|
||||
// return "", err
|
||||
// }
|
||||
//}
|
||||
//ans := ""
|
||||
globals.SugarLogger.Debug("resp.ResultList========", resp.ResultList[0])
|
||||
if len(resp.ResultList) == 0 {
|
||||
return "", errors.New("创建店铺失败")
|
||||
}
|
||||
for k, v := range resp.ResultList {
|
||||
if k != len(resp.ResultList) {
|
||||
storeIDs += utils.Int64ToStr(v.Store.StoreId) + ","
|
||||
}
|
||||
storeIDs += utils.Int64ToStr(v.Store.StoreId) + v.Store.Name + v.Store.StoreCode
|
||||
//ans := resp.ResultList[0].Store
|
||||
storeIDs += utils.Int64ToStr(v.Store.StoreId)
|
||||
}
|
||||
if utils.Str2Int(storeIDs) == 0 {
|
||||
return "", errors.New("创建店铺失败，请检查店铺基本信息")
|
||||
}
|
||||
//创建成功即创建并绑定电子围栏
|
||||
fences := []string{}
|
||||
if fenceID, err := CreateFenceByStore(int(resp.ResultList[0].Store.StoreId)); err != nil {
|
||||
return "", err
|
||||
} else {
|
||||
fences = append(fences, fenceID)
|
||||
if err := BindFenceByStore(resp.ResultList[0].Store.StoreId, fences); err != nil {
|
||||
return "", err
|
||||
}
|
||||
}
|
||||
globals.SugarLogger.Debug("CreateStore2 return storeIDs==========", storeIDs)
|
||||
return storeIDs, nil
|
||||
@@ -177,12 +154,11 @@ func (P *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
|
||||
db = dao.GetDB()
|
||||
}
|
||||
storeInfo, err = dao.GetStoreDetail(db, storeID, model.VendorIDDD, "")
|
||||
|
||||
errList := errlist.New()
|
||||
timeStr := ""
|
||||
m := make(map[int64]string)
|
||||
if storeInfo.OpenTime1 != 0 && storeInfo.CloseTime1 != 0 {
|
||||
timeStr = splicingTimeToDoudian(storeInfo.OpenTime1, storeInfo.CloseTime1, storeInfo.OpenTime2, storeInfo.CloseTime2)
|
||||
timeStr = SplicingTimeToDoudian(storeInfo.OpenTime1, storeInfo.CloseTime1, storeInfo.OpenTime2, storeInfo.CloseTime2)
|
||||
for j := 1; j <= 7; j++ {
|
||||
m[int64(j)] = timeStr
|
||||
}
|
||||
@@ -190,7 +166,6 @@ func (P *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
|
||||
vendorStoreID := &shop_getStoreDetail_request.ShopGetStoreDetailParam{
|
||||
StoreId: utils.Str2Int64(storeInfo.VendorStoreID),
|
||||
}
|
||||
|
||||
api := getAPI(storeInfo.VendorOrgCode, storeID, utils.Int64ToStr(vendorStoreID.StoreId))
|
||||
if globals.EnableDdStoreWrite {
|
||||
remoteStoreInfo, err2 := api.GetStoreDetail(vendorStoreID)
|
||||
@@ -416,7 +391,7 @@ func (P *PurchaseHandler) UpdateStoreOpTime(ctx *jxcontext.Context, vendorOrgCod
|
||||
t2 := opTimeList[1]
|
||||
t3 := opTimeList[2]
|
||||
t4 := opTimeList[4]
|
||||
timeStr := splicingTimeToDoudian(t1, t2, t3, t4)
|
||||
timeStr := SplicingTimeToDoudian(t1, t2, t3, t4)
|
||||
m := make(map[int64]string)
|
||||
for j := 1; j <= 7; j++ {
|
||||
m[int64(j)] = timeStr
|
||||
@@ -552,7 +527,7 @@ func (P *PurchaseHandler) RefreshAllStoresID(ctx *jxcontext.Context, parentTask
|
||||
}
|
||||
|
||||
func bizStatusJX2DouDian(status int) (onLine int) {
|
||||
if status == model.StoreStatusDisabled || status == model.StoreStatusClosed {
|
||||
if status == model.StoreStatusDisabled || status == model.StoreStatusClosed || status == model.StoreStatusHaveRest {
|
||||
return tiktok_api.StoreStatusOffline
|
||||
}
|
||||
return tiktok_api.StoreStatusOnline
|
||||
|
||||
Reference in New Issue
Block a user