修改收佣日期更新业绩

application/index/controller/OfficeBargain.php

@@ -696,7 +696,7 @@ class OfficeBargain extends Basic
         if (empty($this->params['bargain_id'])) {
             return $this->response(101, '成交报告id为空');
         }
-        $field = 'a.id,a.scale,a.agent_id,a.role,a.scale_fee,b.scale as new_scale,b.should_commission,a.create_time,a.father_id,a.create_time';
+        $field = 'a.id,a.scale,a.agent_id,a.role,a.scale_fee,b.scale as new_scale,b.should_commission,a.father_id,c.income_time';
         $data  = $this->m_bargain->getBargainPartialDetail($field, [ 'id' => $this->params['bargain_id'] ]);
 
         //检查成交报告是否存在
@@ -757,12 +757,12 @@ class OfficeBargain extends Basic
 
             foreach ($agent_data as $v) {
                 if ($v['id'] == $data_arr['agent_id']) {
-                    $this->totalOfficialReceipts($v['id'], $v['district_id'], $v['store_id'], $data_arr['create_time']);
+                    $this->totalOfficialReceipts($v['id'], $v['district_id'], $v['store_id'], $data_arr['income_time']);
                     $content .= '【分佣方:' . $v['name'] . '-' . $v['phone'].'】';
                 }
 
                 if ($v['id'] == $this->params['agent_id']) {
-                    $this->totalOfficialReceipts($v['id'], $v['district_id'], $v['store_id'], $data_arr['create_time']);
+                    $this->totalOfficialReceipts($v['id'], $v['district_id'], $v['store_id'], $data_arr['income_time']);
                     $content .=  '【修改为：' . $v['name'] . '-' . $v['phone'] . '】';
                 }
             }
@@ -863,8 +863,8 @@ class OfficeBargain extends Basic
                 $m_agent    = new AAgents();
                 $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['income_time']));
-                    $this->totalOfficialReceipts($v['id'], $v['district_id'], $v['store_id'], $create_time);
+                    $income_time = date('Y-m-d', strtotime($v['income_time']));
+                    $this->totalOfficialReceipts($v['id'], $v['district_id'], $v['store_id'], $income_time);
                 }
                 $data['status'] = 'successful';
             }
@@ -1315,7 +1315,7 @@ class OfficeBargain extends Basic
         $msg = '';
         $where['a.status'] = ['in', '20,21'];
         $where[] = ['EXP', 'a.id ='.$this->params['id'].' OR a.father_id='.$this->params['id']];
-        $agent_arr = $this->m_bargain->agentBargainAll('a.create_time,a.agent_id,b.store_id,b.district_id', $where);
+        $agent_arr = $this->m_bargain->agentBargainIncome('a.agent_id,b.store_id,b.district_id,d.income_time', $where);
 
         if (empty($agent_arr)) {
             return $this->response($code, '没有该记录');
@@ -1329,7 +1329,7 @@ class OfficeBargain extends Basic
         if ($is_ok) {
             foreach ($agent_arr as $k=>$v) {
                 try {
-                    $this->totalOfficialReceipts($v['agent_id'], $v['district_id'], $v['store_id'], $v['create_time']);
+                    $this->totalOfficialReceipts($v['agent_id'], $v['district_id'], $v['store_id'], $v['income_time']);
                     $code = 200;
                 } catch (\Exception $e) {
                     $msg = '恢复失败:'.$e->getMessage();

application/model/OfficeOBargainModel.php

@@ -1326,7 +1326,8 @@ class OfficeOBargainModel extends Model
         $result = $this->db_
             ->field($filed)
             ->alias("a")
-            ->join("o_partial_commission b", "a.id = b.bargain_id", "left")
+            ->join("o_office_o_partial_commission b", "a.id = b.bargain_id", "left")
+            ->join("o_office_o_real_income c", "b.real_income_id = c.id", "left")
             ->where($where_)
             ->whereOr($whereOr_)
             ->order("a.id asc")
@@ -1580,6 +1581,24 @@ class OfficeOBargainModel extends Model
             ->select();
     }
 
+    /**
+     * @param $field
+     * @param $where
+     * @return false|\PDOStatement|string|\think\Collection
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function agentBargainIncome($field, $where) {
+        return $this->db_->alias('a')
+            ->field($field)
+            ->join('a_agents b', 'a.agent_id = b.id', 'left')
+            ->join('office_o_partial_commission c', 'a.id = c.bargain_id', 'left')
+            ->join('office_o_real_income d', 'c.real_income_id = d.id', 'left')
+            ->where($where)
+            ->select();
+    }
+
     /**
      * @param $field
      * @param $where