aa
This commit is contained in:
@@ -2091,8 +2091,8 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
|
|||||||
distance := jxutils.EarthDistance(lng, lat, lng2, lat2)
|
distance := jxutils.EarthDistance(lng, lat, lng2, lat2)
|
||||||
if distance > 1 {
|
if distance > 1 {
|
||||||
order.OrderType = model.OrderTypeAddressErr
|
order.OrderType = model.OrderTypeAddressErr
|
||||||
buildOrderTo102919(order)
|
|
||||||
globals.SugarLogger.Debugf("resultjdsOrders return address")
|
globals.SugarLogger.Debugf("resultjdsOrders return address")
|
||||||
|
order.DeliveryFlag = model.OrderDeliveryFlagMaskScheduleDisabled
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -2109,6 +2109,10 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
|
|||||||
buildOrderTo102919(order)
|
buildOrderTo102919(order)
|
||||||
globals.SugarLogger.Debugf("resultjdsOrders return 4")
|
globals.SugarLogger.Debugf("resultjdsOrders return 4")
|
||||||
}
|
}
|
||||||
|
if store.Status != model.StoreStatusOpened && store.Status != model.StoreStatusHaveRest {
|
||||||
|
buildOrderTo102919(order)
|
||||||
|
globals.SugarLogger.Debugf("resultjdsOrders return status")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
orders = append(orders, order)
|
orders = append(orders, order)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user