成交报告详情-分佣提成

application/index/controller/Finance.php

@@ -262,7 +262,7 @@ class Finance extends Basic
     }
 
     /**
-     * 分佣提成
+     * 成交报告详情-分佣提成
      *
      * @return \think\Response
      * @throws \think\db\exception\DataNotFoundException
@@ -278,33 +278,10 @@ class Finance extends Basic
             $data['code'] = 101;
             $data['msg']  = 'Id is null.';
         } else {
-            $m_comm = new OPartialCommission();
-            $fields = 'role,b.agent_id,scale,scale_fee,a.practical_fee,content,a.cash,a.service_charge,a.tallage,a.charity_fund,a.real_fee,a.create_time';
-            $where[0]  = ['EXP',"b.id = {$this->params['id']} or b.father_id = {$this->params['id']}"];
-            $data['data'] = $m_comm->getCommissionBargainList(1, 100, 'a.id desc', $fields, $where);
-
-            $m_agent = new AAgents();
-            $fields_a = 'name,store_name';
-            foreach ($data['data'] as $k=>$v) {
-                $agent_store = $m_agent->getAgentsStoreById(['a.id'=>$v['agent_id']], $fields_a);
-                $data['data'][$k]['agent_name'] = $agent_store['name'];
-                $data['data'][$k]['store_name'] = $agent_store['store_name'];
-
-                switch ($v['role']) {
-                    case 1 :
-                        $data['data'][$k]['role_name'] = '盘方';break;
-                    case 2 :
-                        $data['data'][$k]['role_name'] = '客方';break;
-                    case 3 :
-                        $data['data'][$k]['role_name'] = '反签';break;
-                    case 4 :
-                        $data['data'][$k]['role_name'] = '独家';break;
-                    case 5 :
-                        $data['data'][$k]['role_name'] = '合作方';break;
-                    default :
-                        $data['data'][$k]['role_name'] = '无';
-                }
-            }
+            $m_comm = new OBargainModel();
+            $fields = 'a.id,a.role,a.agent_id,a.scale,a.scale_fee,a.content';
+            $where[0]  = ['EXP',"a.id = {$this->params['id']} or a.father_id = {$this->params['id']}"];
+            $data['data'] = $m_comm->getBargainPartial(1, 100, 'a.id desc', $fields, $where);
         }
 
         return $this->response($data['code'], $data['msg'], $data['data']);

application/model/OBargainModel.php

@@ -538,4 +538,65 @@ class OBargainModel extends Model
         }
         return $result;
     }
+
+    /**
+     * 成交报告详情-分佣提成
+     *
+     * @param $pageNo
+     * @param $pageSize
+     * @param string $order_
+     * @param $fields
+     * @param $where
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function getBargainPartial($pageNo, $pageSize, $order_ = 'id desc', $fields, $where) {
+        $data = $this->field($fields)
+            ->alias('a')
+            ->join('a_agents b', 'a.agent_id = b.id','left')
+            ->where($where)
+            ->order($order_)
+            ->limit($pageSize)
+            ->page($pageNo)
+            ->select();
+
+        $result = [];
+
+        $m_agent = new AAgents();
+        $m_partial = new OPartialCommission();
+        $fields_str = 'a.id,a.name,a.phone,b.store_name,c.district_name';
+        foreach ($data as $k => $v) {
+            $result[$k] = $v;
+
+            if (isset($v['agent_id'])) {
+                $agent_data = $m_agent->getStoreDistrict($fields_str, ['a.id'=>$v['agent_id']]);
+                $result[$k]['agent'] = $agent_data['name'].'-'.$agent_data['phone'];
+                $result[$k]['district_store'] = $agent_data['district_name'] .'-'.$agent_data['store_name'];
+            }
+
+            if (isset($v['role'])) {
+                switch ($v['role']) {
+                    case 1 :
+                        $result[$k]['role_name'] = '盘方';break;
+                    case 2 :
+                        $result[$k]['role_name'] = '客方';break;
+                    case 3 :
+                        $result[$k]['role_name'] = '反签';break;
+                    case 4 :
+                        $result[$k]['role_name'] = '独家';break;
+                    case 5 :
+                        $result[$k]['role_name'] = '合作方';break;
+                    default :
+                        $result[$k]['role_name'] = '无';
+                }
+            }
+
+            $result[$k]['partial_commission'] = $m_partial->field('practical_fee,cash,service_charge,charity_fund,real_fee,create_time')
+                ->where('bargain_id',$v['id'])
+                ->select();
+        }
+        return $result;
+    }
 }
\ No newline at end of file

application/model/OPartialCommission.php

@@ -43,11 +43,30 @@ class OPartialCommission extends BaseModel
         $fields_str = 'a.id,a.name,a.phone,b.store_name,c.district_name';
         foreach ($data as $k => $v) {
             $result[$k] = $v;
-            if ($v['agent_id']) {
+
+            if (isset($v['agent_id'])) {
                 $agent_data = $m_agent->getStoreDistrict($fields_str, ['a.id'=>$v['agent_id']]);
                 $result[$k]['agent'] = $agent_data['name'].'-'.$agent_data['phone'];
-                $result[$k]['district_store'] = $agent_data['store_name'] .'-'.$agent_data['store_name'];
+                $result[$k]['district_store'] = $agent_data['district_name'] .'-'.$agent_data['store_name'];
             }
+
+            if (isset($v['role'])) {
+                switch ($v['role']) {
+                    case 1 :
+                        $data[$k]['role_name'] = '盘方';break;
+                    case 2 :
+                        $data[$k]['role_name'] = '客方';break;
+                    case 3 :
+                        $data[$k]['role_name'] = '反签';break;
+                    case 4 :
+                        $data[$k]['role_name'] = '独家';break;
+                    case 5 :
+                        $data[$k]['role_name'] = '合作方';break;
+                    default :
+                        $data[$k]['role_name'] = '无';
+                }
+            }
+
         }
         return $result;
     }

application/route.php

@@ -212,7 +212,7 @@ Route::group('index', [
     'bargainInfo' => ['index/Finance/bargainInfo', [ 'method' => 'get' ] ], //获取成交报告详情
     'editBargainInfo' => ['index/Finance/editBargainInfo', [ 'method' => 'post' ] ], //修改成交报告佣金
     'addBargain' => ['index/Finance/addBargain', [ 'method' => 'post' ] ], //新增成交报告佣金(分佣提成)
-    'commissionList' => ['index/Finance/commissionList', [ 'method' => 'get' ] ], //分佣提成
+    'commissionList' => ['index/Finance/commissionList', [ 'method' => 'get' ] ], //成交报告详情-分佣提成
     'payLogList' => ['index/Finance/payLogList', [ 'method' => 'get' ] ], //收款记录
     'phone_up_list' => ['index/remark/phone_up_list', [ 'method' => 'get|post' ] ], //电话跟进列表
     'selectReportAll' => ['index/Finance/selectReportAll', [ 'method' => 'get|post' ] ], //时间轴