liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

回退门店配送时间列表

Browse Source
This commit is contained in:
苏尹岚
2020-03-03 11:44:05 +08:00
parent fb22683aec
commit 6a65d4cca1
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
business/partner/purchase/jx/localjx/order.go
View File

@@ -219,7 +219,7 @@ func time2ShortTimeStr(t time.Time) string {
return t.Format("15:04") 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() db := dao.GetDB()
storeDetail, err := dao.GetStoreDetail(db, storeID, model.VendorIDJX) storeDetail, err := dao.GetStoreDetail(db, storeID, model.VendorIDJX)
if err != nil { if err != nil {
@@ -228,10 +228,10 @@ func GetAvailableDeliverTime(ctx *jxcontext.Context, storeID int, timeStr string
if storeDetail.Status != model.StoreStatusOpened { if storeDetail.Status != model.StoreStatusOpened {
return nil, fmt.Errorf("门店:%s不是营业状态,状态是:%s", storeDetail.Name, model.StoreStatusName[storeDetail.Status]) return nil, fmt.Errorf("门店:%s不是营业状态,状态是:%s", storeDetail.Name, model.StoreStatusName[storeDetail.Status])
} }
now := utils.Str2Time(timeStr) // now := utils.Str2Time(timeStr)
// now := time.Now() now := time.Now()
beginDate := utils.Time2Date(utils.Str2Time(timeStr)) // beginDate := utils.Time2Date(utils.Str2Time(timeStr))
// beginDate := utils.Time2Date(now) beginDate := utils.Time2Date(now)
minDingShiDaTime := now.Add(DingShiDaMinTime) minDingShiDaTime := now.Add(DingShiDaMinTime)
viewShippingFee := "约6.6元配送费" viewShippingFee := "约6.6元配送费"
if storeID == specialStoreID { if storeID == specialStoreID {

3
controllers/jx_order2.go
View File

@@ -65,13 +65,12 @@ func (c *JxOrderController) BuyerCancelOrder() {
// @Description 得到门店营业时间配送列表 // @Description 得到门店营业时间配送列表
// @Param token header string true "认证token" // @Param token header string true "认证token"
// @Param storeID query int true "门店ID" // @Param storeID query int true "门店ID"
// @Param timeStr query string true "时间点"
// @Success 200 {object} controllers.CallResult // @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult
// @router /GetAvailableDeliverTime [get] // @router /GetAvailableDeliverTime [get]
func (c *JxOrderController) GetAvailableDeliverTime() { func (c *JxOrderController) GetAvailableDeliverTime() {
c.callGetAvailableDeliverTime(func(params *tJxorderGetAvailableDeliverTimeParams) (retVal interface{}, errCode string, err error) { 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 return retVal, "", err
}) })
} }