feat(agent): 添加代理商订单佣金流水管理

.gitignore

@@ -11,7 +11,5 @@ composer.lock
 .vscode
 .user.ini
 /public/uploads
-<<<<<<< HEAD
-=======
 
->>>>>>> dev
+.codebuddy/memory/2025-07-07.md

application/admin/controller/shopro/agent/order/Commission.php

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

application/admin/lang/zh-cn/shopro/agent/order/commission.php

+<?php
+
+return [
+    'Agent_id'                 => '代理商ID',
+    'Agent_user_id'            => '代理商用户ID',
+    'Order_id'                 => '订单ID',
+    'Order_sn'                 => '订单号',
+    'Buyer_user_id'            => '购买人用户ID',
+    'Receive_province_id'      => '收货省份ID',
+    'Receive_province_name'    => '收货省份名称',
+    'Goods_id'                 => '商品ID',
+    'Goods_title'              => '商品标题',
+    'Goods_pay_price'          => '商品实付金额',
+    'Commission_rate_snapshot' => '佣金比例(%快照)',
+    'Commission_amount'        => '佣金金额',
+    'Order_status'             => '订单状态',
+    'Aftersale_order_sn'       => '售后订单号',
+    'Order_confirm_time'       => '订单确认收货时间',
+    'Order_createtime'         => '订单创建时间',
+    'Status'                   => '结算状态:0待结算 1已结算 -1已取消 -2已退款',
+    'Createtime'               => '创建时间',
+    'Updatetime'               => '更新时间'
+];

application/admin/model/shopro/agent/order/Commission.php

+<?php
+
+namespace app\admin\model\shopro\agent\order;
+
+use think\Model;
+
+
+class Commission extends Model
+{
+
+    
+
+    
+
+    // 表名
+    protected $name = 'shopro_agent_order_commission';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = 'integer';
+
+    // 定义时间戳字段名
+    protected $createTime = 'createtime';
+    protected $updateTime = 'updatetime';
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+        'order_confirm_time_text',
+        'order_createtime_text'
+    ];
+    
+
+    
+
+
+
+    public function getOrderConfirmTimeTextAttr($value, $data)
+    {
+        $value = $value ?: ($data['order_confirm_time'] ?? '');
+        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+    }
+
+
+    public function getOrderCreatetimeTextAttr($value, $data)
+    {
+        $value = $value ?: ($data['order_createtime'] ?? '');
+        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+    }
+
+    protected function setOrderConfirmTimeAttr($value)
+    {
+        return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
+    }
+
+    protected function setOrderCreatetimeAttr($value)
+    {
+        return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
+    }
+
+
+}

application/admin/validate/shopro/agent/order/Commission.php

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

application/admin/view/shopro/agent/order/commission/add.html

