1
This commit is contained in:
@@ -47,7 +47,7 @@ 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) - 1
|
||||||
if utils.Str2Int(tOpenTime1[:len1]) <= 9 {
|
if utils.Str2Int(tOpenTime1[:len1]) <= 9 {
|
||||||
ts1 = "0"
|
ts1 = "0"
|
||||||
}
|
}
|
||||||
@@ -72,7 +72,7 @@ func SplicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16) (
|
|||||||
ts4 = "0"
|
ts4 = "0"
|
||||||
}
|
}
|
||||||
s4 = ts4 + tCloseTime2[:len4] + ":" + tCloseTime2[len4+1:] + "0"
|
s4 = ts4 + tCloseTime2[:len4] + ":" + tCloseTime2[len4+1:] + "0"
|
||||||
timeStr += "," + s3 + "-" + s4
|
timeStr += " " + s3 + "-" + s4
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return timeStr
|
return timeStr
|
||||||
@@ -171,7 +171,7 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
|
|||||||
} else {
|
} else {
|
||||||
fences := []string{utils.Int2Str(storeDetail.Store.ID)}
|
fences := []string{utils.Int2Str(storeDetail.Store.ID)}
|
||||||
if err := BindFenceByStore(storeDetail.VendorOrgCode, resp.ResultList[0].Store.StoreId, fences); err != nil {
|
if err := BindFenceByStore(storeDetail.VendorOrgCode, resp.ResultList[0].Store.StoreId, fences); err != nil {
|
||||||
errList.AddErr(fmt.Errorf("门店:%d 绑定电子围栏:%d 失败:%v", resp.ResultList[0].Store.StoreId, fenceID, err))
|
errList.AddErr(fmt.Errorf("门店:%d 绑定电子围栏:%s 失败:%v", resp.ResultList[0].Store.StoreId, fenceID, err))
|
||||||
} else {
|
} else {
|
||||||
FreightTemplate.FenceID = fenceID
|
FreightTemplate.FenceID = fenceID
|
||||||
if err := dao.CreateEntity(db, FreightTemplate); err != nil {
|
if err := dao.CreateEntity(db, FreightTemplate); err != nil {
|
||||||
@@ -335,9 +335,13 @@ func CreateFreightTemplate(storeCode int) (int64, error) {
|
|||||||
},
|
},
|
||||||
Columns: []freightTemplate_create_request.ColumnsItem{
|
Columns: []freightTemplate_create_request.ColumnsItem{
|
||||||
{
|
{
|
||||||
RuleAddress: fmt.Sprintf(`{"%s":{"%s":{"%s":[0]}}}`, utils.Int2Str(storeDetail.ProvinceCode), utils.Int2Str(storeDetail.CityCode)[:2], utils.Int2Str(storeDetail.DistrictCode)[:2]),
|
FirstNum: 1,
|
||||||
IsOverFree: true, //是否包邮
|
FirstNumPrice: 0.00,
|
||||||
OverAmount: int64(storeDetail.DeliveryFeeDeductionSill), //此字段在vendor_id=14时 存储满x包邮金额
|
AddNum: 1,
|
||||||
|
AddNumPrice: 0.00,
|
||||||
|
RuleAddress: fmt.Sprintf(`{"%s":{"%s":{"%s":[0]}}}`, utils.Int2Str(storeDetail.ProvinceCode), utils.Int2Str(storeDetail.CityCode)[:2], utils.Int2Str(storeDetail.DistrictCode)[:2]),
|
||||||
|
IsOverFree: true, //是否包邮
|
||||||
|
OverAmount: int64(storeDetail.DeliveryFeeDeductionSill), //此字段在vendor_id=14时 存储满x包邮金额
|
||||||
ProvinceInfos: []freightTemplate_create_request.ProvinceInfosItem{
|
ProvinceInfos: []freightTemplate_create_request.ProvinceInfosItem{
|
||||||
{
|
{
|
||||||
Id: int64(storeDetail.ProvinceCode),
|
Id: int64(storeDetail.ProvinceCode),
|
||||||
|
|||||||
@@ -11,3 +11,9 @@ func TestCreateFreight(t *testing.T) {
|
|||||||
fmt.Println(data)
|
fmt.Println(data)
|
||||||
fmt.Println(err)
|
fmt.Println(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//营业时间格式
|
||||||
|
func TestSplicingTimeToDoudian(t *testing.T) {
|
||||||
|
data := SplicingTimeToDoudian(1130, 1200, 1430, 1500)
|
||||||
|
fmt.Println(data)
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user