'佣金记录'

application/admin/controller/MemberBill.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\common\controller\Backend;
+
+/**
+ * 用户账单管理
+ *
+ * @icon fa fa-circle-o
+ */
+class MemberBill extends Backend
+{
+    
+    /**
+     * MemberBill模型对象
+     * @var \app\admin\model\MemberBill
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\MemberBill;
+
+    }
+    
+    /**
+     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
+     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
+     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     */
+    
+
+}

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

@@ -0,0 +1,17 @@
+<?php
+
+return [
+    'Id'       => '用户账单id',
+    'Mid'      => '用户mid',
+    'Suser_id' => '商家id',
+    'Link_id'  => '关联id',
+    'Pm'       => '0 = 支出 1 = 获得',
+    'Title'    => '账单标题',
+    'Category' => '明细种类',
+    'Type'     => '0下单,1提现,2佣金',
+    'Number'   => '明细数字',
+    'Balance'  => '剩余',
+    'Mark'     => '备注',
+    'Add_time' => '添加时间',
+    'Status'   => '0 = 待确定 1 = 有效 -1 = 无效'
+];

application/admin/model/MemberBill.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace app\admin\model;
+
+use think\Model;
+
+
+class MemberBill extends Model
+{
+
+    
+
+    
+
+    // 表名
+    protected $name = 'member_bill';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = false;
+
+    // 定义时间戳字段名
+    protected $createTime = false;
+    protected $updateTime = false;
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+        'add_time_text'
+    ];
+    
+
+    
+
+
+
+    public function getAddTimeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['add_time']) ? $data['add_time'] : '');
+        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+    }
+
+    protected function setAddTimeAttr($value)
+    {
+        return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
+    }
+
+
+}

application/admin/validate/MemberBill.php

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

application/admin/view/member_bill/add.html

@@ -0,0 +1,82 @@
+<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">{:__('Mid')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-mid" data-rule="required" class="form-control" name="row[mid]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Suser_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-suser_id" data-rule="required" data-source="suser/index" class="form-control selectpage" name="row[suser_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Link_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-link_id" data-rule="required" data-source="link/index" class="form-control selectpage" name="row[link_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Pm')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-pm" data-rule="required" class="form-control" name="row[pm]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Category')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-category" data-rule="required" class="form-control" name="row[category]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-type" data-rule="required" class="form-control" name="row[type]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Number')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-number" data-rule="required" class="form-control" step="0.01" name="row[number]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Balance')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-balance" data-rule="required" class="form-control" step="0.01" name="row[balance]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Mark')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-mark" data-rule="required" class="form-control" name="row[mark]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Add_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-add_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[add_time]" type="text" value="{:date('Y-m-d H:i:s')}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-status" data-rule="required" class="form-control" name="row[status]" type="number" value="1">
+        </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-success btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

application/admin/view/member_bill/edit.html

@@ -0,0 +1,82 @@
+<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">{:__('Mid')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-mid" data-rule="required" class="form-control" name="row[mid]" type="number" value="{$row.mid|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Suser_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-suser_id" data-rule="required" data-source="suser/index" class="form-control selectpage" name="row[suser_id]" type="text" value="{$row.suser_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Link_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-link_id" data-rule="required" data-source="link/index" class="form-control selectpage" name="row[link_id]" type="text" value="{$row.link_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Pm')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-pm" data-rule="required" class="form-control" name="row[pm]" type="number" value="{$row.pm|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" value="{$row.title|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Category')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-category" data-rule="required" class="form-control" name="row[category]" type="text" value="{$row.category|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-type" data-rule="required" class="form-control" name="row[type]" type="number" value="{$row.type|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Number')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-number" data-rule="required" class="form-control" step="0.01" name="row[number]" type="number" value="{$row.number|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Balance')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-balance" data-rule="required" class="form-control" step="0.01" name="row[balance]" type="number" value="{$row.balance|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Mark')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-mark" data-rule="required" class="form-control" name="row[mark]" type="text" value="{$row.mark|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Add_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-add_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[add_time]" type="text" value="{:$row.add_time?datetime($row.add_time):''}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-status" data-rule="required" class="form-control" name="row[status]" type="number" value="{$row.status|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-success btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

application/admin/view/member_bill/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('member_bill/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('member_bill/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('member_bill/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('member_bill/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>
+
+                        <div class="dropdown btn-group {:$auth->check('member_bill/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('member_bill/edit')}" 
+                           data-operate-del="{:$auth->check('member_bill/del')}" 
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

application/api/controller/Member.php

@@ -5,6 +5,7 @@ namespace app\api\controller;
 
 
 use app\admin\model\Address;
+use app\api\model\MemberBill;
 use app\api\model\MemberExtract;
 use app\api\model\ShopUser;
 use app\common\controller\Api;
@@ -468,6 +469,31 @@ class Member extends Api
         }
         $this->result('ok', [], 1);
     }
