diff --git a/app/Service/OrderService.php b/app/Service/OrderService.php index 7931b32..db8777a 100644 --- a/app/Service/OrderService.php +++ b/app/Service/OrderService.php @@ -23,6 +23,7 @@ use App\Service\WxRefundServiceInterface; use App\Service\UserServiceInterface; use App\Model\Users; use App\Constants\SsdbKeysPrefix; +use App\Service\PurchaseLimitServiceInterface; class OrderService implements OrderServiceInterface { @@ -56,6 +57,12 @@ class OrderService implements OrderServiceInterface */ protected $purchaseLimitService; + /** + * @Inject + * @var FinancialRecordServiceInterface + */ + protected $financialService; + /** * @inheritDoc */ @@ -745,8 +752,6 @@ class OrderService implements OrderServiceInterface { Db::beginTransaction(); try { - - $time = time(); // 主订单状态更新 $orderMain = OrderMain::query() ->select('id','global_order_id','state','pay_type','user_id','money') @@ -755,14 +760,14 @@ class OrderService implements OrderServiceInterface if (empty($orderMain)) { Db::rollBack(); - return false; + return '查询不到订单'; } $orderMain->state = OrderMain::ORDER_STATE_REFUNDED; if(!$orderMain->save()){ Db::rollBack(); - return false; + return '更新主订单失败'; }; // 子订单状态更新 @@ -772,7 +777,7 @@ class OrderService implements OrderServiceInterface ->update(['state' => OrderMain::ORDER_STATE_REFUNDED]); if(empty($upChild)){ Db::rollBack(); - return false; + return '更新子订单失败'; } if($orderMain->pay_type == OrderMain::ORDER_PAY_WX){ @@ -789,7 +794,7 @@ class OrderService implements OrderServiceInterface || $refundRes['result_code'] != 'SUCCESS' ){ Db::rollBack(); - return false; + return $refundRes; }; /* --- 退款成功 --- */