优化订单退款接口

app/JsonRpc/OrderService.php

@@ -81,15 +81,24 @@ class OrderService implements OrderServiceInterface
 
         Db::beginTransaction();
         try {
-            $this->orderOnlineService->doRefund($global_order_id, $user_id);
+            $result = $this->orderOnlineService->doRefund($global_order_id, $user_id);
 
             Db::commit();
+            if ($result['return_code'] == 'SUCCESS' && isset($result['result_code']) && $result['result_code'] == "SUCCESS") {
                 return [
                     "status" => 200,
                     "code" => 0,
                     "result" => [],
                     "message" => '处理成功'
                 ];
+            } else {
+                return [
+                    "status" => 200,
+                    "code" => -1,
+                    "result" => [],
+                    "message" => $result['err_code_des']
+                ];
+            }
         } catch (\Exception $e) {
 
             Db::rollBack();

app/Service/v3/Implementations/PaymentService.php

@@ -127,11 +127,7 @@ class PaymentService implements PaymentServiceInterface
                     'notify_url' => config('wechat.notify_url.refund'),
                 ]
             );
-            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']);
-            }
+            return $result;
         } catch (\Exception $e) {
             $this->log->event(LogLabel::ORDER_PAYMENT_LOG, ['payment_do_exception_msg' => $e->getMessage()]);
             throw new ErrorCodeException(ErrorCode::PAYMENT_FAIL, '[退款失败]'.$e->getMessage());