money

application/index/controller/Finance.php

@@ -2027,15 +2027,15 @@ class Finance extends Basic
         $update['role']      = $this->params['role'];
         $update['scale_fee'] = $this->params['scale_fee'];
 
-        $data = $this->m_bargain->updateBargainById($this->params['bargain_id'], $update);   //更改分佣方
-
-        $comm                              = new OPartialCommission();
-        $partial_data['scale']             = $this->params['scale'];
-        $partial_data['role']              = $this->params['role'];
-        $partial_data['should_commission'] = $this->params['scale_fee'];
-        $comm->editData($partial_data, $this->params['bargain_id'], 'bargain_id');
-        $this->updatePerformance(0, $this->params['agent_id']);
-        $this->updatePerformance(0, $data_arr['agent_id']);
+//        $data = $this->m_bargain->updateBargainById($this->params['bargain_id'], $update);   //更改分佣方
+//
+//        $comm                              = new OPartialCommission();
+//        $partial_data['scale']             = $this->params['scale'];
+//        $partial_data['role']              = $this->params['role'];
+//        $partial_data['should_commission'] = $this->params['scale_fee'];
+//        $comm->editData($partial_data, $this->params['bargain_id'], 'bargain_id');
+//        $this->updatePerformance(0, $this->params['agent_id']);
+//        $this->updatePerformance(0, $data_arr['agent_id']);
 
         /*记录日志 start*/
         $father_id    = $this->params['bargain_id'];
@@ -2049,8 +2049,14 @@ class Finance extends Basic
             $agent_id[1] = $this->params['agent_id'];
             $m_agent    = new AAgents();
             $agent_data = $m_agent->getAgentById('id,name,phone', [ 'in_id' => $agent_id ]);
-            $content .= '【分佣方:' . $agent_data[0]['name'] . '-' . $agent_data[0]['phone']
-                . '修改为：' . $agent_data[1]['name'] . '-' . $agent_data[1]['phone'] . '】';
+            if ($agent_data[0]['id'] == $data_arr['agent_id']) {
+                $content .= '【分佣方:' . $agent_data[0]['name'] . '-' . $agent_data[0]['phone'];
+            }
+
+            if ($agent_data[1]['id'] == $this->params['agent_id']) {
+                $content .=  '修改为：' . $agent_data[1]['name'] . '-' . $agent_data[1]['phone'] . '】';
+            }
+
         }
 
         if ($this->params['scale'] != $data_arr['scale']) {
@@ -2789,6 +2795,7 @@ class Finance extends Basic
             $save_data['transaction_fee']  = $this->params['transaction_fee'];
             $save_data['pay_type']  = $this->params['pay_type'];
             $save_data['last_transfer_time']  = $this->params['last_transfer_time'];
+            $save_data['money']  = $this->params['money'];
             $m_pay->updatePayLog($save_data);
         } catch (\Exception $e) {
             $code = 101;