申请激活

application/admin/controller/Packageorder.php

@@ -81,18 +81,112 @@ class Packageorder extends Backend
     }
 
     /**
-     * 激活
+     * 用户配套申请激活
+     */
+    public function userapply()
+    {
+        //当前是否为关联查询
+        $this->relationSearch = true;
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if ($this->request->isAjax()) {
+
+            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+
+            $where2 = [
+                'packageorder.order_status' => 1,  //已支付
+                'packageorder.is_gift'      => 0,  //不是赠品
+                'packageorder.use_status'   => 0,  //未激活
+                'packageorder.use_apply_status' => 1,  //已申请激活
+            ];
+
+            $list = $this->model
+                ->with(['user','package'])
+//                ->where($where)
+                ->where($where2)
+                ->order($sort, $order)
+                ->paginate($limit);
+
+            foreach ($list as $row) {
+
+                $row->getRelation('user')->visible(['firstname','lastname']);
+                $row->getRelation('package')->visible(['name','name_en']);
+            }
+
+            $result = array("total" => $list->total(), "rows" => $list->items());
+
+            return json($result);
+        }
+        return $this->view->fetch();
+    }
+
+    /**
+     * 申请激活审核
+     */
+    public function userapply_audit(){
+        $status = input('status',1);
+        $id     = input('id',0);
+
+        Db::startTrans();
+        $package_order = Db::name('package_order')->where('id',$id)->lock(true)->find();
+        if(empty($package_order)){
+            Db::rollback();
+            $this->error(__('请刷新重试'));
+        }
+
+        if($package_order['use_status'] == 1){
+            Db::rollback();
+            $this->error(__('已经激活了,请刷新重试'));
+        }
+        if($package_order['use_apply_status'] != 1){
+            Db::rollback();
+            $this->error(__('已经审核了,请刷新重试'));
+        }
+
+        $time = time();
+
+        $update = [
+            'updatetime'   => $time,
+        ];
+
+        if($status == 1){
+            $update['use_status'] = 1;
+            $update['starttime']  = $time;
+            $update['endtime']    = $time + ($package_order['days'] * 86400);
+            $update['use_apply_status']    = 2;
+
+            $rs = Db::name('package_order')->where('order_no',$package_order['order_no'])->update($update); //这里用order_no，主订单和赠品一起激活
+            Db::commit();
+            $this->success(__('已激活'));
+        }else{
+            $update['use_apply_status']    = 3;
+
+            $rs = Db::name('package_order')->where('id',$package_order['id'])->update($update); //这里用id，主订单驳回就可以
+            Db::commit();
+            $this->success(__('已驳回'));
+
+        }
+
+
+
+    }
+
+    /**
+     * 主动激活
      */
     public function jihuo(){
         $id = input('id',0);
 
-        $package_order = Db::name('package_order')->where('id',$id)->find();
+        Db::startTrans();
+        $package_order = Db::name('package_order')->where('id',$id)->lock(true)->find();
         if(empty($package_order)){
+            Db::rollback();
             $this->error(__('请刷新重试'));
         }
 
         if($package_order['use_status'] == 1){
-            $this->error(__('请刷新重试'));
+            Db::rollback();
+            $this->error(__('已经激活了,请刷新重试'));
         }
 
         $time = time();
@@ -106,6 +200,7 @@ class Packageorder extends Backend
 
         $rs = Db::name('package_order')->where('order_no',$package_order['order_no'])->update($update); //这里用order_no，主订单和赠品一起激活
 
+        Db::commit();
         $this->success(__('已激活'));
 
     }

application/admin/lang/en/packageorder.php

@@ -45,4 +45,7 @@ return [
     '已激活'           => 'Activation successful',
     '已取消'           => 'Cancel successful',
     '请刷新重试'           => 'Refresh and try again',
+    '已经激活了,请刷新重试'  => 'Already activated, please refresh and try again',
+    '已经审核了,请刷新重试'  => 'Already reviewed, please refresh and retry',
+    '已驳回'              => 'Rejected',
 ];

application/admin/view/packageorder/userapply.html

@@ -0,0 +1,20 @@
+<div class="panel panel-default panel-intro">
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <div class="widget-body no-padding">
+                    <div id="toolbar" class="toolbar">
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
+
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

