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

获取送达时间，如果是预订单门店只能取明后天

Browse Source
This commit is contained in:
苏尹岚
2020-02-24 16:25:36 +08:00
parent e9aeb8a5cd
commit 65353aa0ca
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/model/dao/store.go
View File

@@ -45,6 +45,7 @@ type StoreDetail struct {
OperatorName3 string `json:"operatorName3"` OperatorName3 string `json:"operatorName3"`
JdStoreLevel string `json:"jdStoreLevel"` //京东门店等级 JdStoreLevel string `json:"jdStoreLevel"` //京东门店等级
IsOrder int `json:"isOrder"` //是否是下预订单门店
} }
// 带快递门店信息的 // 带快递门店信息的
@@ -88,7 +89,7 @@ func getStoreDetail(db *DaoDB, storeID, vendorID int, vendorStoreID string) (sto
sql := ` sql := `
SELECT t1.*, SELECT t1.*,
t2.vendor_store_id, t2.status vendor_status, t2.delivery_fee_deduction_sill, t2.delivery_fee_deduction_fee, t2.sync_status, t2.vendor_org_code, t2.vendor_store_id, t2.status vendor_status, t2.delivery_fee_deduction_sill, t2.delivery_fee_deduction_fee, t2.sync_status, t2.vendor_org_code,
t2.price_percentage, t2.auto_pickup, t2.delivery_type, t2.delivery_competition, t2.is_sync, t2.vendor_store_name, t2.price_percentage, t2.auto_pickup, t2.delivery_type, t2.delivery_competition, t2.is_sync, t2.vendor_store_name, t2.is_order,
t3.value price_percentage_pack_str, t3.value price_percentage_pack_str,
t4.value freight_deduction_pack_str, t4.value freight_deduction_pack_str,
district.name district_name, district.name district_name,

2
business/model/store.go
View File

@@ -418,6 +418,8 @@ type StoreMap struct {
FakeOpenStart int16 `orm:"default(0)" json:"fakeOpenStart"` // 假开店开始 FakeOpenStart int16 `orm:"default(0)" json:"fakeOpenStart"` // 假开店开始
FakeOpenStop int16 `orm:"default(0)" json:"fakeOpenStop"` // 假开店结束 FakeOpenStop int16 `orm:"default(0)" json:"fakeOpenStop"` // 假开店结束
JdStoreLevel string `orm:"size(32)" json:"jdStoreLevel"` //京东门店等级 JdStoreLevel string `orm:"size(32)" json:"jdStoreLevel"` //京东门店等级
IsOrder int `orm:"default(0)" json:"isOrder"` //是否是下预订单门店
} }
func (*StoreMap) TableUnique() [][]string { func (*StoreMap) TableUnique() [][]string {

7
business/partner/purchase/jx/localjx/order.go
View File

@@ -228,7 +228,14 @@ func GetAvailableDeliverTime(ctx *jxcontext.Context, storeID int) (deliverTimerL
if storeID == specialStoreID { if storeID == specialStoreID {
viewShippingFee = "免费配送" viewShippingFee = "免费配送"
} }
var isOrder = false
if storeDetail.IsOrder == model.YES {
isOrder = true
}
for i, dayStr := range dayList { for i, dayStr := range dayList {
if isOrder {
continue
}
openTime1 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime1, beginDate) openTime1 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime1, beginDate)
closeTime1 := jxutils.JxOperationTime2TimeByDate(storeDetail.CloseTime1, beginDate) closeTime1 := jxutils.JxOperationTime2TimeByDate(storeDetail.CloseTime1, beginDate)
openTime2 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime2, beginDate) openTime2 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime2, beginDate)