+
+    /**
+     * 佣金记录
+     *
+     * @ApiTitle    (佣金记录)
+     * @ApiSummary  (佣金记录)
+     * @ApiMethod   (POST)
+     * @ApiHeaders  (name="user-token", type="string", required=true, description="请求的Token")
+     * @ApiRoute    (/api/order/commission_list)
+     * @ApiParams   (name="user_id", type="int", required=true, description="用户user_id")
+     */
+    public function  commission_list(){
+
+        $user_id = $this->request->post('user_id');
+        $status = $this->request->post('status');
+
+        $where['mid']=$user_id;
+        $where['type']='2';
+
+        $get_order=MemberBill::where($where)
+            ->field('title,number,add_time')
+            ->order('id','desc')
+            ->select();
+        $this->result('success',$get_order,1);
+    }
     /**
      * 维保记录
      *

application/api/controller/Order.php

@@ -5,6 +5,7 @@ namespace app\api\controller;
 
 
 use app\admin\model\Address;
+use app\admin\model\MemberBill;
 use app\admin\model\store\StoreSeckillTIme;
 use app\api\model\Express;
 use app\admin\model\general\Load;
@@ -507,10 +508,28 @@ class Order extends Api
             if (!empty($one_commission)){
                 Member::where('mid',$get_user['spread_mid'])->setInc('brokerage_price',$one_commission);
                 Member::where('mid',$get_user['spread_mid'])->setInc('now_money',$one_commission);
+                $insert_m['mid']=$get_user['spread_mid'];
+                $insert_m['link_id']=$id;
+                $insert_m['pm']='1';
+                $insert_m['title']='佣金';
+                $insert_m['type']='2';
+                $insert_m['number']=$one_commission;
+                $insert_m['add_time']=time();
+                $insert_m['status']='1';
+                MemberBill::insert($insert_m);
             }
             if (!empty($two_commission)){
                 Member::where('mid',$get_user2['spread_mid'])->setInc('brokerage_price',$two_commission);
                 Member::where('mid',$get_user2['spread_mid'])->setInc('now_money',$two_commission);
+                $insert_m['mid']=$get_user2['spread_mid'];
+                $insert_m['link_id']=$id;
+                $insert_m['pm']='1';
+                $insert_m['title']='佣金';
+                $insert_m['type']='2';
+                $insert_m['number']=$two_commission;
+                $insert_m['add_time']=time();
+                $insert_m['status']='1';
+                MemberBill::insert($insert_m);
             }
         }
 
@@ -741,10 +760,28 @@ class Order extends Api
                                 if (!empty($one_commission)){
                                     Member::where('mid',$get_user['spread_mid'])->setInc('brokerage_price',$one_commission);
                                     Member::where('mid',$get_user['spread_mid'])->setInc('now_money',$one_commission);
+                                    $insert_m['mid']=$get_user['spread_mid'];
+                                    $insert_m['link_id']=$get_order['id'];
+                                    $insert_m['pm']='1';
+                                    $insert_m['title']='佣金';
+                                    $insert_m['type']='2';
+                                    $insert_m['number']=$one_commission;
+                                    $insert_m['add_time']=time();
+                                    $insert_m['status']='1';
+                                    MemberBill::insert($insert_m);
                                 }
                                 if (!empty($two_commission)){
                                     Member::where('mid',$get_user2['spread_mid'])->setInc('brokerage_price',$two_commission);
                                     Member::where('mid',$get_user2['spread_mid'])->setInc('now_money',$two_commission);
+                                    $insert_m['mid']=$get_user2['spread_mid'];
+                                    $insert_m['link_id']=$get_order['id'];
+                                    $insert_m['pm']='1';
+                                    $insert_m['title']='佣金';
+                                    $insert_m['type']='2';
+                                    $insert_m['number']=$two_commission;
+                                    $insert_m['add_time']=time();
+                                    $insert_m['status']='1';
+                                    MemberBill::insert($insert_m);
                                 }
                             }
 

application/api/controller/Shop.php

@@ -792,6 +792,7 @@ class Shop extends Api
             ->with(['member'])
             ->where($where1)
             ->field('id,order_id,take_time,mid,suser_id,pay_price,commission_price')
+            ->order('take_time','desc')
             ->select();
 
         $get_num=StoreOrder::where($where)

application/api/model/MemberBill.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace app\api\model;
+
+use think\Model;
+
+
+class MemberBill extends Model
+{
+
+    
+
+    
+
+    // 表名
+    protected $name = 'member_bill';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = false;
+
+    // 定义时间戳字段名
+    protected $createTime = false;
+    protected $updateTime = false;
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+        'add_time_text'
+    ];
+    
+
+    
+
+
+
+    public function getAddTimeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['add_time']) ? $data['add_time'] : '');
+        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+    }
+
+    protected function setAddTimeAttr($value)
+    {
+        return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
+    }
+
+
+}

public/assets/js/backend/member_bill.js

@@ -0,0 +1,61 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'member_bill/index' + location.search,
+                    add_url: 'member_bill/add',
+                    edit_url: 'member_bill/edit',
+                    del_url: 'member_bill/del',
+                    multi_url: 'member_bill/multi',
+                    table: 'member_bill',
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'id', title: __('Id')},
+                        {field: 'mid', title: __('Mid')},
+                        {field: 'suser_id', title: __('Suser_id')},
+                        {field: 'link_id', title: __('Link_id')},
+                        {field: 'pm', title: __('Pm')},
+                        {field: 'title', title: __('Title')},
+                        {field: 'category', title: __('Category')},
+                        {field: 'type', title: __('Type')},
+                        {field: 'number', title: __('Number'), operate:'BETWEEN'},
+                        {field: 'balance', title: __('Balance'), operate:'BETWEEN'},
+                        {field: 'mark', title: __('Mark')},
+                        {field: 'add_time', title: __('Add_time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
+                        {field: 'status', title: __('Status')},
+                        {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;
+});