|
|
@@ -527,10 +527,10 @@ html;
|
|
|
if ($period===false)return ["status"=>416]; //非法时段扫码
|
|
|
$mark = false;
|
|
|
mark:
|
|
|
- $car = DeliveryAppointmentCar::query()->whereNull("delivery_time")->whereIn("status",0)
|
|
|
+ $car = DeliveryAppointmentCar::query()->whereNull("delivery_time")->where("status",0)
|
|
|
->where("appointment_number",$number)->whereHas("deliveryAppointment",function (Builder $query)use($period){
|
|
|
$query->where("appointment_date",date("Y-m-d"))
|
|
|
- ->where("date_period",$period)->where("status",0);
|
|
|
+ ->where("date_period",$period)->whereIn("status",[0,3]);
|
|
|
})->first();
|
|
|
if (!$car && $period===1){$period = 0;$mark = true;goto mark;}
|
|
|
if ($mark && $car){
|