From 65353aa0ca175af59d54f2fa99cf1abf01e37194 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 24 Feb 2020 16:25:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=80=81=E8=BE=BE=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=98=AF=E9=A2=84=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=97=A8=E5=BA=97=E5=8F=AA=E8=83=BD=E5=8F=96=E6=98=8E?=
 =?UTF-8?q?=E5=90=8E=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/store.go                   | 3 ++-
 business/model/store.go                       | 2 ++
 business/partner/purchase/jx/localjx/order.go | 7 +++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/business/model/dao/store.go b/business/model/dao/store.go
index 6135869c3..61338a1ac 100644
--- a/business/model/dao/store.go
+++ b/business/model/dao/store.go
@@ -45,6 +45,7 @@ type StoreDetail struct {
 	OperatorName3 string `json:"operatorName3"`
 
 	JdStoreLevel string `json:"jdStoreLevel"` //京东门店等级
+	IsOrder      int    `json:"isOrder"`      //是否是下预订单门店
 }
 
 // 带快递门店信息的
@@ -88,7 +89,7 @@ func getStoreDetail(db *DaoDB, storeID, vendorID int, vendorStoreID string) (sto
 	sql := `
 	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.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,
 	t4.value freight_deduction_pack_str,
 	district.name district_name,
diff --git a/business/model/store.go b/business/model/store.go
index 799714676..6ee1b9e7a 100644
--- a/business/model/store.go
+++ b/business/model/store.go
@@ -418,6 +418,8 @@ type StoreMap struct {
 	FakeOpenStart int16  `orm:"default(0)" json:"fakeOpenStart"` // 假开店开始
 	FakeOpenStop  int16  `orm:"default(0)" json:"fakeOpenStop"`  // 假开店结束
 	JdStoreLevel  string `orm:"size(32)" json:"jdStoreLevel"`    //京东门店等级
+
+	IsOrder int `orm:"default(0)" json:"isOrder"` //是否是下预订单门店
 }
 
 func (*StoreMap) TableUnique() [][]string {
diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index f35c8d385..11ceba455 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -228,7 +228,14 @@ func GetAvailableDeliverTime(ctx *jxcontext.Context, storeID int) (deliverTimerL
 	if storeID == specialStoreID {
 		viewShippingFee = "免费配送"
 	}
+	var isOrder = false
+	if storeDetail.IsOrder == model.YES {
+		isOrder = true
+	}
 	for i, dayStr := range dayList {
+		if isOrder {
+			continue
+		}
 		openTime1 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime1, beginDate)
 		closeTime1 := jxutils.JxOperationTime2TimeByDate(storeDetail.CloseTime1, beginDate)
 		openTime2 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime2, beginDate)