Merge branch 'master' of http://git.huxiukeji.com/lizhen/lanjingling

application/admin/controller/UserMoneyLog.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\common\controller\Backend;
+
+/**
+ * 用户资金日志管理
+ *
+ * @icon fa fa-circle-o
+ */
+class UserMoneyLog extends Backend
+{
+
+    /**
+     * UserMoneyLog模型对象
+     * @var \app\admin\model\UserMoneyLog
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\UserMoneyLog;
+
+    }
+
+
+
+    /**
+     * 默认生成的控制器所继承的父类中有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(['company','user'])
+                    ->where($where)
+                    ->order($sort, $order)
+                    ->paginate($limit);
+
+            foreach ($list as $row) {
+                
+                $row->getRelation('company')->visible(['name']);
+				$row->getRelation('user')->visible(['nickname']);
+            }
+
+            $result = array("total" => $list->total(), "rows" => $list->items());
+
+            return json($result);
+        }
+        return $this->view->fetch();
+    }
+
+}

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

@@ -0,0 +1,18 @@
+<?php
+
+return [
+    'Id'            => 'ID',
+    'Company_id'    => '门店ID',
+    'User_id'       => '用户ID',
+    'Log_type'      => '日志类型',
+    'Before'        => '之前余额',
+    'Change_value'  => '变动金额',
+    'Remain'        => '剩余金额',
+    'Table'         => '数据来源',
+    'Table_id'      => '数据来源ID',
+    'Remark'        => '备注',
+    'Createtime'    => '创建时间',
+    'Updatetime'    => '更新时间',
+    'Company.name'  => '店铺名称',
+    'User.nickname' => '昵称'
+];

application/admin/model/UserMoneyLog.php

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

application/admin/validate/UserMoneyLog.php

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

application/admin/view/user_money_log/add.html

@@ -0,0 +1,64 @@
+<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">{:__('Company_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-company_id" data-rule="required" data-source="company/index" class="form-control selectpage" name="row[company_id]" type="text" value="">
+        </div>
+    </div>
+    <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/user_money_log/edit.html

@@ -0,0 +1,64 @@
+<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">{:__('Company_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-company_id" data-rule="required" data-source="company/index" class="form-control selectpage" name="row[company_id]" type="text" value="{$row.company_id|htmlentities}">
+        </div>
+    </div>
+    <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/user_money_log/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('user_money_log/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('user_money_log/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('user_money_log/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        
+
+                        <div class="dropdown btn-group {:$auth->check('user_money_log/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('user_money_log/edit')}"
+                           data-operate-del="{:$auth->check('user_money_log/del')}"
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

application/api/controller/Cooperation.php

@@ -66,9 +66,13 @@ class Cooperation extends Api
     {
         try {
             $userId = $this->auth->id;
-            $field = 'id,name,mobile,servicetype_id,cooperation_status,remark,createtime';
-            $where['user_id'] = $userId;
-            $result = $this->model->where($where)->field($field)->find();
+            $c = 'cooperation';
+            $s = 'servicetype';
+            $field = $c.'.id,'.$c.'.name,mobile,servicetype_id,cooperation_status,'.$c.'.remark,'.$c.'.createtime,'.$s.'.title as `service_title`';
+            $where[$c.'.user_id'] = $userId;
+            $result = $this->model->alias($c)
+                ->join($s,$s.'.id = '.$c.'.servicetype_id','LEFT')
+                ->where($where)->field($field)->find();
             if (!empty($result)) {
                 $statusArr = model('Cooperation')->getCooperationStatusList();
                 $result['cooperation_status_text'] = isset($statusArr[$result['cooperation_status']]) ? $statusArr[$result['cooperation_status']] : '';

application/api/controller/Pay.php

@@ -312,6 +312,7 @@ class Pay extends Api
                     'coupon_name' => $value['name'],
                     'coupon_info' => $value['info'],
                     'createtime' => $time,
+                    'updatetime' => $time,
                     'endtime' => $endtime,
                     'number' => $value['number'],
                     'remain' => $value['number'],

application/common/service/OrderService.php

@@ -207,6 +207,7 @@ class OrderService
                 'paytype'         => $orderPayType,//支付方式:1=线下,2=余额,3=微信
                 'total_fee'       => isset($package['price']) ? $package['price'] : 0.00,//支付总额
                 'createtime'      => $time,//下单时间
+                'updatetime'      => $time,//更新时间
                 'pay_order_id'    => $payOrderId,//支付ID
             ];
             $orderRes = Db::name('order')->insertGetId($orderData);

public/assets/js/backend/user_money_log.js

@@ -0,0 +1,65 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'user_money_log/index' + location.search,
+                    add_url: 'user_money_log/add',
+                    edit_url: 'user_money_log/edit',
+                    del_url: 'user_money_log/del',
+                    multi_url: 'user_money_log/multi',
+                    import_url: 'user_money_log/import',
+                    table: 'user_money_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: 'company_id', title: __('Company_id')},
+                        {field: 'company.name', title: __('Company.name'), operate: 'LIKE'},
+                        {field: 'user_id', title: __('User_id')},
+                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
+                        {field: 'log_type', title: __('Log_type'),operate: false, visible:false},
+                        {field: 'before', title: __('Before'), operate: false},
+                        {field: 'change_value', title: __('Change_value'), operate: false},
+                        {field: 'remain', title: __('Remain'), operate:'BETWEEN'},
+                        {field: 'table', title: __('Table'), operate: false, visible:false},
+                        {field: 'table_id', title: __('Table_id'), operate: false, visible:false},
+                        {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: '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;
+});