分佣汇总修改

application/model/OPartialCommission.php

@@ -236,7 +236,8 @@ class OPartialCommission extends BaseModel
         $data = $this->alias('a')
             ->field($field)
             ->join('o_bargain b', 'a.bargain_id = b.id', 'left')
-            ->join('o_real_income f', 'b.id = f.bargain_id', 'left')
+            ->join('o_bargain e', 'b.father_id = e.id or b.id=e.id and e.father_id=0', 'left')
+            ->join('o_real_income f', 'e.id = f.bargain_id', 'left')
             ->join('a_agents d', 'a.agent_id = d.id', 'left')
             ->where($params)
             ->order($order_)
@@ -254,17 +255,29 @@ class OPartialCommission extends BaseModel
                 $data[$k]['district_store'] = $district_store['district_name'] . '-' . $district_store['store_name'];
 
                 //税费
-                $data[$k]['fee']  = $m_tax->where('operation_date', 'between time', [$operation_start_data, $operation_end_data])
+                $data[$k]['fee'] = $m_tax->where('operation_date', 'between time', [ $operation_start_data, $operation_end_data ])
                     ->where('agent_id', $v['agent_id'])->sum('fee');
 
                 //去除多次应分佣金
-                $should_commission = $this->where('confirm_date', 'between time', [$operation_start_data, $operation_end_data])
+                $should_commission = $this->where('confirm_date', 'between time', [ $operation_start_data, $operation_end_data ])
                     ->where('agent_id', $v['agent_id'])->group('bargain_id')->column('should_commission');
 
                 $data[$k]['should_commission'] = 0;
                 foreach ($should_commission as $kk => $vv) {
                     $data[$k]['should_commission'] += $vv;
                 }
+
+                $field_sum = 'sum(practical_fee) as practical_fee,sum(cash) as cash,sum(real_fee) as real_fee,sum(service_charge) as service_charge,
+                sum(charity_fund) as charity_fund';
+                //应分佣金
+                $partial_commission = $this->field($field_sum)->where('confirm_date', 'between time', [ $operation_start_data, $operation_end_data ])
+                    ->where('agent_id', $v['agent_id'])->find();
+
+                $data[$k]['practical_fee']  = $partial_commission['practical_fee'];
+                $data[$k]['cash']           = $partial_commission['cash'];
+                $data[$k]['real_fee']       = $partial_commission['real_fee'];
+                $data[$k]['service_charge'] = $partial_commission['service_charge'];
+                $data[$k]['charity_fund']   = $partial_commission['charity_fund'];
             }
         }