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:26:03 +08:00
parent afb98e055c
commit 43e0708f0e
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 {