diff --git a/app/Constants/v3/ErrorCode.php b/app/Constants/v3/ErrorCode.php index 362d532..df607c8 100644 --- a/app/Constants/v3/ErrorCode.php +++ b/app/Constants/v3/ErrorCode.php @@ -89,12 +89,18 @@ class ErrorCode extends AbstractConstants */ const ORDER_NOT_ENOUGH_INITIAL_DELIVERY = 611; + /** + * 下单失败 + * @Message("付款失败") + */ + const ORDER_OFFLINE_FAIL = 612; + /************************************/ /* 支付相关 651-700 */ /************************************/ /** - * @Message("提现支付失败") + * @Message("支付失败") */ const PAYMENT_FAIL = 651; @@ -118,6 +124,16 @@ class ErrorCode extends AbstractConstants */ const PAYMENT_AMOUNT_LIMIT = 655; + /** + * @Message("提现失败") + */ + const WITHDRAW_PAYMENT_FAIL = 656; + + /** + * @Message("退款失败") + */ + const REFUND_PAYMENT_FAIL = 657; + /************************************/ /* 用户相关 701-750 */ /************************************/ diff --git a/app/Controller/v3/OrderOfflineController.php b/app/Controller/v3/OrderOfflineController.php index c53fb05..e929c3b 100644 --- a/app/Controller/v3/OrderOfflineController.php +++ b/app/Controller/v3/OrderOfflineController.php @@ -47,7 +47,7 @@ class OrderOfflineController extends BaseController $params = $validator->validated(); $store = $this->storeService->detail($params['store_id']); - return $this->success(['store' => $store]); + return $this->success(['store' => $store, 'digit_length' => 8]); } /** diff --git a/app/Service/v3/Implementations/OrderOfflineService.php b/app/Service/v3/Implementations/OrderOfflineService.php index 9e41a25..33883b8 100644 --- a/app/Service/v3/Implementations/OrderOfflineService.php +++ b/app/Service/v3/Implementations/OrderOfflineService.php @@ -99,7 +99,7 @@ class OrderOfflineService implements OrderOfflineServiceInterface } catch (\Exception $e) { Db::rollBack(); $this->log->event(LogLabel::ORDER_OFFLINE_LOG, ['exception_msg' => $e->getMessage()]); - throw new ErrorCodeException(ErrorCode::ORDER_ONLINE_FAIL); + throw new ErrorCodeException(ErrorCode::ORDER_OFFLINE_FAIL); } } diff --git a/app/Service/v3/Implementations/PaymentService.php b/app/Service/v3/Implementations/PaymentService.php index acae5bb..65e6235 100644 --- a/app/Service/v3/Implementations/PaymentService.php +++ b/app/Service/v3/Implementations/PaymentService.php @@ -139,11 +139,11 @@ class PaymentService implements PaymentServiceInterface if ($result['return_code'] == 'SUCCESS' && isset($result['result_code']) && $result['result_code'] == "SUCCESS") { return true; } else { - throw new ErrorCodeException(ErrorCode::PAYMENT_FAIL,$result['err_code_des']); + throw new ErrorCodeException(ErrorCode::REFUND_PAYMENT_FAIL,$result['err_code_des']); } } catch (\Exception $e) { $this->log->event(LogLabel::ORDER_PAYMENT_LOG, ['payment_do_exception_msg' => $e->getMessage()]); - throw new ErrorCodeException(ErrorCode::PAYMENT_FAIL, '[退款失败]'.$e->getMessage()); + throw new ErrorCodeException(ErrorCode::REFUND_PAYMENT_FAIL, '[退款失败]'.$e->getMessage()); } } @@ -182,7 +182,7 @@ class PaymentService implements PaymentServiceInterface 'result' => json_encode($result), 'desc' => $desc ]); - throw new ErrorCodeException(ErrorCode::PAYMENT_FAIL); + throw new ErrorCodeException(ErrorCode::WITHDRAW_PAYMENT_FAIL); } if ($result['result_code'] != 'SUCCESS') { @@ -218,7 +218,7 @@ class PaymentService implements PaymentServiceInterface throw new ErrorCodeException(ErrorCode::PAYMENT_AMOUNT_LIMIT); } - throw new ErrorCodeException(ErrorCode::PAYMENT_FAIL); + throw new ErrorCodeException(ErrorCode::WITHDRAW_PAYMENT_FAIL); } return true;