Revert "Revert "收佣日期统计""

application/index/controller/Finance.php

@@ -1008,7 +1008,7 @@ class Finance extends Basic
         $check     = new VipService();
         $data      = $this->params["commission_date"];
 
-        $add_arr = $update_arr = $log_data = $real_income_id = $real_income_old = [];
+        $add_arr = $update_arr = $log_data = $real_income_id = [];
         $i       = $j = 0;
         foreach ($data as $item) {
             if (!isset($item['practical_fee']) || !isset($item['cash']) || !isset($item['service_charge']) ||
@@ -1052,20 +1052,7 @@ class Finance extends Basic
                     'store_id' => $bargain_data['store_id'],
                     'district_id' => $bargain_data['district_id'],
                     'create_time' => $bargain_data['create_time'],
-                    'real_income_id' => $item['real_income_id']
                 ];
-
-                //处理修改收佣日期
-                $real_income_old = $m_partial->getFieldValue('real_income_id', ['bargain_id'=> $this->params['bargain_id']]);
-                if ($item['real_income_id'] != $real_income_old) {
-                    $real_income_arr[] = [
-                        'real_income_id' => $real_income_old,
-                        'agent_id' => $item['agent_id'],
-                        'store_id' => $bargain_data['store_id'],
-                        'district_id' => $bargain_data['district_id'],
-                    ];
-                }
-
             } else {
                 $add_arr[$j]['bargain_id']        = $this->params['bargain_id'];
                 $add_arr[$j]['practical_fee']     = $item['practical_fee'];
@@ -1098,9 +1085,12 @@ class Finance extends Basic
                     'store_id' => $bargain_data['store_id'],
                     'district_id' => $bargain_data['district_id'],
                     'create_time' => $bargain_data['create_time'],
-                    'real_income_id' => $item['real_income_id']
                 ];
             }
+
+            if (!empty($item['real_income_id'])) {
+                $real_income_id[] = $item['real_income_id'];
+            }
         }
 
         if ($j > 0) {
@@ -1119,7 +1109,7 @@ class Finance extends Basic
             $params['scale']             = $data[0]['scale'];
             $m_partial->addCommission($params);
         }
-        $m_real = new ORealIncome();
+
         if (!empty($bargain_update_data)) {
             foreach ($bargain_update_data as $k=>$v) {
                 $update_data['scale_fee'] = $v['scale_fee'];
@@ -1128,19 +1118,14 @@ class Finance extends Basic
                 $this->m_bargain->updateBargainById($v['bargain_id'], $update_data);
                 $this->updatePerformanceData($v['agent_id'], $v['create_time'], $v['store_id'], $v['district_id']);
 
-                if (!empty($v['real_income_id'])) {
-                    //todo 收佣日期统计
-                    $income_time = $m_real->getFieldValue('income_time', ['id'=> $v['real_income_id']]);
-                    $this->updatePerformanceData($v['agent_id'], $income_time, $v['store_id'], $v['district_id']);
-                }
-            }
-        }
-
-        if (!empty($real_income_arr)) {
-            foreach ($real_income_arr as $v3) {
                 //todo 收佣日期统计
-                $income_time = $m_real->getFieldValue('income_time', ['id'=> $v3['real_income_id']]);
-                $this->updatePerformanceData($v3['agent_id'], $income_time, $v3['store_id'], $v3['district_id']);
+                if (!empty($real_income_id)) {
+                    $m_real = new ORealIncome();
+                    $income_time = $m_real->getBargainTaxesColumn('income_time', ['id'=> ['in', array_unique($real_income_id)]]);
+                    foreach ($income_time as $v2) {
+                        $this->updatePerformanceData($v['agent_id'], $v2, $v['store_id'], $v['district_id']);
+                    }
+                }
             }
         }
         // $data = $m_partial->addCommission($this->params, $this->userId);