+<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">{:__('Agent_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-agent_id" data-rule="required" min="0" data-source="agent/index" class="form-control selectpage" name="row[agent_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Agent_user_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-agent_user_id" data-rule="required" min="0" data-source="agent/user/index" class="form-control selectpage" name="row[agent_user_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Order_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-order_id" data-rule="required" min="0" data-source="order/index" class="form-control selectpage" name="row[order_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Order_sn')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-order_sn" class="form-control" name="row[order_sn]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Buyer_user_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-buyer_user_id" data-rule="required" min="0" data-source="buyer/user/index" class="form-control selectpage" name="row[buyer_user_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Receive_province_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-receive_province_id" data-rule="required" min="0" data-source="receive/province/index" class="form-control selectpage" name="row[receive_province_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Receive_province_name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-receive_province_name" class="form-control" name="row[receive_province_name]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Goods_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-goods_id" data-rule="required" min="0" data-source="goods/index" class="form-control selectpage" name="row[goods_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Goods_title')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-goods_title" class="form-control" name="row[goods_title]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Goods_pay_price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-goods_pay_price" class="form-control" step="0.01" name="row[goods_pay_price]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Commission_rate_snapshot')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-commission_rate_snapshot" class="form-control" step="0.01" name="row[commission_rate_snapshot]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Commission_amount')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-commission_amount" class="form-control" step="0.01" name="row[commission_amount]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Order_status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-order_status" class="form-control" name="row[order_status]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Aftersale_order_sn')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-aftersale_order_sn" class="form-control" name="row[aftersale_order_sn]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Order_confirm_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-order_confirm_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[order_confirm_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">{:__('Order_createtime')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-order_createtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[order_createtime]" 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="0">
+        </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>
+        </div>
+    </div>
+</form>

application/admin/view/shopro/agent/order/commission/edit.html

+<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">{:__('Agent_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-agent_id" data-rule="required" min="0" data-source="agent/index" class="form-control selectpage" name="row[agent_id]" type="text" value="{$row.agent_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Agent_user_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-agent_user_id" data-rule="required" min="0" data-source="agent/user/index" class="form-control selectpage" name="row[agent_user_id]" type="text" value="{$row.agent_user_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Order_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-order_id" data-rule="required" min="0" data-source="order/index" class="form-control selectpage" name="row[order_id]" type="text" value="{$row.order_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Order_sn')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-order_sn" class="form-control" name="row[order_sn]" type="text" value="{$row.order_sn|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Buyer_user_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-buyer_user_id" data-rule="required" min="0" data-source="buyer/user/index" class="form-control selectpage" name="row[buyer_user_id]" type="text" value="{$row.buyer_user_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Receive_province_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-receive_province_id" data-rule="required" min="0" data-source="receive/province/index" class="form-control selectpage" name="row[receive_province_id]" type="text" value="{$row.receive_province_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Receive_province_name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-receive_province_name" class="form-control" name="row[receive_province_name]" type="text" value="{$row.receive_province_name|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Goods_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-goods_id" data-rule="required" min="0" data-source="goods/index" class="form-control selectpage" name="row[goods_id]" type="text" value="{$row.goods_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Goods_title')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-goods_title" class="form-control" name="row[goods_title]" type="text" value="{$row.goods_title|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Goods_pay_price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-goods_pay_price" class="form-control" step="0.01" name="row[goods_pay_price]" type="number" value="{$row.goods_pay_price|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Commission_rate_snapshot')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-commission_rate_snapshot" class="form-control" step="0.01" name="row[commission_rate_snapshot]" type="number" value="{$row.commission_rate_snapshot|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Commission_amount')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-commission_amount" class="form-control" step="0.01" name="row[commission_amount]" type="number" value="{$row.commission_amount|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Order_status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-order_status" class="form-control" name="row[order_status]" type="text" value="{$row.order_status|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Aftersale_order_sn')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-aftersale_order_sn" class="form-control" name="row[aftersale_order_sn]" type="text" value="{$row.aftersale_order_sn|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Order_confirm_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-order_confirm_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[order_confirm_time]" type="text" value="{:$row.order_confirm_time?datetime($row.order_confirm_time):''}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Order_createtime')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-order_createtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[order_createtime]" type="text" value="{:$row.order_createtime?datetime($row.order_createtime):''}">
+        </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-primary btn-embossed disabled">{:__('OK')}</button>
+        </div>
+    </div>
+</form>

application/admin/view/shopro/agent/order/commission/index.html

+<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('shopro/agent/order/commission/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('shopro/agent/order/commission/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('shopro/agent/order/commission/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a> -->
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-status-list='{:htmlentities(json_encode($statusList ?? []))}'
+                           data-order-status-list='{:htmlentities(json_encode($orderStatusList ?? []))}'
+                           width="100%">
+                           
+                           <!-- data-operate-edit="{:$auth->check('shopro/agent/order/commission/edit')}" -->
+                           <!-- data-operate-del="{:$auth->check('shopro/agent/order/commission/del')}" -->
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

public/assets/js/backend/shopro/agent/order/commission.js

+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'shopro/agent/order/commission/index' + location.search,
+                    // add_url: 'shopro/agent/order/commission/add',
+                    // edit_url: 'shopro/agent/order/commission/edit',
+                    // del_url: 'shopro/agent/order/commission/del',
+                    multi_url: 'shopro/agent/order/commission/multi',
+                    import_url: 'shopro/agent/order/commission/import',
+                    table: 'shopro_agent_order_commission',
+                }
+            });
+
+            var table = $("#table");
+
+            // 从 DOM 读取状态映射
+            var statusList = table.data('status-list') || {};
+            var orderStatusList = table.data('order-status-list') || {};
+
+            // 初始化表格
+            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: 'agent_id', title: __('Agent_id')},
+                        {field: 'agent_user_id', title: __('Agent_user_id')},
+                        {field: 'order_id', title: __('Order_id')},
+                        {field: 'order_sn', title: __('Order_sn'), operate: 'LIKE'},
+                        {field: 'buyer_user_id', title: __('Buyer_user_id')},
+                        {field: 'receive_province_id', title: __('Receive_province_id')},
+                        {field: 'receive_province_name', title: __('Receive_province_name'), operate: 'LIKE'},
+                        {field: 'goods_id', title: __('Goods_id')},
+                        {field: 'goods_title', title: __('Goods_title'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'goods_pay_price', title: __('Goods_pay_price'), operate:'BETWEEN'},
+                        {field: 'commission_rate_snapshot', title: __('Commission_rate_snapshot'), operate:'BETWEEN'},
+                        {field: 'commission_amount', title: __('Commission_amount'), operate:'BETWEEN'},
+                        {field: 'order_status', title: __('Order_status'), operate: 'LIKE', formatter: function (value) { return orderStatusList[value] || value || '-'; }},
+                        {field: 'aftersale_order_sn', title: __('Aftersale_order_sn'), operate: 'LIKE'},
+                        {field: 'order_confirm_time', title: __('Order_confirm_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'order_createtime', title: __('Order_createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'status', title: __('Status'), formatter: function (value) { return statusList[value] || value || '-'; }},
+                        {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;
+});