实收统计2

application/index/controller/Finance.php

@@ -1510,7 +1510,7 @@ class Finance extends Basic
         $pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
         $operation_start_data = $operation_end_data = $income_date = $operation_date = '';
         $where['a.confirm_status'] = 1;
-
+        $is_bargain = 0;
         /**收佣日期 start**/
         if (!empty($this->params['income_start_date']) && empty($this->params['income_end_date'])) {
             $where[0] = ['EXP', "b.income_time > '{$this->params['income_start_date']}' OR c.operation_date > '{$this->params['income_start_date']}'"];
@@ -1540,6 +1540,7 @@ class Finance extends Basic
 
             $operation_date = date('Y.m.d', strtotime($this->params['bargain_start_date']));
             $operation_start_data = $this->params['bargain_start_date'];
+            $is_bargain = 1;
         }
 
         if (!empty($this->params['bargain_end_date']) && empty($this->params['bargain_start_date'])) {
@@ -1547,6 +1548,7 @@ class Finance extends Basic
             $operation_date = date('Y.m.d', strtotime($this->params['bargain_end_date']));
 
             $operation_end_data = $this->params['bargain_end_date'];
+            $is_bargain = 1;
         }
 
         if (!empty($this->params['bargain_start_date']) && !empty($this->params['bargain_end_date'])) {
@@ -1557,6 +1559,7 @@ class Finance extends Basic
 
             $operation_start_data = $this->params['bargain_start_date'];
             $operation_end_data   = $this->params['bargain_end_date'];
+            $is_bargain = 1;
         }
 
         /**部门id**/
@@ -1591,7 +1594,7 @@ class Finance extends Basic
                 $where['a.confirm_date'] = ['<=', $this->params['confirm_date'].' 23:59:59'];
             }
 
-            $list = $m_partial->getCommissionTotalList($pageNo, $pageSize, $fields, $where, $operation_start_data, $operation_end_data);
+            $list = $m_partial->getCommissionTotalList($pageNo, $pageSize, $fields, $where, $operation_start_data, $operation_end_data, $is_bargain);
             foreach ($list as $k => $v) {
                 $list[$k]['income_date']    = $income_date;
                 $list[$k]['operation_date'] = $operation_date;
@@ -1620,7 +1623,7 @@ class Finance extends Basic
                 $where['a.confirm_date'] = ['<=', $this->params['confirm_date'].' 23:59:59'];
                 $where['a.confirm_status'] = 1;
             }
-            $result_data = $m_partial->getCommissionTotalList($pageNo, $pageSize, $fields, $where, $operation_start_data, $operation_end_data);
+            $result_data = $m_partial->getCommissionTotalList($pageNo, $pageSize, $fields, $where, $operation_start_data, $operation_end_data, $is_bargain);
 
             foreach ($result_data as $k => $v) {
                 $excel_data[$k]['income_date'] = $income_date;   //收佣日期

application/model/OPartialCommission.php

@@ -211,11 +211,15 @@ class OPartialCommission extends BaseModel
      * @param int $pageSize
      * @param string $field
      * @param string $params
-     * @return mixed
-     * @throws \think\db\exception\BindParamException
-     * @throws \think\exception\PDOException
+     * @param $operation_start_data
+     * @param $operation_end_data
+     * @param $is_bargain
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
      */
-    public function getCommissionTotalList($pageNo = 1, $pageSize = 15, $field = '', $params = '', $operation_start_data, $operation_end_data)
+    public function getCommissionTotalList($pageNo = 1, $pageSize = 15, $field = '', $params = '', $operation_start_data, $operation_end_data, $is_bargain)
     {
         $agent_id = $this->alias('a')
             ->field('a.agent_id,d.name,d.store_id,d.district_id,e.status')
@@ -240,7 +244,12 @@ class OPartialCommission extends BaseModel
 
             if (in_array($v['status'], [10,11,13])) {
                 $partial_where['a.agent_id'] =$v['agent_id'];
+                if ($is_bargain != 1) {
                     $partial_where['c.income_time'] = ['between', [$operation_start_data, $operation_end_data]];
+                } else {
+                    $partial_where['b.create_time'] = ['between', [$operation_start_data, $operation_end_data]];
+                }
+
                 $result[$k] = $this->getSumMoney($field, $partial_where);
             } else {
                 $result[$k]['practical_fee'] = 0;