Merge branch 'hujun-commission' into test

application/index/controller/Finance.php

@@ -1423,31 +1423,32 @@ class Finance extends Basic
         $data['code'] = 200;
         $data['msg']  = "";
         $data['data'] = $excel_data = [];
-        $pageNo       = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
-        $pageSize     = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
-
-        $where['b.status']         = [ 'in', '10,11,13' ];   //10已提交 11审核成功
-        $where['a.confirm_status'] = 1;   //确认分佣
 
+        $pageSize     = empty($this->params['pageSize']) ? 10 : $this->params['pageSize'];
+        if (empty($this->params['pageNo']) || $this->params['pageNo'] == 1) {
+            $pageNo = 0;
+        } else {
+            $pageNo = ($this->params['pageNo'] - 1) * $pageSize;
+        }
+        $where = ' e.status in (10,11,13) ';
         $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 c.operation_date > {$this->params['income_start_date']}" ];
+            $where .= " AND b.income_time > '{$this->params['income_start_date']}' AND 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'] . ' 00:00:00';
         }
 
         if (!empty($this->params['income_end_date']) && empty($this->params['income_start_date'])) {
-            $where[]     = [ 'EXP', " f.income_time < {$this->params['income_end_date']} or c.operation_date < {$this->params['income_start_date']}" ];
+            $where .= " AND b.income_time < '{$this->params['income_end_date']}' AND c.operation_date < '{$this->params['income_end_date']}'";
             $income_date = '-' . date('Y.m.d', strtotime($this->params['income_end_date']));
-
             $operation_end_data = $this->params['income_end_date'] . ' 23:59:59';
         }
 
         if (!empty($this->params['income_start_date']) && !empty($this->params['income_end_date'])) {
-            $where[]     = [ 'EXP', "(f.income_time BETWEEN  '{$this->params['income_start_date']}' and '{$this->params['income_end_date']}')" ];
+            $where .= " AND b.income_time BETWEEN '{$this->params['income_start_date']}' AND '{$this->params['income_end_date']}' ";
+            $where .= " AND c.operation_date 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'] . ' 00:00:00';
@@ -1455,101 +1456,89 @@ class Finance extends Basic
         }
 
         /**收佣日期 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 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'] . ' 00:00:00';
-        }
-
-        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 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'] . ' 23:59:59';
-        }
-
-        if (!empty($this->params['bargain_start_date']) && !empty($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'] . ' 00:00:00';
-            $operation_end_data   = $this->params['bargain_end_date'] . ' 23:59:59';
-        }
-
         /**部门id**/
         if (!empty($this->params['district_id'])) {
-            $where['d.district_id'] = $this->params['district_id'];
+            $where .= " AND d.district_id={$this->params['district_id']}";
         }
 
         /**门店名**/
         if (!empty($this->params['store_id'])) {
-            $where['d.store_id'] = $this->params['store_id'];
+            $where .= " AND d.store_id={$this->params['store_id']}";
         }
 
         /**经纪人手机号**/
