where

application/index/controller/Finance.php

@@ -2760,9 +2760,9 @@ class Finance extends Basic
             if (!empty($where)) {
                 //获取被修改人信息
                 $m_agent    = new AAgents();
-                $agent_data = $m_agent->agentBargainAll('a.id,a.store_id,a.district_id,b.create_time', $where);
+                $agent_data = $m_agent->agentBargainAll('a.id,a.store_id,a.district_id,d.income_time', $where);
                 foreach ($agent_data as $k=>$v) {
-                    $create_time = date('Y-m-d', strtotime($v['create_time']));
+                    $create_time = date('Y-m-d', strtotime($v['income_time']));
                     $this->totalOfficialReceipts($v['id'], $v['district_id'], $v['store_id'], $create_time);
                 }
                 $data['status'] = 'successful';

application/index/controller/OfficeBargain.php

@@ -830,9 +830,9 @@ class OfficeBargain extends Basic
             if (!empty($where)) {
                 //获取被修改人信息
                 $m_agent    = new AAgents();
-                $agent_data = $m_agent->agentBargainOfficeAll('a.id,a.store_id,a.district_id,b.create_time', $where);
+                $agent_data = $m_agent->agentBargainOfficeAll('a.id,a.store_id,a.district_id,d.income_time', $where);
                 foreach ($agent_data as $k=>$v) {
-                    $create_time = date('Y-m-d', strtotime($v['create_time']));
+                    $create_time = date('Y-m-d', strtotime($v['income_time']));
                     $this->totalOfficialReceipts($v['id'], $v['district_id'], $v['store_id'], $create_time);
                 }
                 $data['status'] = 'successful';

application/model/AAgents.php

@@ -1346,6 +1346,8 @@ class AAgents extends BaseModel
             $data = $this->alias('a')
                 ->field($field)
                 ->join('o_bargain b', 'a.id = b.agent_id', 'left')
+                ->join("o_partial_commission c", "b.id = c.bargain_id", "left")
+                ->join('o_real_income d', 'c.real_income_id = d.id', 'left')
                 ->where($where)
                 ->select();
         } catch (\Exception $e) {
@@ -1364,6 +1366,8 @@ class AAgents extends BaseModel
             $data = $this->alias('a')
                 ->field($field)
                 ->join('office_o_bargain b', 'a.id = b.agent_id', 'left')
+                ->join("office_o_partial_commission c", "b.id = c.bargain_id", "left")
+                ->join('office_o_real_income d', 'c.real_income_id = d.id', 'left')
                 ->where($where)
                 ->select();
         } catch (\Exception $e) {

application/model/OBargainModel.php

@@ -640,7 +640,7 @@ class OBargainModel extends Model
         if (isset($params["create_time"])) {
             $where_["c.income_time"] = $params["create_time"];
         }
-
+        $where_["a.status"] = array( "in", "10,11,13" );
         return Db::table($this->table)
             ->field($field)
             ->alias("a")

application/model/OfficeOBargainModel.php

@@ -571,6 +571,7 @@ class OfficeOBargainModel extends Model
         if (isset($params["create_time"])) {
             $where_["c.income_time"] = $params["create_time"];
         }
+        $where_["a.status"] = array( "in", "10,11,13" );
 
         return Db::table($this->table)
             ->field($field)