实收佣金同步删除id

application/index/controller/Finance.php

@@ -418,7 +418,7 @@ class Finance extends Basic
             $data['code'] = 101;
             $data['msg']  = '实收佣金最多5条记录';
         } else {
-            $update_data = [];
+            $update_data = $del_bargain_real = [];
 
             //实收佣金
             if (count($this->params['practical_fee']) > 5) {
@@ -482,6 +482,7 @@ class Finance extends Basic
                         $update_real_arr[$i]['id']     = $item['fee_id'];
                         $update_real_arr[$i]['is_del'] = 1;
                         $log_data[$i]                  = '[删除实收佣金：' . $item['fee'] . '，收佣日期' . $item['operation_date'] . ']';  //
+                        $del_bargain_real[] = $bargain_id;
                         $i++;
                     } elseif ($item["fee_id"] > 0) {
                         $update_real_arr[$i]['id']           = $item['fee_id'];
@@ -511,6 +512,15 @@ class Finance extends Basic
 
                     $content = '[应收总佣金：' . $update_data['commission'] . ']' . implode(' ', $log_data);
                     $this->editRecordLog((int)$this->params["id"], $content, 1, '', $update_data['is_open']);
+
+                    if (empty($del_bargain_real)) {
+                        $m_partial = new OPartialCommission();
+                        $del_bargain_real = array_unique($del_bargain_real);
+                        foreach ($del_bargain_real as $v) {
+                            $m_partial->editData(['real_income_id'=>0], $v, 'bargain_id');
+                        }
+                    }
+
                 } catch (\Exception $e) {
                     return $this->response(101, '内部错误，修改成交报告失败！请联系运营。');
                 }

application/model/OBargainModel.php

@@ -1108,7 +1108,7 @@ class OBargainModel extends Model
                 ->select();
             foreach ($partial_commission as $k2 => $v2) {
                 if (empty($v2['real_income_id'])) {
-                    $income_time = $m_real->field('id,income_time')->where('bargain_id', $bargain_id)->select();
+                    $income_time = $m_real->field('id,income_time')->where(['bargain_id'=>$bargain_id,'is_del'=>0])->select();
                     //当只有一个收入日期，给前端显示用
                     if (count($income_time) == 1) {
                         $income_time_add['id'] = $income_time[0]['id'];
@@ -1116,7 +1116,7 @@ class OBargainModel extends Model
                         $partial_commission[$k2]['income_time_add'] = $income_time_add;
                     }
                 } else {
-                    $income_time = $m_real->field('id,income_time')->find($v2['real_income_id']);
+                    $income_time = $m_real->field('id,income_time')->where('is_del', 0)->find($v2['real_income_id']);
                     if (empty($income_time)) {
                         $partial_commission[$k2]['income_time'] = [];
                     } else {