Merge branch 'test'

.project

@@ -51,5 +51,14 @@
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1530191912321</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
 	</filteredResources>
 </projectDescription>

application/api_broker/service/UploadFileService.php

@@ -24,6 +24,25 @@ class UploadFileService
      */
     public function upload($_upload_file, $type, $size = 1000000, $ext = [ 'jpg' ])
     {
+        /**
+         *
+        upload($_FILE['file'])
+
+
+        array(2) {
+            [0] => array(3) {
+            ["code"] => int(200)
+            ["img_path"] => string(19) "201807021804140.jpg"
+            ["img_ext"] => string(3) "jpg"
+        }
+        [1] => array(3) {
+            ["code"] => int(200)
+            ["img_path"] => string(20) "2018070218041401.jpg"
+            ["img_ext"] => string(3) "jpg"
+            }
+        }
+
+         */
         $check = $this->checkUploadFile($_upload_file, $size, $ext);
 
         if ($check['code'] == 101) {
@@ -45,6 +64,7 @@ class UploadFileService
                 break;
             case 'house_img':
                 $path .= 'resource/lib/Attachments/images/';
+                break;
             default :
                 $path .= 'static/';
         }

application/index/controller/Agent.php

@@ -77,22 +77,25 @@ class Agent extends Basic
         $pageNo           = empty($params['pageNo']) ? 1 : $params['pageNo'];
         $pageSize         = empty($params['pageSize']) ? 15 : $params['pageSize'];
         //条件
-        $where  = 'a.status in(0,1)';
-        $where  = 'a.id != 1';
-        $search = $params['search'];
+        $where['a.status'] = ['IN',['0,1']];
+        $where['a.id'] = ['<>', 1];
 
-        if (!empty($search)) {
-            $where          .= " and a.id='$search' or a.name like '%$search%' or a.phone like '%$search%' ";
-            $data['search'] = $search;
+        if (!empty($params['search'])) {
+            $where[] = ['EXP', "a.name like '%{$params['search']}%' OR a.phone like '%{$params['search']}%'"];
         }
-        if (!empty($params['groupname'])) {
-            $where             .= " and g.title like '%{$params['groupname']}%' ";
-            $data['groupname'] = $params['groupname'];
+
+        if (!empty($params['group_name'])) {
+            $where['g.title'] = ['LIKE', "%{$params['group_name']}%"];
         }
-        if (!empty($params['store_name'])) {
-            $where              .= " and s.store_name like '%{$params['store_name']}%' ";
-            $data['store_name'] = $params['store_name'];
+
+        if (!empty($params['store_id'])) {
+            $where['a.store_id'] = $params['store_id'];
         }
+
+        if (!empty($params['district_id'])) {
+            $where['a.district_id'] = $params['district_id'];
+        }
+
         $field = "a.id,a.store_id,a.img,a.district_id,a.`level`,a.`name`,a.phone,a.`status`,a.inviter_id,a.create_time,
                   ifnull(s.store_name,'')store_name,ifnull(d.district_name,'')district_name,ifnull(g.title,'无')groupname";
         $order = 'a.id DESC';

application/index/controller/Collection.php

@@ -47,7 +47,7 @@ class Collection extends Basic
             }
 
             if (!empty($this->params['internal_title'])) {
-                $where['d.internal_title'] = ['like', '%'.$where['internal_title'].'%'];
+                $where['d.internal_title'] = ['like', '%'.$this->params['internal_title'].'%'];
             }
 
             if (!empty($this->params['user_name'])) {

application/index/controller/Finance.php

@@ -1016,47 +1016,57 @@ class Finance extends Basic
         $pageNo       = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
         $pageSize     = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
 
-        $where['c.is_del'] = 0;        //订单状态
-        $where['a.status']       = ['in', '10,11,13'];   //10已提交 11审核成功
-        $where['b.father_id']    = ['<>', 0];  //去除税费总佣金
-        $where['c.confirm_status'] = 1;   //确认分佣
+        $where['b.status']       = ['in', '10,11,13'];   //10已提交 11审核成功
+        $where['a.confirm_status'] = 1;   //确认分佣
 
-        $income_date = $operation_date = '';
+        $operation_start_data = $operation_end_data = $income_date = $operation_date = '';
 
         /**收佣日期 start**/
         if (!empty($this->params['income_start_date']) && empty($this->params['income_end_date'])) {
-            $where[] = [ 'EXP', " f.income_time > {$this->params['income_start_date']} or b.operation_date > {$this->params['income_start_date']}"];
+            $where[] = [ 'EXP', " f.income_time > {$this->params['income_start_date']} or c.operation_date > {$this->params['income_start_date']}"];
             $income_date = date('Y.m.d', strtotime($this->params['income_start_date']));
+
+            $operation_start_data = $this->params['income_start_date'];
         }
 
         if (!empty($this->params['income_end_date']) && empty($this->params['income_start_date'])) {
-            $where[] = [ 'EXP', " f.income_time < {$this->params['income_end_date']} or b.operation_date < {$this->params['income_start_date']}"];
+            $where[] = [ 'EXP', " f.income_time < {$this->params['income_end_date']} or c.operation_date < {$this->params['income_start_date']}"];
             $income_date = '-'. date('Y.m.d', strtotime($this->params['income_end_date']));
+
+            $operation_end_data = $this->params['income_end_date'];
         }
 
         if (!empty($this->params['income_start_date']) && !empty($this->params['income_end_date'])){
-            $where[] = [ 'EXP', "(f.income_time > {$this->params['income_start_date']} and f.income_time < {$this->params['income_end_date']}) or 
-            (b.operation_date > {$this->params['income_start_date']} or b.operation_date < {$this->params['income_end_date']})"];
+            $where[] = ['EXP', "(f.income_time BETWEEN  '{$this->params['income_start_date']}' and '{$this->params['income_end_date']}')"];
             $income_date = date('Y.m.d', strtotime($this->params['income_start_date'])) .'-'. date('Y.m.d', strtotime($this->params['income_end_date']));
+
+            $operation_start_data = $this->params['income_start_date'];
+            $operation_end_data   = $this->params['income_end_date'];
         }
 
         /**收佣日期 end**/
 
         /**提交成交报告日期 start**/
         if (!empty($this->params['bargain_start_date']) && empty($this->params['bargain_end_date'])) {
-            $where[] = [ 'EXP', "a.create_time > {$this->params['bargain_start_date']} . ' 00:00:00' or b.operation_date > {$this->params['bargain_start_date']}"];
+            $where[] = [ 'EXP', "a.create_time > {$this->params['bargain_start_date']} . ' 00:00:00' OR c.operation_date > {$this->params['bargain_start_date']}"];
             $operation_date = date('Y.m.d', strtotime($this->params['bargain_start_date']));
+
+            $operation_start_data = $this->params['bargain_start_date'];
         }
 
         if (!empty($this->params['bargain_end_date']) && empty($this->params['bargain_start_date'])) {
-            $where[] = [ 'EXP', "a.create_time < {$this->params['bargain_end_date']} . ' 23:59:59' or b.operation_date < {$this->params['bargain_end_date']}"];
+            $where[] = [ 'EXP', "a.create_time < {$this->params['bargain_end_date']} . ' 23:59:59' OR c.operation_date < {$this->params['bargain_end_date']}"];
             $operation_date = date('Y.m.d', strtotime($this->params['bargain_end_date']));
+
+            $operation_end_data = $this->params['bargain_end_date'];
         }
 
         if (!empty($this->params['bargain_start_date']) && !empty($this->params['bargain_end_date'])) {
-            $where[] = [ 'EXP', "(a.create_time > '{$this->params['bargain_start_date']} 00:00:00' and a.create_time < '{$this->params['bargain_end_date']} 23:59:59') or 
-            (b.operation_date > {$this->params['bargain_start_date']} and b.operation_date < {$this->params['bargain_end_date']})"];
+            $where[] = ['EXP', "(a.create_time BETWEEN  '{$this->params['bargain_start_date']} 00:00:00' and '{$this->params['bargain_end_date']} 23:59:59')"];
             $operation_date = date('Y.m.d', strtotime($this->params['bargain_start_date'])) .'-'. date('Y.m.d', strtotime($this->params['bargain_end_date']));
+
+            $operation_start_data = $this->params['bargain_start_date'];
+            $operation_end_data   = $this->params['bargain_end_date'];
         }
 
         /**部门id**/
@@ -1071,7 +1081,7 @@ class Finance extends Basic
 
         /**经纪人手机号**/
         if (!empty($this->params['phone'])) {
-            $where['b.phone'] = [ 'like', '%' . $this->params['phone'] . '%' ];
+            $where['d.phone'] = [ 'like', '%' . $this->params['phone'] . '%' ];
         }
 
         /**经纪人姓名**/
@@ -1079,14 +1089,12 @@ class Finance extends Basic
             $where['d.name'] = [ 'like', '%' . $this->params['name'] . '%' ];
         }
 
-        $m_bargain = new OBargainModel();
+        $m_bargain = new OPartialCommission();
 
         if (empty($this->params['excel']) && $this->params['excel'] != 1) {
-            $fields                = 'f.income_time,a.create_time,a.id,a.agent_id,sum(b.fee) as fee,sum(c.practical_fee) as practical_fee,sum(c.cash) as cash,';
-            $fields                .= 'sum(b.fee) as fee,sum(c.real_fee) as real_fee,';
-            $fields                .= 'd.name,d.phone';
-
-            $data['data']['list']  = $m_bargain->getCommissionTotalList($pageNo, $pageSize, 'a.id desc', $fields, $where, $whereOr);
+            $fields                = 'f.income_time,b.create_time,b.id,b.agent_id,sum(a.practical_fee) as practical_fee,sum(a.cash) as cash,';
+            $fields                .= 'sum(a.real_fee) as real_fee,d.name,d.phone';
+            $data['data']['list']  = $m_bargain->getCommissionTotalList($pageNo, $pageSize, 'a.id desc', $fields, $where, $operation_start_data, $operation_end_data);
 
             foreach ($data['data']['list'] as $k=>$v) {
                 $data['data']['list'][$k]['income_date']   = $income_date;
@@ -1094,17 +1102,17 @@ class Finance extends Basic
                 $data['data']['list'][$k]['over_fee'] = $v['practical_fee'] - $v['fee'];
             }
 
-            $data['data']['total'] = $m_bargain->getCommissionTotalListTotal($where, $whereOr);
+            $data['data']['total'] = $m_bargain->getCommissionTotalListTotal($where);
         } else {
 
             //导出Excel
 
-            $fields = 'f.income_time,a.create_time,sum(b.fee) as fee,sum(f.money) as money,sum(c.cash) as cash,';
-            $fields .= 'sum(c.service_charge) as service_charge,a.agent_id,sum(c.practical_fee) as practical_fee,';
-            $fields .= 'd.name,d.phone,sum(c.charity_fund) as charity_fund, sum(should_commission) as should_commission';
+            $fields = 'f.income_time,b.create_time,sum(f.money) as money,sum(a.cash) as cash,';
+            $fields .= 'sum(a.service_charge) as service_charge,a.agent_id,sum(a.practical_fee) as practical_fee,';
+            $fields .= 'd.name,d.phone,sum(a.charity_fund) as charity_fund, sum(a.should_commission) as should_commission';
 
             $pageSize = 25000;
-            $data     = $m_bargain->getCommissionTotalList($pageNo, $pageSize, 'a.id desc', $fields, $where, $whereOr);
+            $data     = $m_bargain->getCommissionTotalList($pageNo, $pageSize, 'a.id desc', $fields, $where, $operation_start_data, $operation_end_data);
 
             foreach ($data as $k => $v) {
                 $excel_data[$k]['income_date']       = $income_date;   //收佣日期

application/index/view/agent/agent.html

@@ -2,7 +2,7 @@
 <input type="hidden" class="page-load" id="agent" />
 <!--关联经纪人列表liudanjs文件-->
 <style>
-	.J_preview{
+	.J_preview {
 		width: 30px;
 		height: 30px;
 		border-radius: 15px;
@@ -22,8 +22,8 @@
 							<ul class="bread_btn">
 								<li>
 									<a href="#modal-edit" data-toggle="modal" class="btn btn-default agent_add">
-                                        <i class="icon-plus"></i>
-                                        新增</a>
+										<i class="icon-plus"></i> 新增
+									</a>
 								</li>
 							</ul>
 						</div>
@@ -36,12 +36,16 @@
 									<tr>
 										<td colspan="11">
 											<form id="form_search">
-                                                <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="industry_type" placeholder="角色"
-                                                    type="text" value="" name="groupname">
-                                                <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish" placeholder="门店"
-                                                    type="text" value="" name="store_name">
-                                                <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="id" placeholder="姓名/手机号"
-                                                    name="search" type="text" value="">
+												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="industry_type" placeholder="角色" type="text" value="" name="groupname">
+												<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish" placeholder="门店"
+                                                    type="text" value="" name="store_name">-->
+												<select class="form-control btn2  input ld-Marheight" name="" id="district_id">
+													<option value="">部门</option>
+												</select>
+
+												<select class="form-control btn2 input ld-Marheight" name="" id="guest_stores">
+												</select>
+												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="id" placeholder="姓名/手机号" name="search" type="text" value="">
 
 												<span class="btn btn-default btn3 ld-Marheight" id="search">搜索</span>
 												<span class="btn btn-default btn3 ld-Marheight" id="reset">重置</span>
@@ -58,11 +62,9 @@
 										<th>手机号</th>
 										<th>角色</th>
 										<!--2.2版本 -->
-                                        <!--<th>评价次数</th>
-                                        <th>分数</th>-->
-                                        
+										<!--<th>评价次数</th>-->
+                                        <!--<th>分数</th>-->
 										<th>操作</th>
-                                        
 									</tr>
 								</thead>
 								<tbody id="agentlist">
@@ -96,8 +98,7 @@
 				<form class="form-horizontal">
 					<div class="form-group">
 						<label class="col-sm-3 control-label">用户名：</label>
-                        <input class="form-control btn6" data-rule-buga="false" data-rule-required="true" name="name" placeholder="登录账户所用名称" type="text"
-                            value="" id="title">
+						<input class="form-control btn6" data-rule-buga="false" data-rule-required="true" name="name" placeholder="登录账户所用名称" type="text" value="" id="title">
 					</div>
 					<div class="form-group">
 						<label class="col-sm-3 control-label">电话（登录账号）：</label>
@@ -171,7 +172,6 @@
 	<!-- /.modal -->
 </div>
 
-
 <!--变更角色-->
 <div class="modal fade" id="modal-user" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
 	<div class="modal-dialog">
@@ -206,7 +206,7 @@
 	<!-- /.modal -->
 </div>
 <!--绑定手机 2.2版本-->
-	<div class="modal fade" id="modal-unbundling" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+<div class="modal fade" id="modal-unbundling" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">

application/index/view/collection/getCollection.html

@@ -272,7 +272,7 @@
 			<div class="modal-footer">
 				<!--<button type="button" class="btn btn-default" data-dismiss="modal">关闭
                 </button>-->
-				<button type="button" class="btn btn-primary submit_edit" id=" " data-dismiss="modal">
+				<button type="button" class="btn btn-primary" id="saveBtn" data-dismiss="modal">
                     保存
                 </button>
 			</div>

application/index/view/houses/houseList.html

@@ -312,7 +312,7 @@
                     ×
                 </button>
                 <h4 class="modal-title" >
-                   批量修改客方
+                   批量修改盘方
                 </h4>
             </div>
             <div class="modal-body modal-body-one">

application/index/view/member/users_list.html

@@ -207,7 +207,7 @@
 												</select>
 												<select class="form-control btn2 margin-top-ld input" name="" id="district_id" title="
 客方所属部门、客方所属门店 与邀请人所属部门、邀请人所属门店  不作为并列筛选项">
-													<option value="">客方所属部门</option>
+													<option value="0">客方所属部门</option>
 
 												</select>
 												
@@ -219,7 +219,7 @@
 												<!--邀请人-->
 												<select class="form-control btn2 margin-top-ld input" name="" id="district_id2" title="
 客方所属部门、客方所属门店 与邀请人所属部门、邀请人所属门店  不作为并列筛选项">
-													<option value="">邀请人所属部门</option>
+													<option value="0">邀请人所属部门</option>
 
 												</select>
 												
@@ -242,7 +242,7 @@
                                                 <span class="btn btn-info btn3 margin-top-ld" class="reset_1">重置</span> -->
 												<span class="btn btn-info btn3 margin-top-ld" id="search">搜索</span>
 												<span class="btn btn-info btn3 margin-top-ld" id="reset">重置</span>
-												<a href="#modal_modify_user" data-toggle="modal" class="btn btn-info btn3 margin-top-ld"><i class="icon-plus"></i> 批量修改客方
+												<a href="#modal_modify_user" data-toggle="modal" class="btn btn-info btn3 margin-top-ld"><i class="icon-plus"></i> 批量修改盘方
 												</a>
 
 												<!-- <span class="btn btn-info btn3 margin-top-ld" id="modify">批量修改客方</span> -->
@@ -565,7 +565,7 @@
                     &times;
                 </button>
 				<h4 class="modal-title">
-                   批量修改客方
+                   批量修改盘方
                 </h4>
 			</div>
 			<div class="modal-body modal-body-one">

application/model/OPartialCommission.php

@@ -12,6 +12,7 @@ namespace app\model;
 class OPartialCommission extends BaseModel
 {
     protected $table = "o_partial_commission";
+
     /**
      * 成交报告分佣表
      *
@@ -25,13 +26,14 @@ class OPartialCommission extends BaseModel
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public function getCommissionBargainList($pageNo, $pageSize, $order_ = 'id desc', $fields, $where) {
+    public function getCommissionBargainList($pageNo, $pageSize, $order_ = 'id desc', $fields, $where)
+    {
         $data   = $this->field($fields)
             ->alias('a')
             ->join('o_bargain b', 'a.bargain_id = b.id', 'left')
             ->join('o_order c', 'b.order_id = c.id', 'left')
             ->join('g_houses d', 'c.house_id = d.id', 'left')
-            ->join('a_agents e', 'b.agent_id = e.id','left')
+            ->join('a_agents e', 'b.agent_id = e.id', 'left')
             ->where($where)
             ->order($order_)
             ->limit($pageSize)
@@ -46,23 +48,28 @@ class OPartialCommission extends BaseModel
             $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'];
+                $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 :
-                        $data[$k]['role_name'] = '盘方';break;
+                        $data[$k]['role_name'] = '盘方';
+                        break;
                     case 2 :
-                        $data[$k]['role_name'] = '客方';break;
+                        $data[$k]['role_name'] = '客方';
+                        break;
                     case 3 :
-                        $data[$k]['role_name'] = '反签';break;
+                        $data[$k]['role_name'] = '反签';
+                        break;
                     case 4 :
-                        $data[$k]['role_name'] = '独家';break;
+                        $data[$k]['role_name'] = '独家';
+                        break;
                     case 5 :
-                        $data[$k]['role_name'] = '合作方';break;
+                        $data[$k]['role_name'] = '合作方';
+                        break;
                     default :
                         $data[$k]['role_name'] = '无';
                 }
@@ -84,12 +91,13 @@ class OPartialCommission extends BaseModel
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public function getCommissionBargainColumn($pageNo, $pageSize, $order_ = 'id desc', $fields, $where) {
+    public function getCommissionBargainColumn($pageNo, $pageSize, $order_ = 'id desc', $fields, $where)
+    {
         $data = $this->alias('a')
             ->join('o_bargain b', 'a.bargain_id = b.id', 'left')
             ->join('o_order c', 'b.order_id = c.id', 'left')
             ->join('g_houses d', 'c.house_id = d.id', 'left')
-            ->join('a_agents e', 'b.agent_id = e.id','left')
+            ->join('a_agents e', 'b.agent_id = e.id', 'left')
             ->where($where)
             ->order($order_)
             ->limit($pageSize)
@@ -103,9 +111,9 @@ class OPartialCommission extends BaseModel
         foreach ($data as $k => $v) {
             $result[$k]['confirm_date'] = $v['confirm_date'];
             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'];
-                $result[$k]['agent'] = $agent_data['name'].'-'.$agent_data['phone'];
+                $agent_data                   = $m_agent->getStoreDistrict($fields_str, [ 'a.id' => $v['agent_id'] ]);
+                $result[$k]['district_store'] = $agent_data['store_name'] . '-' . $agent_data['store_name'];
+                $result[$k]['agent']          = $agent_data['name'] . '-' . $agent_data['phone'];
             }
             $result[$k]['practical_fee']  = $v['practical_fee'];
             $result[$k]['scale_fee']      = $v['scale_fee'];
@@ -122,12 +130,13 @@ class OPartialCommission extends BaseModel
      * @param $where
      * @return int|string
      */
-    public function getCommissionBargainListTotal($where) {
+    public function getCommissionBargainListTotal($where)
+    {
         return $this->alias('a')
             ->join('o_bargain b', 'a.bargain_id = b.id', 'left')
             ->join('o_order c', 'b.order_id = c.id', 'left')
             ->join('g_houses d', 'c.house_id = d.id', 'left')
-            ->join('a_agents e', 'b.agent_id = e.id','left')
+            ->join('a_agents e', 'b.agent_id = e.id', 'left')
             ->where($where)
             ->count();
     }
@@ -138,7 +147,8 @@ class OPartialCommission extends BaseModel
      * @param $data
      * @return int|string
      */
-    public function addCommission($data) {
+    public function addCommission($data)
+    {
         /* $insert_data['id'] = $data['id'];
          $insert_data['bargain_id'] = $data['bargain_id'];  //成交报告id
          $insert_data['practical_fee'] = $data['practical_fee'];  //实收佣金
@@ -175,17 +185,18 @@ class OPartialCommission extends BaseModel
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public function getCommissionListByBargainId($field,$params){
+    public function getCommissionListByBargainId($field, $params)
+    {
         $params["a.is_del"] = 0;
         $result             = $this->field($field)
             ->alias("a")
-            ->join("a_agents b","a.agent_id=b.id","left")
-            ->join("o_bargain c","a.bargain_id=c.id or a.bargain_id = c.father_id","left")
+            ->join("a_agents b", "a.agent_id=b.id", "left")
+            ->join("o_bargain c", "a.bargain_id=c.id or a.bargain_id = c.father_id", "left")
             ->where($params)
             ->order("a.create_time desc")
             ->select();
         echo $this->getLastSql();
-        return $result ;
+        return $result;
 
     }
 
@@ -197,10 +208,72 @@ class OPartialCommission extends BaseModel
      * @throws \think\db\exception\BindParamException
      * @throws \think\exception\PDOException
      */
-    public function getBragainScale(int $bargain_id) {
+    public function getBragainScale(int $bargain_id)
+    {
         $sql = 'SELECT a.bargain_id,a.scale,b.scale_fee,a.agent_id,a.role,substring_index(group_concat(a.id ORDER BY a.id DESC),",",1) AS id
-                FROM o_partial_commission a LEFT JOIN o_bargain b on a.bargain_id=b.id  WHERE a.bargain_id = '.$bargain_id.' 
-                and b.id= '.$bargain_id.' OR b.father_id='.$bargain_id.' GROUP BY role';
+                FROM o_partial_commission a LEFT JOIN o_bargain b on a.bargain_id=b.id  WHERE a.bargain_id = ' . $bargain_id . ' 
+                and b.id= ' . $bargain_id . ' OR b.father_id=' . $bargain_id . ' GROUP BY role';
         return $this->query($sql);
     }
+
+    /**
+     * 分佣提成汇总表
+     *
+     * @param int $pageNo
+     * @param int $pageSize
+     * @param string $order_
+     * @param string $field
+     * @param string $params
+     * @param $operation_start_data
+     * @param $operation_end_data
+     * @return false|\PDOStatement|string|\think\Collection
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function getCommissionTotalList($pageNo = 1, $pageSize = 15, $order_ = 'a.id desc', $field = '', $params = '', $operation_start_data, $operation_end_data)
+    {
+        $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('a_agents d', 'a.agent_id = d.id', 'left')
+            ->where($params)
+            ->order($order_)
+            ->limit($pageSize)
+            ->page($pageNo)
+            ->group('a.agent_id')
+            ->select();
+
+        $m_agent = new AAgents();
+        $m_tax   = new OTaxes();
+
+        foreach ($data as $k => $v) {
+            if (isset($v['agent_id'])) {
+                $district_store             = $m_agent->getStoreDistrict('store_name,district_name', [ 'a.id' => $v['agent_id'] ]);
+                $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])
+                    ->where('agent_id', $v['agent_id'])->sum('fee');
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param $params
+     * @return int|string
+     */
+    public function getCommissionTotalListTotal($params)
+    {
+        return $this->alias('a')
+            ->join('o_bargain b', 'a.bargain_id = b.id', 'left')
+            ->join('o_real_income f', 'b.id = f.bargain_id', 'left')
+            ->join('a_agents d', 'a.agent_id = d.id', 'left')
+            ->where($params)
+            ->group('a.agent_id')
+            ->count();
+    }
 }
\ No newline at end of file

public/app/dist/index.html

@@ -23,4 +23,4 @@
 				if(!doc.addEventListener) return;
 				win.addEventListener(resizeEvt, recalc, false);
 				doc.addEventListener('DOMContentLoaded', recalc, false);
-			})(document, window);</script><script type=text/javascript src=./vconsole.min.js></script><script type=text/javascript>if(~location.origin.indexOf('api.tonglianjituan.com')){console.log('正式服')}else{var vConsole=new VConsole()};</script><link href=./static/css/app.65a7482b65465b468cd50d083c6b13f2.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.94d51f6620cb57f6116c.js></script><script type=text/javascript src=./static/js/app.ae212a464103491b75e1.js></script></body></html>
+			})(document, window);</script><script type=text/javascript src=./vconsole.min.js></script><script type=text/javascript>if(~location.origin.indexOf('api.tonglianjituan.com')){console.log('正式服')}else{var vConsole=new VConsole()};</script><link href=./static/css/app.2c71066ef70dbce04427e0ec71aee085.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.94d51f6620cb57f6116c.js></script><script type=text/javascript src=./static/js/app.db402c74b35141cf046c.js></script></body></html>
\ No newline at end of file