diff --git a/app/Constants/Common/OrderCode.php b/app/Constants/Common/OrderCode.php index 60f21fd..147f296 100644 --- a/app/Constants/Common/OrderCode.php +++ b/app/Constants/Common/OrderCode.php @@ -9,7 +9,7 @@ class OrderCode */ CONST int WAIT_PAY = 1; //待支付 CONST int PAYED = 11; //已支付待写入配餐数据 - CONST int WAIT_CATERING = 16; //已支付待出餐 +// CONST int WAIT_CATERING = 16; //已支付待出餐 CONST int PLAN = 21; //出餐未出发 CONST int DEPART = 31; //已出发 CONST int ARRIVE = 41; // 已送达(待取餐) @@ -23,7 +23,7 @@ class OrderCode */ const array CAN_REFUND_STATUS = [ self::PAYED, - self::WAIT_CATERING, +// self::WAIT_CATERING, self::PLAN, self::DEPART, self::ARRIVE, diff --git a/app/Exception/Handler/ErrExceptionHandler.php b/app/Exception/Handler/ErrExceptionHandler.php index cf5f2e4..4799d10 100644 --- a/app/Exception/Handler/ErrExceptionHandler.php +++ b/app/Exception/Handler/ErrExceptionHandler.php @@ -37,7 +37,7 @@ class ErrExceptionHandler extends ExceptionHandler $urlArr = explode('/',$this->request->path()); $result = match ($urlArr[0]) { 'api' => $this->apiReturn->error($throwable->getMessage(),$throwable->getCode()), - 'admin', 'common' => $this->adminReturn->error($throwable->getMessage(),$throwable->getCode()), + 'admin', 'common', 'web' => $this->adminReturn->error($throwable->getMessage(),$throwable->getCode()), default => null, };