public/assets/js/backend/packageorder.js

@@ -98,6 +98,93 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             // 为表格绑定事件
             Table.api.bindevent(table);
         },
+        userapply: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    userapply_url: 'packageorder/userapply',
+                    table: 'package_order',
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.userapply_url,
+                pk: 'id',
+                sortName: 'id',
+                fixedColumns: true,
+                fixedRightNumber: 1,
+
+                search:false,
+                commonSearch:false,
+                showColumns:false,
+                showToggle:false,
+                showExport:false,
+
+                columns: [
+                    [
+//                        {checkbox: true},
+                        {field: 'id', title: __('Id')},
+                        {field: 'order_no', title: __('Order_no')},
+                        {field: 'use_status', title: __('Use_status'), searchList: {"0":__('Use_status 0'),"1":__('Use_status 1')}, formatter: Table.api.formatter.status},
+                        {field: 'is_gift', title: __('Is_gift'), searchList: {"0":__('Is_gift 0'),"1":__('Is_gift 1')}, formatter: Table.api.formatter.normal},
+                        {field: 'user_id', title: __('User_id')},
+                        {field: 'user.firstname', title: __('User.firstname'), operate: 'LIKE'},
+                        {field: 'user.lastname', title: __('User.lastname'), operate: 'LIKE'},
+                        {field: 'package_id', title: __('Package_id')},
+                        {field: 'package.name', title: __('Package.name'), operate: 'LIKE'},
+                        {field: 'package.name_en', title: __('Package.name_en'), operate: 'LIKE'},
+//                        {field: 'lesson_ids', title: __('Lesson_ids'), operate: false},
+                        {field: 'sessions', title: __('Sessions')},
+                        {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2')}, formatter: Table.api.formatter.normal},
+                        {field: 'remain', title: __('Remain'), operate:false},
+                        {field: 'starttime', title: __('Starttime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'days', title: __('Days')},
+                        {field: 'endtime', title: __('Endtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'price', title: __('Price'), operate:false},
+                        {field: 'order_status', title: __('Order_status'), searchList: {"0":__('Order_status 0'),"1":__('Order_status 1'),"10":__('Order_status 10')}, formatter: Table.api.formatter.status},
+                        {field: 'pay_type', title: __('Pay_type'), searchList: {"1":__('Pay_type 1'),"2":__('Pay_type 2')}, formatter: Table.api.formatter.normal},
+                        {field: 'remark', title: __('Remark'), operate: false},
+                        {field: 'seller', title: __('Seller')},
+                        {field: 'paytime', title: __('Paytime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+//                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+//                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+//                        {field: 'notice_status', title: __('Notice_status'), searchList: {"0":__('Notice_status 0'),"1":__('Notice_status 1'),"2":__('Notice_status 2'),"3":__('Notice_status 3')}, formatter: Table.api.formatter.status},
+//                        {field: 'buy_notice_status', title: __('Buy_notice_status'), searchList: {"0":__('Buy_notice_status 0'),"1":__('Buy_notice_status 1')}, formatter: Table.api.formatter.status},
+
+                        {field: 'operate', title: __('Operate'), table: table,
+                            buttons:[
+                                {
+                                    name:'jihuo',
+                                    text:__('同意并激活'),
+                                    title:__('同意并激活'),
+                                    icon:'fa fa-exclamation-circle',
+                                    classname:'btn btn-xs btn-info btn-ajax',
+                                    url:'packageorder/userapply_audit/id/{ids}/status/2?dialog=1',
+                                    target:'_self',
+                                    refresh:{silent:true},
+                                },
+                                {
+                                    name:'refuse',
+                                    text:__('驳回'),
+                                    title:__('驳回'),
+                                    icon:'fa fa-exclamation-circle',
+                                    classname:'btn btn-xs btn-info btn-ajax',
+                                    url:'packageorder/userapply_audit/id/{ids}/status/3?dialog=1',
+                                    target:'_self',
+                                    refresh:{silent:true},
+                                },
+                            ],
+                            events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                    ]
+                ]
+            });
+
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
         jihuo: function () {
             Controller.api.bindevent();
         },