diff --git a/business/api/order.go b/business/api/order.go index ddd2c7b..b4c730a 100644 --- a/business/api/order.go +++ b/business/api/order.go @@ -27,7 +27,6 @@ type OrderCreateRequest struct { PetGoodsInfos []PetGoodsInfo //宠物商品信息列表 ServiceTime string //预约时间 yyyy-MM-dd HH:mm ServiceAddrId int64 //预约服务地址 - ServiceAreaId int64 //服务地址ID } type OrderCreateResponse struct { @@ -50,11 +49,11 @@ func (p DefParty) orderCreate() web_iris.Party { UserServiceAddrNotExistError.Fail(ctx, nil) return } - serviceAddr := ServiceAddrMap[orderCreateRequest.ServiceAreaId] - if serviceAddr.Id == 0 { - NotInServiceExistError.Fail(ctx, nil) - return - } + //serviceAddr := ServiceAddrMap[orderCreateRequest.ServiceAreaId] + //if serviceAddr.Id == 0 { + // NotInServiceExistError.Fail(ctx, nil) + // return + //} /*if len(serviceAddr.ServiceArea) > 0 && serviceAddr.ServiceArea != userServiceAddr.AddrArea { ServiceAddrNotExistError.Fail(ctx, nil) return diff --git a/business/utils/commonUtil.go b/business/utils/commonUtil.go index bdbaa0c..01f6af8 100644 --- a/business/utils/commonUtil.go +++ b/business/utils/commonUtil.go @@ -62,6 +62,7 @@ func GetStrDays(day int, minute int, reserveMap map[string]models.ReserveTimeFil Time: nextHour.Format("15:04"), Y: false, }) + nextHour = nextHour.Add(time.Duration(minute) * time.Minute) continue } if _, ok := dayHoursMap[key]; ok {