-        if (!empty($this->params['phone'])) {
-            $where['d.phone'] = [ 'like', '%' . $this->params['phone'] . '%' ];
+        if (!empty($this->params['agent_id'])) {
+            $where .= " AND a.agent_id={$this->params['agent_id']}";
         }
 
-        /**经纪人姓名**/
-        if (!empty($this->params['name'])) {
-            $where['d.name'] = [ 'like', '%' . $this->params['name'] . '%' ];
-        }
+        $fields = '	d.store_id,d.district_id,a.agent_id,sum( a.practical_fee ) as practical_fee,sum( c.fee ) as fee,';
+        $fields .= 'sum( a.real_fee ) as real_fee,sum( a.service_charge ) as service_charge,sum( a.charity_fund ) as charity_fund';
+        $m_partial = new OPartialCommission();
+        $m_store = new AStore();
+        $m_agent = new AAgents();
 
-        $m_bargain = new OPartialCommission();
-        $fields    = 'f.income_time,b.create_time,b.id,b.agent_id,d.name,d.phone';
         if (empty($this->params['excel']) && $this->params['excel'] != 1) {
+            $data['data']['total_taxes'] = $m_partial->getCommissionTotalInfo('c.fee', $where);
 
-            $data['data']['list'] = $m_bargain->getCommissionTotalList($pageNo, $pageSize, 'a.id desc', $fields, $where, $operation_start_data, $operation_end_data);
+            if (!empty($this->params['confirm_date'])) {
+                $where .= ' AND a.confirm_date <= "'.$this->params['confirm_date'].' 23:59:59" AND a.confirm_status = 1 ';
+            }
 
-            foreach ($data['data']['list'] as $k => $v) {
-                $data['data']['list'][$k]['income_date']    = $income_date;
-                $data['data']['list'][$k]['operation_date'] = $operation_date;
-                $data['data']['list'][$k]['over_fee']       = $v['practical_fee'] - $v['fee'];
+            $list = $m_partial->getCommissionTotalList($pageNo, $pageSize, $fields, $where, $operation_start_data, $operation_end_data);
+            foreach ($list as $k => $v) {
+                $list[$k]['income_date']    = $income_date;
+                $list[$k]['operation_date'] = $operation_date;
+                $list[$k]['district_store'] = $m_store->getStoreDistrictName($v['store_id']);
+                $list[$k]['fee'] = empty($v['fee']) ? 0 : $v['fee'];
+                $list[$k]['name'] = $m_agent->getAgentsById($v['agent_id'], 'name');
             }
 
-            $data['data']['total'] = $m_bargain->getCommissionTotalListTotal($where);
-        } else {
+            $data['data']['list'] = $list;
+            $data['data']['total'] = $m_partial->getCommissionTotalListTotal($where);
 
+            $data['data']['total_money'] = $m_partial->getCommissionTotalInfo('a.practical_fee', $where);
+        } else {
             //导出Excel
             $pageSize = 25000;
-            $data     = $m_bargain->getCommissionTotalList($pageNo, $pageSize, 'a.id desc', $fields, $where, $operation_start_data, $operation_end_data);
+            $fields .= ',sum(a.should_commission) as should_commission,sum(a.cash) as cash';
+            if (!empty($this->params['confirm_date'])) {
+                $where .= ' AND a.confirm_date <= "'.$this->params['confirm_date'].' 23:59:59" AND a.confirm_status = 1 ';
+            }
+            $result_data = $m_partial->getCommissionTotalList($pageNo, $pageSize, $fields, $where, $operation_start_data, $operation_end_data);
 
-            foreach ($data as $k => $v) {
-                $excel_data[$k]['income_date']       = $income_date;   //收佣日期
-                $excel_data[$k]['operation_date']    = $operation_date;   //成交日期
-                $excel_data[$k]['district_store']    = $v['district_store']; //所属部门/门店
-                $excel_data[$k]['name']              = $v['name'] . '-' . $v['phone'];  //业务员
+            foreach ($result_data as $k => $v) {
+                $excel_data[$k]['income_date'] = $income_date;   //收佣日期
+                $excel_data[$k]['operation_date'] = $operation_date;   //成交日期
+                $excel_data[$k]['district_store'] = $m_store->getStoreDistrictName($v['store_id']);; //所属部门/门店
+                $excel_data[$k]['name'] = $m_agent->getAgentsById($v['agent_id'], 'name');  //业务员
                 $excel_data[$k]['should_commission'] = $v['should_commission']; //应分佣金
-                $excel_data[$k]['service_charge']    = $v['service_charge']; //手续费
-                $excel_data[$k]['cash']              = $v['cash'];   //现金奖
-                $excel_data[$k]['charity_fund']      = $v['charity_fund']; //慈善基金
-                $excel_data[$k]['practical_fee']     = $v['practical_fee']; //实收佣金
-                $excel_data[$k]['fee']               = $v['fee'];    //税费
-                $excel_data[$k]['over_fee']          = $v['practical_fee'] - $v['fee'];
-            }
-
-            $num                                   = count($excel_data) + 2;
-            $excel_data[$num]['income_time']       = '合计';   //收佣日期
-            $excel_data[$num]['create_time']       = '';   //成交日期
-            $excel_data[$num]['district_store']    = ''; //所属部门/门店
-            $excel_data[$num]['name']              = '';  //业务员
+                $excel_data[$k]['service_charge'] = $v['service_charge']; //手续费
+                $excel_data[$k]['cash'] = $v['cash'];   //现金奖
+                $excel_data[$k]['charity_fund'] = $v['charity_fund']; //慈善基金
+                $excel_data[$k]['practical_fee'] = $v['practical_fee']; //实收佣金
+
+                $excel_data[$k]['fee'] = $v['fee'];
+                $excel_data[$k]['over_fee'] = $v['practical_fee'] - $v['fee'];
+            }
+
+            $num = count($excel_data) + 2;
+            $excel_data[$num]['income_time'] = '合计';   //收佣日期
+            $excel_data[$num]['create_time'] = '';   //成交日期
+            $excel_data[$num]['district_store'] = ''; //所属部门/门店
+            $excel_data[$num]['name'] = '';  //业务员
             $excel_data[$num]['should_commission'] = "=SUM(E3:E{$num})"; //应分佣金
-            $excel_data[$num]['service_charge']    = "=SUM(F3:F{$num})"; //手续费
-            $excel_data[$num]['cash']              = "=SUM(G3:G{$num})";   //现金奖
-            $excel_data[$num]['charity_fund']      = "=SUM(H3:H{$num})"; //慈善基金
-            $excel_data[$num]['money']             = "=SUM(I3:I{$num})"; //实收佣金
-            $excel_data[$num]['fee']               = "=SUM(J3:J{$num})";    //税费
-            $excel_data[$num]['over_fee']          = "=SUM(K3:K{$num})";
+            $excel_data[$num]['service_charge'] = "=SUM(F3:F{$num})"; //手续费
+            $excel_data[$num]['cash'] = "=SUM(G3:G{$num})";   //现金奖
+            $excel_data[$num]['charity_fund'] = "=SUM(H3:H{$num})"; //慈善基金
+            $excel_data[$num]['money'] = "=SUM(I3:I{$num})"; //实收佣金
+            $excel_data[$num]['fee'] = "=SUM(J3:J{$num})";    //税费
+            $excel_data[$num]['over_fee'] = "=SUM(K3:K{$num})";
 
             $export = new ExportExcelUntil();
-            $title  = [ '收佣日期/开票日期', '成交日期/开票日期', '所属部门/门店', '业务员', '应分佣金（元）', '手续费（元）', '现金奖（元）', '慈善基金（元）', '实收佣金（元）', '税费（元）', '最终实收（元）' ];
-            $export->exportTable('分佣提成汇总表', $excel_data, 11, '分佣提成汇总表', $title);
-        }
+            $title = ['收佣日期/开票日期', '成交日期/开票日期', '所属部门/门店', '业务员', '应分佣金（元）', '手续费（元）', '现金奖（元）', '慈善基金（元）', '实收佣金（元）', '税费（元）', '最终实收（元）'];
+            $export->exportTable('分佣提成汇总表', $excel_data, 10, '分佣提成汇总表', $title);
 
+        }
         return $this->response($data['code'], $data['msg'], $data['data']);
     }
 

