From 6a65d4cca11a1160c45b8a092d8b82e4cc32347e 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:44:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=E9=97=A8=E5=BA=97=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=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 | 10 +++++-----
 controllers/jx_order2.go                      |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index 3cc5211b0..b6ceaf343 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, timeStr string) (deliverTimerList []*DeliveryDayTimeInfo, err error) {
+func GetAvailableDeliverTime(ctx *jxcontext.Context, storeID int) (deliverTimerList []*DeliveryDayTimeInfo, err error) {
 	db := dao.GetDB()
 	storeDetail, err := dao.GetStoreDetail(db, storeID, model.VendorIDJX)
 	if err != nil {
@@ -228,10 +228,10 @@ func GetAvailableDeliverTime(ctx *jxcontext.Context, storeID int, timeStr string
 	if storeDetail.Status != model.StoreStatusOpened {
 		return nil, fmt.Errorf("门店:%s不是营业状态,状态是:%s", storeDetail.Name, model.StoreStatusName[storeDetail.Status])
 	}
-	now := utils.Str2Time(timeStr)
-	// now := time.Now()
-	beginDate := utils.Time2Date(utils.Str2Time(timeStr))
-	// beginDate := utils.Time2Date(now)
+	// now := utils.Str2Time(timeStr)
+	now := time.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 e66b97d55..639ad78b8 100644
--- a/controllers/jx_order2.go
+++ b/controllers/jx_order2.go
@@ -65,13 +65,12 @@ func (c *JxOrderController) BuyerCancelOrder() {
 // @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, params.TimeStr)
+		retVal, err = localjx.GetAvailableDeliverTime(params.Ctx, params.StoreID)
 		return retVal, "", err
 	})
 }