分佣提成明细表

application/index/controller/Finance.php

@@ -728,14 +728,14 @@ class Finance extends Basic
             $where[] = [ 'EXP', 'b.id =' . $this->params['bargain_id'] . ' or father_id=' . $this->params['bargain_id'] ];
         }
 
-        $field        = 'a.id,b.id as bargain_id,a.confirm_date,a.practical_fee,b.scale_fee,d.internal_address,b.agent_id,b.house_number,b.father_id,b.order_id';
+        $field        = 'a.id,b.id as bargain_id,a.confirm_date,a.practical_fee,b.scale_fee,d.internal_address,b.agent_id,b.house_number,b.father_id,b.order_id,a.real_income_id';
         $m_commission = new OPartialCommission();
 
         try {
             $data['data']['list']  = $m_commission->getCommissionBargainList($pageNo, $pageSize, 'a.id desc', $field, $where);
             $data['data']['total'] = $m_commission->getCommissionBargainListTotal($where);
         } catch (\Exception $e) {
-            return $this->response(101, '内部错误，获取分佣提成明细列表失败！请联系运营。');
+            return $this->response(101, '内部错误，获取分佣提成明细列表失败！请联系运营。'.$e->getMessage());
         }
 
         return $this->response("200", "request success", $data);
@@ -781,7 +781,7 @@ class Finance extends Basic
             $where['b.house_number'] = [ 'like', '%' . $this->params['house_number'] . '%' ];
         }
 
-        $field = 'a.id,a.confirm_date,a.practical_fee,b.scale_fee,d.internal_address,b.agent_id,cash,service_charge,charity_fund,real_fee';
+        $field = 'a.id,a.confirm_date,a.practical_fee,b.scale_fee,d.internal_address,b.agent_id,cash,service_charge,charity_fund,real_fee,a.real_income_id';
 
         $m_commission = new OPartialCommission();
         try {

application/model/OPartialCommission.php

@@ -44,7 +44,7 @@ class OPartialCommission extends BaseModel
         $result = [];
 
         $m_agent    = new AAgents();
-        $m_bargain  = new OBargainModel();
+        $m_real     = new ORealIncome();
         $fields_str = 'a.id,a.name,a.phone,b.store_name,c.district_name';
         foreach ($data as $k => $v) {
             $result[$k] = $v;
@@ -76,6 +76,8 @@ class OPartialCommission extends BaseModel
                         $data[$k]['role_name'] = '无';
                 }
             }
+
+            $result[$k]['income_time'] = $m_real->where('id', $v['real_income_id'])->value('income_time');
         }
         return $result;
     }
@@ -109,9 +111,10 @@ class OPartialCommission extends BaseModel
         $result = [];
 
         $m_agent    = new AAgents();
+        $m_real     = new ORealIncome();
         $fields_str = 'a.id,a.name,a.phone,b.store_name,c.district_name';
         foreach ($data as $k => $v) {
-            $result[$k]['confirm_date'] = $v['confirm_date'];
+            $result[$k]['income_time'] = $m_real->where('id', $v['real_income_id'])->value('income_time');
             if ($v['agent_id']) {
                 $agent_data                   = $m_agent->getStoreDistrict($fields_str, [ 'a.id' => $v['agent_id'] ]);
                 $result[$k]['district_store'] = $agent_data['store_name'] . '-' . $agent_data['store_name'];

public/resource/template/commission_template_tpl.html

@@ -3,7 +3,7 @@
     [% for(var item in it){ %]
     <tr class="text-center" data-id="[%= it[item]['bargain_id'] %]" data-orderid="[%= it[item]['order_id'] %]" data-fatherid="[%= it[item]['father_id'] %]">
     	<td>[%= it[item]['bargain_id'] %]</td>
-        <td>[%= it[item]['confirm_date'] %]</td>
+        <td>[%= it[item]['income_time'] %]</td>
         <td>[%= it[item]['district_store'] %]</td>
         <td>[%= it[item]['agent'] %]</td>
         <td>[%= it[item]['internal_address'] %]</td>