pc

application/admin/controller/Finance.php

@@ -2,6 +2,7 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\AdminMoneyLog;
 use app\admin\model\Refund;
 use app\common\controller\Backend;
 
@@ -23,6 +24,8 @@ class Finance extends Backend
         $this->assign('sellAmount',bcsub($payed,$refund));
         $this->assign('payAmount',$payed);
         $this->assign('refundAmount',$refund);
+        $commissionAmount=AdminMoneyLog::whereBetween('create_time',$timeArr)->filterTypeCommission()->sum('amount');
+        $this->assign('commissionAmount',$commissionAmount);
         return $this->fetch();
     }
 }

application/admin/model/Admin.php

@@ -64,4 +64,7 @@ class Admin extends Model
     public function getIsSellerAttr($_,$admin){
         return $admin['user_type']==self::UT_SELLER;
     }
+    public function moneyLog(){
+        return $this->hasMany(AdminMoneyLog::class);
+    }
 }

application/admin/model/AdminMoneyLog.php

@@ -2,14 +2,17 @@
 
 namespace app\admin\model;
 
+use think\db\Query;
 use think\Model;
-
+/**
+ * @method Query|self filterTypeCommission()
+ */
 class AdminMoneyLog extends Model
 {
-    const T_T=1;
+    const T_COMMISSION=1;
 
     public static $money_types=[
-        self::T_T=>'销售提成',
+        self::T_COMMISSION=>'销售提成',
     ];
 
     /**
@@ -19,4 +22,8 @@ class AdminMoneyLog extends Model
     {
         return self::$money_types;
     }
+
+    public function scopeFilterTypeCommission(Query $query){
+        $query->where($this->cn('type'),self::T_COMMISSION);
+    }
 }

application/admin/view/finance/amount_statistics.html

@@ -24,4 +24,5 @@
     let payAmount={$payAmount};
     let refundAmount={$refundAmount};
     let sellAmount={$sellAmount};
+    let commissionAmount={$commissionAmount};
 </script>

public/assets/js/backend/finance.js

@@ -7,14 +7,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','echarts', 'echarts-th
             var option = {
                 xAxis: {
                     type: 'category',
-                    data: ['订单金额','退款金额','销售额']
+                    data: ['订单金额','退款金额','销售额','销售提成']
                 },
                 yAxis: {
                     type: 'value'
                 },
                 series: [
                     {
-                        data: [payAmount,refundAmount,sellAmount],
+                        data: [payAmount,refundAmount,sellAmount,commissionAmount],
                         type: 'bar'
                     }
                 ],

thinkphp/library/think/Model.php

@@ -2352,5 +2352,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
     {
         self::event('after_delete', $callback, $override);
     }
-
+    protected function cn($name){
+        return sprintf('%s.%s',$this->getTable(),$name);
+    }
 }