application/index/controller/RankingList.php

@@ -32,11 +32,11 @@ class RankingList extends Basic{
      */
     public function getRandKingList(){
         $params = $this->params;
-       /* $params = array(
+       $params = array(
             "position" => 1,//职称 1店长 2经理 3主任 4顾问 0新人
             "pk_type" =>  2//pk类型 1月pk 2周pk
         );
-        $this->siteId = 10001;*/
+        $this->siteId = 10001;
         if(!isset($params["position"]) || $params["position"] < 0 || $params["position"] > 5){
             return $this->response("101","请求参数错误");
         }

application/index/view/finance/commission_total.html

@@ -65,6 +65,21 @@
 	.clear{
 		clear: both;
 	}
+	.user-ul{
+		height: auto;
+		float: left;
+		position: relative;
+		left: -40px;
+	}
+	.user-ul li{
+		list-style: none;
+		line-height: 30px;
+	}
+	.left-phone{
+		float: left;
+		margin-top: 10px;
+		margin-left: 10px;
+	}
 </style>
 <div id="page-content-wrapper">
 	<div class="container">
@@ -117,9 +132,11 @@
 
 												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="store_name" placeholder="所属门店名称" type="text" value="">-->
 												<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_num" placeholder="商铺号" type="text" value="">-->
-												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_name" placeholder="业务员姓名" type="text" value="">
-
-												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_phone" placeholder="业务员手机号" type="text" value="">
+																								
+												<div class="left-phone">
+													<input class="form-control" data-rule-phoneus="false" data-rule-required="false" id="partical_name" placeholder="分佣方姓名" type="text" value="">
+												    <ul class="user-ul"></ul>
+												</div>
 												<!--<span class="fore-span ld-Marheight">开票日期:</span>
 												<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="create_ticketTime" name="start_date" type="date" disabled="disabled">
 												<span class="fore-span ld-Marheight">-</span>
@@ -132,6 +149,12 @@
 												<span style="margin-left: 5px;font-size: 16px;font-weight: 600;">
 													最终实收总计：<span class="total-money"></span>元
 												</span>
+												<span style="margin-left: 5px;font-size: 16px;font-weight: 600;">
+													税费总计：<span class="total-taxes"></span>元
+												</span>
+												<span style="margin-left: 5px;font-size: 16px;font-weight: 600;">
+													最终实收总计：<span class="total-all"></span>元
+												</span>
 											</form>
 										</td>
 									</tr>

application/model/OPartialCommission.php

@@ -209,67 +209,77 @@ class OPartialCommission extends BaseModel
      *
      * @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
+     * @return mixed
+     * @throws \think\db\exception\BindParamException
+     * @throws \think\exception\PDOException
      */
-    public function getCommissionTotalList($pageNo = 1, $pageSize = 15, $order_ = 'a.id desc', $field = '', $params = '', $operation_start_data, $operation_end_data)
+    public function getCommissionTotalList($pageNo = 1, $pageSize = 15, $field = '', $params = '')
     {
-        $data = $this->alias('a')
-            ->field($field)
-            ->join('o_bargain b', 'a.bargain_id = b.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_)
-            ->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');
-
-                //去除多次应分佣金
-                $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'];
-            }
-        }
+        $sql = "( SELECT
+                    {$field}
+                FROM
+                    o_partial_commission a
+                    LEFT JOIN o_real_income b ON a.real_income_id = b.id
+                    LEFT JOIN o_taxes c ON a.agent_id = c.agent_id
+                    LEFT JOIN a_agents d ON a.agent_id = d.id
+                    LEFT JOIN o_bargain e ON a.bargain_id = e.id 
+                WHERE
+                    {$params}
+                    AND a.practical_fee > 0 
+                    AND c.fee > 0                     
+                GROUP BY
+                    a.agent_id 
+                ) UNION ALL
+                (
+                SELECT
+                    {$field}
+                FROM
+                    o_partial_commission a
+                    LEFT JOIN o_real_income b ON a.real_income_id = b.id
+                    LEFT JOIN o_taxes c ON a.agent_id = c.agent_id
+                    LEFT JOIN a_agents d ON a.agent_id = d.id
+                    LEFT JOIN o_bargain e ON a.bargain_id = e.id 
+                WHERE
+                    {$params}
+                    AND a.practical_fee IS NULL 
+                    AND c.fee > 0                  
+                GROUP BY
+                    a.agent_id 
+                ) UNION ALL
+                (
+                SELECT
+                    {$field}
+                FROM
+                    o_partial_commission a
+                    LEFT JOIN o_real_income b ON a.real_income_id = b.id
+                    LEFT JOIN o_taxes c ON a.agent_id = c.agent_id
+                    LEFT JOIN a_agents d ON a.agent_id = d.id
+                    LEFT JOIN o_bargain e ON a.bargain_id = e.id 
+                WHERE
+                    {$params}
+                    AND a.practical_fee > 0 
+                    AND c.fee IS NULL                    
+                GROUP BY
+                a.agent_id 
+                ) limit {$pageNo},{$pageSize}";
+        return $this->query($sql);
+    }
 
