From 76d552daac919d36ace0d9aab33d53d9026967c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 25 Feb 2020 09:03:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8B=A5=E4=B8=8B=E5=8D=95=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E4=B8=8D=E5=9C=A8=E9=97=A8=E5=BA=97=E8=90=A5=E4=B8=9A=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=8C=83=E5=9B=B4=E5=86=85=EF=BC=8C=E5=88=99=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=AB=8B=E5=8D=B3=E9=80=81=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jx/localjx/order.go | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index cf574b48e..50e6248cb 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -246,11 +246,13 @@ func GetAvailableDeliverTime(ctx *jxcontext.Context, storeID int) (deliverTimerL
 			Date: fmt.Sprintf("%s(周%s)", dayStr, weekdayMap[int(beginDate.Weekday())]),
 		}
 		if i == 0 {
-			timeInfo.TimeList = append(timeInfo.TimeList, &DeliveryTimeItem{
-				ViewTime:        "立即送出",
-				UnixTime:        0,
-				ViewShippingFee: viewShippingFee,
-			})
+			if isTimeInOpTime(storeDetail.OpenTime1, storeDetail.CloseTime1, storeDetail.OpenTime2, storeDetail.CloseTime2, now) {
+				timeInfo.TimeList = append(timeInfo.TimeList, &DeliveryTimeItem{
+					ViewTime:        "立即送出",
+					UnixTime:        0,
+					ViewShippingFee: viewShippingFee,
+				})
+			}
 		}
 		deliverTimerList = append(deliverTimerList, timeInfo)
 		for j := 0; j < 24*3; j++ {