commit

app/admin/controller/finance/UserExtract.php

@@ -144,7 +144,7 @@ class UserExtract extends AuthController
         if ($extract->status == -1) return JsonService::fail('您的提现申请已被拒绝!');
         $res = UserExtractModel::changeSuccess($id);
         if ($res) {
-            $this->withdrawal($extract);
+//            $this->withdrawal($extract);
             UserExtractModel::commitTrans();
             return JsonService::successful('操作成功!');
         } else {

app/admin/model/many/ManyOrder.php

@@ -37,7 +37,7 @@ class ManyOrder extends BaseModel
     public static function list($where)
     {
         $model = self::alias('a')
-            ->field('a.*,b.name,u.nickname')
+            ->field('a.*,b.name,u.nickname,u.phone')
             ->order('a.id DESC')
             ->leftJoin('many b', 'b.id = a.many_id')
             ->leftJoin('user u', 'u.uid = a.uid');

app/admin/view/many/many_order/index.php

@@ -170,6 +170,7 @@
             {field: 'order_id', title: '订单号',  align: 'center'},
             {field: 'nickname', title: '用户昵称',  align: 'center'},
             {field: 'name', title: '名称', align: 'center'},
+            {field: 'phone', title: '电话',  align: 'center'},
             {field: 'stage', title: '期数',  align: 'center'},
             {field: 'price', title: '金额',  align: 'center'},
             {field: 'frozen', title: '冻结额度',  align: 'center'},

app/api/controller/order/StoreOrderController.php

@@ -195,7 +195,7 @@ class StoreOrderController
         if ($order === false) return app('json')->fail(StoreOrder::getErrorInfo('订单生成失败'));
         $orderId = $order['order_id'];
         $order_id = $order['order_id'];
-        $info = compact('order_id', 'key');
+        $info = compact('orderId', 'key');
         if ($orderId) {
             event('OrderCreated', [$order]); //订单创建成功事件
             event('ShortMssageSend', [$orderId, 'AdminPlaceAnOrder']);//发送管理员通知
@@ -220,6 +220,8 @@ class StoreOrderController
                             } else if ($from == 'weixinh5') {
                                 $jsConfig = OrderRepository::h5Pay($orderId);
                             }  else if ($from == 'app') {
+                                $jsConfig = OrderRepository::appPay($order);
+                            }  else if ($from == 'sb') {
                                 $data = [
                                     'version' => '10',
                                     'mer_no' => '6888804045113',
@@ -245,8 +247,7 @@ class StoreOrderController
                                     ['sc' => '','s' => 'Android', 'n' => '', 'id' => ''],
                                     ['sc' => '','s' => 'IOS', 'n' => '', 'id' => ''],
                                 ]);
-                                return app('json')->status('ailpay', '订单创建成功',['order' => $data, 'order_id' => $order['order_id']]);
-//                                $jsConfig = OrderRepository::appPay($order);
+                                return app('json')->status('weixin', '订单创建成功',['order' => $data, 'orderId' => $order['order_id']]);
                             }else {
                                 $jsConfig = OrderRepository::wxPay($orderId);
                             }
@@ -324,7 +325,7 @@ class StoreOrderController
                         ['sc' => 'wzsc','s' => 'Android', 'n' => '测试', 'id' => 'com.tencent.tmgp.sgame'],
                         ['sc' => 'wzsc','s' => 'IOS', 'n' => '测试', 'id' => 'com.tencent.tmgp.sgame'],
                     ]);
-                    return app('json')->status('ailpay', '订单创建成功',['order' => $data, 'order_id' => $order['order_id']]);
+                    return app('json')->status('ailpay', '订单创建成功',['order' => $data, 'orderId' => $order['order_id']]);
                 case "ylpay":
                     $data = [
                         'version' => '10',
@@ -351,7 +352,7 @@ class StoreOrderController
                         ['sc' => '','s' => 'Android', 'n' => '', 'id' => ''],
                         ['sc' => '','s' => 'IOS', 'n' => '', 'id' => ''],
                     ]);
-                    return app('json')->status('ylpay', '订单创建成功',['order' => $data, 'order_id' => $order['order_id']]);
+                    return app('json')->status('ylpay', '订单创建成功',['order' => $data, 'orderId' => $order['order_id']]);
             }
         } else return app('json')->fail(StoreOrder::getErrorInfo('订单生成失败!'));
     }
@@ -429,6 +430,8 @@ class StoreOrderController
                     } else if ($from == 'weixinh5') {
                         $jsConfig = OrderRepository::h5Pay($order);
                     } else if ($from == 'app') {
+                        $jsConfig = OrderRepository::appPay($order);
+                    } else if ($from == 'sb') {
                         $data = [
                             'version' => '10',
                             'mer_no' => '6888804045113',
@@ -454,9 +457,8 @@ class StoreOrderController
                             ['sc' => '','s' => 'Android', 'n' => '', 'id' => ''],
                             ['sc' => '','s' => 'IOS', 'n' => '', 'id' => ''],
                         ]);
-                        return app('json')->status('ailpay', '订单创建成功',['order' => $data, 'order_id' => $order['order_id']]);
-//                        $jsConfig = OrderRepository::appPay($order);
-                    } else {
+                        return app('json')->status('weixin', '订单创建成功',['order' => $data, 'orderId' => $order['order_id']]);
+                    }else {
                         $jsConfig = OrderRepository::wxPay($order);
                     }
                 } catch (\Exception $e) {
@@ -536,7 +538,7 @@ class StoreOrderController
                     ['sc' => '','s' => 'Android', 'n' => '', 'id' => ''],
                     ['sc' => '','s' => 'IOS', 'n' => '', 'id' => ''],
                 ]);
-                return app('json')->status('ailpay', '订单创建成功',['order' => $data, 'order_id' => $order['order_id']]);
+                return app('json')->status('ailpay', '订单创建成功',['order' => $data, 'orderId' => $order['order_id']]);
             case "ylpay":
                 $data = [
                     'version' => '10',
@@ -563,7 +565,7 @@ class StoreOrderController
                     ['sc' => '','s' => 'Android', 'n' => '', 'id' => ''],
                     ['sc' => '','s' => 'IOS', 'n' => '', 'id' => ''],
                 ]);
-                return app('json')->status('ylpay', '订单创建成功',['order' => $data, 'order_id' => $order['order_id']]);
+                return app('json')->status('ylpay', '订单创建成功',['order' => $data, 'orderId' => $order['order_id']]);
 
         }
         return app('json')->fail('支付方式错误');

app/models/store/StoreOrder.php

@@ -52,7 +52,7 @@ class StoreOrder extends BaseModel
 
     protected $insert = ['add_time'];
 
-    protected static $payType = ['weixin' => '微信支付', 'yue' => '余额支付', 'offline' => '线下支付', 'app' => 'app支付', 'ailpay' => '支付宝支付', 'ylpay' => '银联支付'];
+    protected static $payType = ['weixin' => '微信支付', 'yue' => '余额支付', 'offline' => '线下支付', 'app' => 'app支付', 'ailpay' => '支付宝支付', 'ylpay' => '银联支付','sb' => '微信支付'];
 
     protected static $deliveryType = ['send' => '商家配送', 'express' => '快递配送'];