用户钱包流水

application/admin/controller/Userscorelog.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\common\controller\Backend;
+
+/**
+ * 用户积分流水
+ *
+ * @icon fa fa-circle-o
+ */
+class Userscorelog extends Backend
+{
+
+    /**
+     * Userscorelog模型对象
+     * @var \app\admin\model\Userscorelog
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\Userscorelog;
+
+    }
+
+
+
+    /**
+     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
+     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
+     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     */
+
+
+    /**
+     * 查看
+     */
+    public function index()
+    {
+        //当前是否为关联查询
+        $this->relationSearch = true;
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if ($this->request->isAjax()) {
+            //如果发送的来源是Selectpage，则转发到Selectpage
+            if ($this->request->request('keyField')) {
+                return $this->selectpage();
+            }
+            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+
+            $list = $this->model
+                    ->with(['user'])
+                    ->where($where)
+                    ->order($sort, $order)
+                    ->paginate($limit);
+
+            foreach ($list as $row) {
+                
+                $row->getRelation('user')->visible(['username','nickname','firstname','lastname','email']);
+            }
+
+            $list2 = collection($list->items())->toArray();
+            $logtype = config('wallet.logtype');
+            foreach($list2 as $key => &$val){
+                $val['type_text'] = $logtype[$val['log_type']];
+            }
+
+            $result = array("total" => $list->total(), "rows" => $list2);
+
+            return json($result);
+        }
+        return $this->view->fetch();
+    }
+
+}

application/admin/lang/zh-cn/userscorelog.php

@@ -0,0 +1,20 @@
+<?php
+
+return [
+    'Id'             => '序号',
+    'User_id'        => '用户ID',
+    'Log_type'       => '日志类型',
+    'Before'         => '之前余额',
+    'Change_value'   => '变动金额',
+    'Remain'         => '剩余金额',
+    'Table'          => '数据来源',
+    'Table_id'       => '数据来源ID',
+    'Remark'         => '备注',
+    'Createtime'     => '创建时间',
+    'Updatetime'     => '更新时间',
+    'User.username'  => '用户名',
+    'User.nickname'  => '昵称',
+    'User.firstname' => '名',
+    'User.lastname'  => '姓',
+    'User.email'     => '电子邮箱'
+];

