From 43e0708f0eb688a81641f3c13db90062ee0256bf 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, 3 Mar 2020 11:26:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=A8=E5=BA=97=E8=90=A5?=
 =?UTF-8?q?=E4=B8=9A=E6=97=B6=E9=97=B4=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jx/localjx/order.go | 6 +++---
 controllers/jx_order2.go                      | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index 3481d2303..18d5b8440 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -219,7 +219,7 @@ func time2ShortTimeStr(t time.Time) string {
 	return t.Format("15:04")
 }
 
-func GetAvailableDeliverTime(ctx *jxcontext.Context, storeID int) (deliverTimerList []*DeliveryDayTimeInfo, err error) {
+func GetAvailableDeliverTime(ctx *jxcontext.Context, storeID int, timeStr string) (deliverTimerList []*DeliveryDayTimeInfo, err error) {
 	db := dao.GetDB()
 	storeDetail, err := dao.GetStoreDetail(db, storeID, model.VendorIDJX)
 	if err != nil {
@@ -228,9 +228,9 @@ func GetAvailableDeliverTime(ctx *jxcontext.Context, storeID int) (deliverTimerL
 	if storeDetail.Status != model.StoreStatusOpened {
 		return nil, fmt.Errorf("门店:%s不是营业状态,状态是:%s", storeDetail.Name, model.StoreStatusName[storeDetail.Status])
 	}
-
 	now := time.Now()
-	beginDate := utils.Time2Date(now)
+	beginDate := utils.Time2Date(utils.Str2Time(timeStr))
+	// beginDate := utils.Time2Date(now)
 	minDingShiDaTime := now.Add(DingShiDaMinTime)
 	viewShippingFee := "约6.6元配送费"
 	if storeID == specialStoreID {
diff --git a/controllers/jx_order2.go b/controllers/jx_order2.go
index 6eab161ca..e66b97d55 100644
--- a/controllers/jx_order2.go
+++ b/controllers/jx_order2.go
@@ -61,16 +61,17 @@ func (c *JxOrderController) BuyerCancelOrder() {
 	})
 }
 
-// @Title 查询网络打印机状态
-// @Description 查询网络打印机状态
+// @Title 得到门店营业时间配送列表
+// @Description 得到门店营业时间配送列表
 // @Param	token			header		string	true	"认证token"
 // @Param	storeID			query		int		true	"门店ID"
+// @Param	timeStr			query		string	true	"时间点"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /GetAvailableDeliverTime [get]
 func (c *JxOrderController) GetAvailableDeliverTime() {
 	c.callGetAvailableDeliverTime(func(params *tJxorderGetAvailableDeliverTimeParams) (retVal interface{}, errCode string, err error) {
-		retVal, err = localjx.GetAvailableDeliverTime(params.Ctx, params.StoreID)
+		retVal, err = localjx.GetAvailableDeliverTime(params.Ctx, params.StoreID, params.TimeStr)
 		return retVal, "", err
 	})
 }