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 }) }