合并分支 'Branch_liuzhen' 到 'master'

Branch liuzhen



查看合并请求 !399

@@ -105,6 +105,8 @@ class StoreOrder extends Backend
                 $this->error('该订单已支付');
             }
             $row->status = 2;
+            $row->is_admin = 1;
+            $row->pay_time = time();
             Db::startTrans();
             try {
                 $result = $row->save();
@@ -129,7 +131,7 @@ class StoreOrder extends Backend
                             } else {
                                 $house_update['end_time'] = $time + config('site.house_valid') * 86400;
                             }
-                            $result_store_house = Db::name('store_house')->update(['id' => $store_house['id'], '']);
+                            $result_store_house = Db::name('store_house')->update($house_update);
                         } else {
                             $insert = [
                                 'user_id' => $info['user_id'],

@@ -13,6 +13,9 @@ return [
     'Money'          => '支付金额',
     'Pay_time'       => '支付时间',
     'Transaction_id' => '微信支付ID',
+    'Is_admin'       => '是否为后台修改支付状态',
+    'Is_admin 0'     => '否',
+    'Is_admin 1'     => '是',
     'End_time'       => '过期时间',
     'Createtime'     => '生成时间',
     'Updatetime'     => '更新时间',

@@ -198,7 +198,7 @@ class Ajax extends Frontend
                             } else {
                                 $house_update['end_time'] = $time + config('site.house_valid') * 86400;
                             }
-                            $result_store_house = Db::name('store_house')->update(['id' => $store_house['id'], '']);
+                            $result_store_house = Db::name('store_house')->update($house_update);
                         } else {
                             $insert = [
                                 'user_id' => $info['user_id'],

@@ -33,6 +33,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"2":__('Status 2'),"3":__('Status 3')}, formatter: Table.api.formatter.status},
                         {field: 'money', title: __('Money'), operate:'BETWEEN'},
                         {field: 'pay_time', title: __('Pay_time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
+                        {field: 'is_admin', title: __('Is_admin'), searchList: {"0":__('Is_admin 0'),"1":__('Is_admin 1')}, formatter: Table.api.formatter.status},
                         // {field: 'transaction_id', title: __('Transaction_id')},
                         // {field: 'end_time', title: __('End_time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
                         // {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},