-        return $data;
+    /**
+     * @param $field
+     * @param $where
+     * @return float|int
+     */
+    public function getCommissionTotalInfo($field, $where) {
+        return $this->alias('a')
+            ->join('o_real_income b', 'a.real_income_id = b.id', 'left')
+            ->join('o_taxes c', 'a.agent_id = c.agent_id', 'left')
+            ->join('a_agents d', 'a.agent_id = d.id', 'left')
+            ->join('o_bargain e', 'a.bargain_id = e.id', 'left')
+            ->where($where)
+            ->sum($field);
     }
 
     /**
@@ -347,15 +357,68 @@ class OPartialCommission extends BaseModel
      * @param $params
      * @return int|string
      */
+    /**
+     * @param $params
+     * @return mixed
+     * @throws \think\db\exception\BindParamException
+     * @throws \think\exception\PDOException
+     */
     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();
+        $sql = "SELECT
+            COUNT( * ) AS count 
+        FROM
+            (
+        
+        ( SELECT
+                    count(a.id) as num
+                FROM
+                    o_partial_commission a
+                    LEFT JOIN o_real_income b ON a.real_income_id = b.id
+                    LEFT JOIN o_taxes c ON a.agent_id = c.agent_id
+                    LEFT JOIN a_agents d ON a.agent_id = d.id
+                    LEFT JOIN o_bargain e ON a.bargain_id = e.id 
+                WHERE
+                    {$params} 
+                    AND a.practical_fee > 0 
+                    AND c.fee > 0
+                GROUP BY
+                    a.agent_id 
+                ) UNION ALL
+                (
+                SELECT
+                    count(a.id)
+                FROM
+                    o_partial_commission a
+                    LEFT JOIN o_real_income b ON a.real_income_id = b.id
+                    LEFT JOIN o_taxes c ON a.agent_id = c.agent_id
+                    LEFT JOIN a_agents d ON a.agent_id = d.id
+                    LEFT JOIN o_bargain e ON a.bargain_id = e.id 
+                WHERE
+                    {$params}
+                    AND a.practical_fee IS NULL 
+                    AND c.fee > 0                    
+                GROUP BY
+                    a.agent_id 
+                ) UNION ALL
+                (
+                SELECT
+                    count(a.id)
+                FROM
+                    o_partial_commission a
+                    LEFT JOIN o_real_income b ON a.real_income_id = b.id
+                    LEFT JOIN o_taxes c ON a.agent_id = c.agent_id
+                    LEFT JOIN a_agents d ON a.agent_id = d.id
+                    LEFT JOIN o_bargain e ON a.bargain_id = e.id 
+                WHERE
+                    {$params}
+                    AND a.practical_fee > 0 
+                    AND c.fee IS NULL                    
+                GROUP BY
+                a.agent_id 
+                ) ) as _group_count_";
+        $num = $this->query($sql);
+        return $num[0]['count'];
     }
 
     /**

application/route.php

@@ -258,7 +258,7 @@ Route::group('index', [
     'searchBargainAgents'                => ['index/Finance/searchBargainAgents', ['method' => 'GET']], //成交报告id获取盘方，客方，反签，独家，合作方
     'searchOrderAgents'                  => ['index/Finance/searchOrderAgents', ['method' => 'GET']], //order_id获取盘方，客方，反签，独家，合作方
     'getTallAgeList'                     => ['index/Finance/getTallAgeList', ['method' => 'GET']], //税费承担明细表
-    'getCommissionTotalList'             => ['index/Finance/getCommissionTotalListV2', ['method' => 'GET']], //分佣提成汇总表
+    'getCommissionTotalList'             => ['index/Finance/getCommissionTotalList', ['method' => 'GET']], //分佣提成汇总表
     'getCollection'                      => ['index/Finance/getCollection', ['method' => 'post|get']],//收款记录
     'addRealMoney'                       => ['index/Finance/addRealMoney', ['method' => 'post|get']],//新增实收
     'visitShop'                          => ['index/Supervise/visitShop', ['method' => 'get']],//门店拜访

public/resource/js/commissionTotal.js

@@ -13,6 +13,7 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
 		ldHtml: $('.phone_list'),
 		boxphoto: '',
 		exclusive_id: 0,
+		agent_id_phone:0,
 		init: function() {
 			//初始化dot
 			$("body").append(template);
@@ -54,7 +55,7 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
 			$('#confirm_commission').val(day_end);
 			
 			//初始化收佣日期
-			business.getList();
+			business.getList(1);
 			business.event();
 			business.getDistrict();
 		},
@@ -98,7 +99,19 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
 			$("#reset").click(function() { //重置
 				document.getElementById("form_search").reset();
 			});
-
+			//分佣方 姓名下拉式
+		    $(document).on("input", "#partical_name", function() { //手机号新增搜索客方
+					if($("#partical_name").val() == '') {
+						business.agent_id_phone='';
+						$(".user-ul").html('');
+					} else {
+						business.search_phone();
+					}
+				});
+			//点击li 列表消失
+			$(document).delegate(".addphone", "click", function() { //list消失新增客户 点击li事件 获取id ul消失
+				business.addphone(this);
+			});
 			$(document).delegate(".del_modal", "click", function() {
 				business.id = $(this).attr("data-id");
 
@@ -411,8 +424,7 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
 			}
 			params.pageNo = business.pageNo;
 			params.pageSize = business.pageSize;
-			params.name = $('#user_name').val();
-			params.phone = $('#user_phone').val();
+			params.agent_id = business.agent_id_phone;
 			params.income_start_date = $('#create_time').val();
 			params.income_end_date = $('#end_time').val();
 			params.bargain_start_date = $('#create_dealtime').val();
@@ -420,6 +432,7 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
 			params.confirm_date = $('#confirm_commission').val();
 			params.district_id = $("#district_id").val(); //部门id 添加字段
 			params.store_id = $('#guest_stores').val();
+			console.log(params)
 			$.ajax({
 				url: '/index/getCommissionTotalList', //获取列表
 				type: 'GET',
@@ -433,6 +446,8 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
                         $("#business_list").html(doTtmpl(data.data.list));
                         //汇总总计
                         $('.total-money').html(data.data.total_money);
+                        $('.total-taxes').html(data.data.total_taxes);
+                        $('.total-all').html(data.data.total_money - data.data.total_taxes);
                         /*分页代码*/
                         add_page(data.data.total, pageNo, business.pageSize, business.getList);
 					}  else {
@@ -526,7 +541,58 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
 			 }
 
 			window.open(str)