application/admin/model/Userscorelog.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace app\admin\model;
+
+use think\Model;
+
+
+class Userscorelog extends Model
+{
+
+    
+
+    
+
+    // 表名
+    protected $table = 'user_score_log';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = 'integer';
+
+    // 定义时间戳字段名
+    protected $createTime = 'createtime';
+    protected $updateTime = 'updatetime';
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+
+    ];
+    
+
+    
+
+
+
+
+
+
+
+    public function user()
+    {
+        return $this->belongsTo('User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
+}

application/admin/validate/Userscorelog.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace app\admin\validate;
+
+use think\Validate;
+
+class Userscorelog extends Validate
+{
+    /**
+     * 验证规则
+     */
+    protected $rule = [
+    ];
+    /**
+     * 提示消息
+     */
+    protected $message = [
+    ];
+    /**
+     * 验证场景
+     */
+    protected $scene = [
+        'add'  => [],
+        'edit' => [],
+    ];
+    
+}

application/admin/view/userscorelog/add.html

@@ -0,0 +1,58 @@
+<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Log_type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-log_type" data-rule="required" class="form-control" name="row[log_type]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Before')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-before" data-rule="required" class="form-control" step="0.01" name="row[before]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Change_value')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-change_value" data-rule="required" class="form-control" step="0.01" name="row[change_value]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Remain')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-remain" data-rule="required" class="form-control" step="0.01" name="row[remain]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Table')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-table" data-rule="required" class="form-control" name="row[table]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Table_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-table_id" data-rule="required" data-source="table/index" class="form-control selectpage" name="row[table_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-remark" data-rule="required" class="form-control" name="row[remark]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

application/admin/view/userscorelog/edit.html

@@ -0,0 +1,58 @@
+<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Log_type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-log_type" data-rule="required" class="form-control" name="row[log_type]" type="number" value="{$row.log_type|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Before')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-before" data-rule="required" class="form-control" step="0.01" name="row[before]" type="number" value="{$row.before|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Change_value')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-change_value" data-rule="required" class="form-control" step="0.01" name="row[change_value]" type="number" value="{$row.change_value|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Remain')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-remain" data-rule="required" class="form-control" step="0.01" name="row[remain]" type="number" value="{$row.remain|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Table')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-table" data-rule="required" class="form-control" name="row[table]" type="text" value="{$row.table|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Table_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-table_id" data-rule="required" data-source="table/index" class="form-control selectpage" name="row[table_id]" type="text" value="{$row.table_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-remark" data-rule="required" class="form-control" name="row[remark]" type="text" value="{$row.remark|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

application/admin/view/userscorelog/index.html

@@ -0,0 +1,35 @@
+<div class="panel panel-default panel-intro">
+    {:build_heading()}
+
+    <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>
+                        <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('userscorelog/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('userscorelog/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('userscorelog/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        
+
+                        <div class="dropdown btn-group {:$auth->check('userscorelog/multi')?'':'hide'}">
+                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
+                            <ul class="dropdown-menu text-left" role="menu">
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
+                            </ul>
+                        </div>-->
+
+                        
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit="{:$auth->check('userscorelog/edit')}"
+                           data-operate-del="{:$auth->check('userscorelog/del')}"
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

application/api/controller/Notify.php

@@ -174,9 +174,9 @@ class Notify extends Controller
                 return false;
             }
 
-            //大于5小时的，赠送积分
+            //大于等于5小时的，赠送积分
             $package_order = Db::name('package_order')->where('id',$orderInfo['table_id'])->find();
-            if($package_order['remain'] > 5){
+            if($package_order['remain'] >= 5){
 
                 $wallet_rs = model('wallet')->lockChangeAccountRemain($orderInfo['user_id'],'score',$orderInfo['order_amount'],2,'线上购买套餐','package_order',$orderInfo['table_id']);
                 if($wallet_rs['status'] === false){
@@ -185,12 +185,11 @@ class Notify extends Controller
                 }
 
             }
-            //修改预约单。这一块最好搬到计划任务里
-            /*
+            //小于五小时的，免激活。修改预约单状态，减掉相应课时
             $args = json_decode($orderInfo['args'],true);
-            if(isset($args['lesson_order_id']) && !empty($args['lesson_order_id'])){
+            if($package_order['remain'] < 5 && isset($args['lesson_order_id']) && !empty($args['lesson_order_id'])){
 
-                $package_order = Db::name('package_order')->where('order_no',$orderInfo['out_trade_no'])->where('is_gift',0)->find();
+//                $package_order = Db::name('package_order')->where('order_no',$orderInfo['out_trade_no'])->where('is_gift',0)->find();
                 $lesson_order  = Db::name('lesson_order')->where('id',$args['lesson_order_id'])->find();
 
                 //课时能够支撑报名人数
@@ -226,7 +225,6 @@ class Notify extends Controller
                     //新买的课时不足以支撑这次的报名人数，不处理
                 }
             }
-            */
 
         }
 

public/assets/js/backend/userscorelog.js

@@ -0,0 +1,69 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'userscorelog/index' + location.search,
+                    add_url: 'userscorelog/add',
+                    edit_url: 'userscorelog/edit',
+                    del_url: 'userscorelog/del',
+                    multi_url: 'userscorelog/multi',
+                    import_url: 'userscorelog/import',
+                    table: 'user_score_log',
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                fixedColumns: true,
+                fixedRightNumber: 1,
+                columns: [
+                    [
+//                        {checkbox: true},
+                        {field: 'id', title: __('Id')},
+                        {field: 'user_id', title: __('User_id')},
+                        {field: 'user.firstname', title: __('User.firstname'), operate: 'LIKE'},
+                        {field: 'user.lastname', title: __('User.lastname'), operate: 'LIKE'},
+                        {field: 'user.email', title: __('User.email'), operate: 'LIKE'},
+//                        {field: 'log_type', title: __('Log_type')},
+                        {field: 'type_text', title: __('Log_type')},
+                        {field: 'before', title: __('Before'), operate:'BETWEEN'},
+                        {field: 'change_value', title: __('Change_value'), operate:'BETWEEN'},
+                        {field: 'remain', title: __('Remain'), operate:'BETWEEN'},
+//                        {field: 'table', title: __('Table'), operate: 'LIKE'},
+//                        {field: 'table_id', title: __('Table_id')},
+                        {field: 'remark', title: __('Remark'), operate: 'LIKE'},
+                        {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: 'user.username', title: __('User.username'), operate: 'LIKE'},
+                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},*/
+
+//                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                    ]
+                ]
+            });
+
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
+        add: function () {
+            Controller.api.bindevent();
+        },
+        edit: function () {
+            Controller.api.bindevent();
+        },
+        api: {
+            bindevent: function () {
+                Form.api.bindevent($("form[role=form]"));
+            }
+        }
+    };
+    return Controller;
+});