计算

application/index/controller/Finance.php

@@ -1432,13 +1432,13 @@ class Finance extends Basic
         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']}'"];
             $income_date = date('Y.m.d', strtotime($this->params['income_start_date']));
-            $operation_start_data = $this->params['income_start_date'] . ' 00:00:00';
+            $operation_start_data = $this->params['income_start_date'];
         }
 
         if (!empty($this->params['income_end_date']) && empty($this->params['income_start_date'])) {
             $where[0] = ['EXP', "b.income_time < '{$this->params['income_end_date']}' OR c.operation_date < '{$this->params['income_end_date']}'"];
             $income_date = '-' . date('Y.m.d', strtotime($this->params['income_end_date']));
-            $operation_end_data = $this->params['income_end_date'] . ' 23:59:59';
+            $operation_end_data = $this->params['income_end_date'];
         }
 
         if (!empty($this->params['income_start_date']) && !empty($this->params['income_end_date'])) {
@@ -1446,8 +1446,8 @@ class Finance extends Basic
             OR c.operation_date BETWEEN '{$this->params['income_start_date']}' AND '{$this->params['income_end_date']}'"];
             $income_date = date('Y.m.d', strtotime($this->params['income_start_date'])) . '-' . date('Y.m.d', strtotime($this->params['income_end_date']));
 
-            $operation_start_data = $this->params['income_start_date'] . ' 00:00:00';
-            $operation_end_data   = $this->params['income_end_date'] . ' 23:59:59';
+            $operation_start_data = $this->params['income_start_date'];
+            $operation_end_data   = $this->params['income_end_date'];
         }
 
         /**收佣日期 end**/

application/model/OPartialCommission.php

@@ -230,7 +230,7 @@ class OPartialCommission extends BaseModel
             ->select();
 
         $partial_where['a.confirm_status'] = 1;
-        $partial_where['b.status'] = $taxes_where['b.status'] =  ['IN', '10,11,13'];
+        $partial_where['b.status'] =  ['IN', '10,11,13'];
         $partial_where['a.is_del'] = $taxes_where['is_del'] = 0;
         $taxes_where['a.father_id'] = ['>', 0];