-		}
+		},
+				//分佣方 姓名搜索
+		search_phone: function() { //手机号新增客户
+			$.ajax({
+				url: '/index/getBroker_new',
+				type: 'GET',
+				async: true,
+				data: {
+					"phone": $("#partical_name").val(),
+					'all' : 1
+				},
+				dataType: 'json',
+				success: function(data) {
+					if(data.code == 200) {
+						var user_ul = "";
+						$.each(data.data, function(i, item) {
+							if(item.status == 0){
+								var status='   ';
+							};
+							if(item.status == 1){
+								var status='-长假';
+							};
+							if(item.status == 2){
+								var status='-离职';
+							};
+							if(item.status == 3){
+								var status='-转勤';
+							};
+							if(item.status == 4){
+								var status='-黑名单';
+							}
+							
+							user_ul += '<li class="addphone" data-id="' + item.id + '">' + item.id + '-' + item.name + '-' + item.phone + status + '</li>';
+						});
+						$(".user-ul").html(user_ul);
+
+					} else {
+						alert(data.msg);
+					}
+
+				}
+			});
+		},
+		//将li里的值 赋给input（分佣方姓名）
+		addphone: function(obj) {//新增客户 input赋值
+			var user_ht = $(obj).html()+'';
+			console.log(user_ht.length);
+			var user_ht_str=user_ht.substring(0,user_ht.length-3);
+			$("#partical_name").val(user_ht_str);
+			$(".user-ul").html('');
+			business.agent_id_phone = $(obj).attr("data-id");
+		},
 	};
 	return business;
 });
\ No newline at end of file

public/resource/template/commissionTotal_template_tpl.html

@@ -31,7 +31,7 @@
             [% } %]
         </td>
         <td>
-        	[%= it[item]['over_fee'] %]
+        	[%= it[item]['practical_fee'] - it[item]['fee'] %]
         </td>
     </tr>
     [% } %]