fly 5 rokov pred
rodič
commit
f730e3b72c

+ 8 - 1
app/Http/Controllers/QuickApp/Order/OrdersController.php

@@ -456,6 +456,7 @@ class OrdersController extends BaseController
      * @apiSuccess {int}   code 状态码
      * @apiSuccess {String}  msg 信息
      * @apiSuccess {Object}  data 信息
+     * @apiSuccess {Object}  data.trade_no 订单号
      * @apiSuccess {Object}  data.appId 唤起支付的appId
      * @apiSuccess {Object}  data.mch_id 唤起支付的mch_id
      * @apiSuccess {Object}  data.nonce_str 唤起支付的nonce_str
@@ -483,6 +484,7 @@ class OrdersController extends BaseController
         $params['trade_type']   = 'APP'; //交易类型
         $result = $app->handle($params);
         if ($result) {
+            $result['trade_no'] = $params['trade_no'];
             return response()->success($result);
         } else {
             return response()->error('APP_CREATE_WECHAT_ORDER_FAIL');
@@ -502,6 +504,7 @@ class OrdersController extends BaseController
      * @apiSuccess {int}   code 状态码
      * @apiSuccess {String}  msg 信息
      * @apiSuccess {Object}  data 信息
+     * @apiSuccess {Object}  data.trade_no 订单号
      * @apiSuccess {Object}  data.appId 唤起支付的appId
      * @apiSuccess {Object}  data.mch_id 唤起支付的mch_id
      * @apiSuccess {Object}  data.nonce_str 唤起支付的nonce_str
@@ -530,6 +533,7 @@ class OrdersController extends BaseController
         $params['trade_type']   = 'MWEB'; //交易类型
         $result = $app->handle($params);
         if ($result) {
+            $result['trade_no'] = $params['trade_no'];
             return response()->success($result);
         } else {
             return response()->error('APP_CREATE_WECHAT_ORDER_FAIL');
@@ -546,6 +550,8 @@ class OrdersController extends BaseController
      * @apiParam {Int}  send_order_id   send_order_id
      * @apiParam {String}  bid   bid
      * @apiHeader {String} [Authorization]  token
+     * @apiSuccess {Object}  data.order_info 唤起支付信息str
+     * @apiSuccess {Object}  data.trade_no 订单号
      * @apiSuccessExample {json} Success-Response:
      *     HTTP/1.1 200 OK
      *     {
@@ -563,7 +569,8 @@ class OrdersController extends BaseController
             return response()->error('QAPP_PARAM_ERROR');
         }
         $app = OrderArousePayFactory::ali($this->uid);
-        return response()->success($app->handle($params));
+        $order_info = $app->handle($params);
+        return response()->success(['trade_no' => $params['trade_no'], 'order_info' => $order_info]);
     }
 
     /**

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 40 - 1
public/kyydoc/api_data.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 40 - 1
public/kyydoc/api_data.json


+ 1 - 1
public/kyydoc/api_project.js

@@ -17,7 +17,7 @@ define({
   "apidoc": "0.3.0",
   "generator": {
     "name": "apidoc",
-    "time": "2019-10-31T01:38:37.294Z",
+    "time": "2019-10-31T07:46:39.372Z",
     "url": "http://apidocjs.com",
     "version": "0.17.7"
   }

+ 1 - 1
public/kyydoc/api_project.json

@@ -17,7 +17,7 @@
   "apidoc": "0.3.0",
   "generator": {
     "name": "apidoc",
-    "time": "2019-10-31T01:38:37.294Z",
+    "time": "2019-10-31T07:46:39.372Z",
     "url": "http://apidocjs.com",
     "version": "0.17.7"
   }