From 1bea859fd49f25989fd1b9c909b9ea5001b0ce74 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Fri, 31 Jul 2020 17:36:13 +0800
Subject: [PATCH 01/31] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E4=B8=9A=E7=BB=A9bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=9D=83=E9=99=90=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/MarketPercentageController.class.php  |  6 +++---
 .../Admin/Controller/TimingController.class.php      | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php
index eeb1ce40a..e314200ff 100644
--- a/Application/Admin/Controller/MarketPercentageController.class.php
+++ b/Application/Admin/Controller/MarketPercentageController.class.php
@@ -23,7 +23,7 @@ class MarketPercentageController extends ThinkController
 
         $admin_id = $_SESSION['onethink_admin']['user_auth']['uid'];
         $map['admin_id'] = $admin_id;
-        if(is_administrator()||session('user_group_id') == 15||session('user_group_id') == 14) {
+        if(is_administrator()||session('user_group_id') == 15||session('user_group_id') == 14||session('user_group_id') == 19||session('user_group_id') == 23) {
             unset($map['admin_id']);
             $admin_data = M("member")
                 ->field("access.uid admin_id")
@@ -199,7 +199,7 @@ class MarketPercentageController extends ThinkController
 
         $admin_id = $_SESSION['onethink_admin']['user_auth']['uid'];
         $map['admin_id'] = $admin_id;
-        if(is_administrator()||session('user_group_id') == 15||session('user_group_id') == 14) {
+        if(is_administrator()||session('user_group_id') == 15||session('user_group_id') == 14||session('user_group_id') == 19||session('user_group_id') == 23) {
             unset($map['admin_id']);
 
             $admin_data = M("member")
@@ -561,7 +561,7 @@ class MarketPercentageController extends ThinkController
 
         $admin_id = $_SESSION['onethink_admin']['user_auth']['uid'];
         $map['admin_id'] = $admin_id;
-        if(is_administrator()||session('user_group_id') == 15||session('user_group_id') == 14) {
+        if(is_administrator()||session('user_group_id') == 15||session('user_group_id') == 14||session('user_group_id') == 19||session('user_group_id') == 23) {
             unset($map['admin_id']);
 
             $admin_data = M("member")
diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php
index 2c04fa38f..7debc9146 100644
--- a/Application/Admin/Controller/TimingController.class.php
+++ b/Application/Admin/Controller/TimingController.class.php
@@ -757,7 +757,7 @@ class TimingController extends AdminController {
     public function caculateMarketStream () {
         echo date("Y-m-d H:i:s")."----------------------市场结算管理计算----------------------\n";
 
-        $map['pay_time'] = date("Y-m",strtotime('-1 month'));
+        $map['pay_time'] = date('Y-m',strtotime(date('Y',time()).'-'.(date('m',time())-1).'-01'));
 
         if ($_REQUEST['time']) {
             $map['pay_time'] = $_REQUEST['time'];
@@ -765,7 +765,7 @@ class TimingController extends AdminController {
         $spend_map = [];
         if($_REQUEST['time'] == 'all') {
             $map = [];
-            $spend_map['pay_time'] = ['elt',strtotime(date('Y-m-t 23:59:59', strtotime('-1 month')))];
+            $spend_map['pay_time'] = ['elt',strtotime(date('Y-m-t 23:59:59', strtotime(date('Y',time()).'-'.(date('m',time())-1).'-01')))];
         }
 
         $data = M("auth_group")
@@ -971,8 +971,8 @@ class TimingController extends AdminController {
         }
 
         if (!$pay_time) {
-            $pay_time = date("Y-m",strtotime('-1 month'));
-            $map['pay_time'] = date("Y-m",strtotime('-1 month'));
+            $pay_time = date('Y-m',strtotime(date('Y',time()).'-'.(date('m',time())-1).'-01'));
+            $map['pay_time'] = date('Y-m',strtotime(date('Y',time()).'-'.(date('m',time())-1).'-01'));
         }
 
         if ($pay_time == 'all') {
@@ -984,7 +984,7 @@ class TimingController extends AdminController {
                 $date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
                 $i++;
                 $this->insertAllUserBonus($date);
-            } while ($date < date('Y-m', strtotime("{$end} -1 month")));
+            } while ($date < date('Y-m',strtotime(date('Y',time()).'-'.(date('m',time())-1).'-01')));
 
 //            $map['pay_time'] = [];
             unset($map['pay_time']);
@@ -1090,7 +1090,7 @@ class TimingController extends AdminController {
     public function sendMarketBonus(){
         echo date("Y-m-d H:i:s")."----------------------月初发放市场专员应发份额----------------------\n";
 
-        $map['pay_time'] = date("Y-m",strtotime('-1 month'));
+        $map['pay_time'] = date('Y-m',strtotime(date('Y',time()).'-'.(date('m',time())-1).'-01'));
 
         if ($_REQUEST['time']) {
             $map['pay_time'] = $_REQUEST['time'];

From 896cdd92b9be97e0fcae92ac3917babb1db59ead Mon Sep 17 00:00:00 2001
From: zyx <as123498@qq.com>
Date: Sat, 1 Aug 2020 12:44:27 +0800
Subject: [PATCH 02/31] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=B8=81=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=95=86=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/DepositController.class.php      | 11 +++++++++--
 .../Admin/Controller/TestOrderController.class.php    |  4 ++++
 Application/Admin/View/Deposit/lists.html             | 11 ++++++++++-
 Application/Admin/View/Deposit/lists_secord.html      | 10 ++++++++++
 Application/Admin/View/Spend/lists.html               |  2 +-
 Application/Admin/View/TestOrder/lists.html           | 11 +++++++++++
 6 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/DepositController.class.php b/Application/Admin/Controller/DepositController.class.php
index e838bb7c9..8034efa3d 100644
--- a/Application/Admin/Controller/DepositController.class.php
+++ b/Application/Admin/Controller/DepositController.class.php
@@ -71,7 +71,10 @@ class DepositController extends ThinkController {
             }
             unset($_REQUEST['pay_way']);
         }
-
+        if ($_REQUEST['merchant_id']) {
+            $map['merchant_id'] = $_REQUEST['merchant_id'];
+            unset($_REQUEST['merchant_id']);
+        }
 
         if(isset($_REQUEST['pay_status'])){
             $map['pay_status']=$_REQUEST['pay_status'];
@@ -213,6 +216,10 @@ class DepositController extends ThinkController {
             $sort = $data_order==3?'desc':'asc';
             $map['order'] = $data_order_type.' '.$sort;
         }
+        if ($_REQUEST['merchant_id']) {
+            $map['merchant_id'] = $_REQUEST['merchant_id'];
+            unset($_REQUEST['merchant_id']);
+        }
 
         $map1=$map;
         $map1['pay_status']=1;
@@ -235,7 +242,7 @@ class DepositController extends ThinkController {
 
         $data = D('coin_pay_order')
             /* 查询指定字段，不指定则查询所有字段 */
-            ->field('*,order_status as pay_status,order_number as pay_order_number')
+            ->field('*,order_status as pay_status,order_number as pay_order_number,merchant_id')
             // 查询条件
             ->where($map)
             /* 默认通过id逆序排列 */
diff --git a/Application/Admin/Controller/TestOrderController.class.php b/Application/Admin/Controller/TestOrderController.class.php
index 0141a6507..638f3c3e1 100644
--- a/Application/Admin/Controller/TestOrderController.class.php
+++ b/Application/Admin/Controller/TestOrderController.class.php
@@ -47,6 +47,10 @@ class TestOrderController extends ThinkController
             $timeend = strtotime($_REQUEST['timeend'])+86399;
             $map['pay_time'] = array("ELT",$timeend);
         }
+        if ($_REQUEST['merchant_id']) {
+            $map['merchant_id'] = $_REQUEST['merchant_id'];
+            unset($_REQUEST['merchant_id']);
+        }
         $order_list = M('test_order t', 'tab_')
                       ->field("t.*,g.sdk_version")
                       ->join("tab_game g on t.game_id = g.id","left")
diff --git a/Application/Admin/View/Deposit/lists.html b/Application/Admin/View/Deposit/lists.html
index 11ac0aef1..0875d4093 100644
--- a/Application/Admin/View/Deposit/lists.html
+++ b/Application/Admin/View/Deposit/lists.html
@@ -81,7 +81,14 @@
                     <option value="0">下单未付款</option>
                 </select>
             </div>
-
+            <div class="input-list search_item input-list-gamenoticestatus">
+                <select id="merchant_id" name="merchant_id" class="select_gallery">
+                    <option value="0">请选择商户</option>
+                    <volist name=":getMerchantList()" id="vo">
+                        <option value="{$vo.id}" <if condition="$_GET['merchant_id'] eq $vo['id']">selected</if>>{$vo.name}</option>
+                    </volist>
+                </select>
+            </div>
 <!--            <div class="input-list search_item input-list-gamenoticestatus">-->
 <!--                <select name="promote_level" style="color:#444" class="select_gallery" id="promote_level">-->
 <!--                    <option value="">请选择推广员等级</option>-->
@@ -125,6 +132,7 @@
                     </th>
                     <th>充值方式</th>
                     <th>充值ip</th>
+                    <th>所属商户</th>
                     <th>
                         <a class="paixu" data-order='create_time'>
                             充值时间
@@ -186,6 +194,7 @@
                             <td><span>{$data.pay_amount}</span></td>
                             <td><if condition="$data['pay_way'] neq ''">{:get_pay_way($data['pay_way'])}<else/>无</if></td>
                             <td>{$data.pay_ip}</td>
+                            <td>{:getMerchantName($data['merchant_id'])}</td>
                             <td>{:set_show_time($data['create_time'],'','pay')}</td>
                             <td>
                                 <if condition="$data['pay_status'] eq 1">
diff --git a/Application/Admin/View/Deposit/lists_secord.html b/Application/Admin/View/Deposit/lists_secord.html
index c79fed93c..9c3c1378a 100644
--- a/Application/Admin/View/Deposit/lists_secord.html
+++ b/Application/Admin/View/Deposit/lists_secord.html
@@ -90,6 +90,14 @@
                     <option value="">请选择推广员</option>
                 </select>
             </div>
+            <div class="input-list search_item input-list-gamenoticestatus">
+                <select id="merchant_id" name="merchant_id" class="select_gallery">
+                    <option value="0">请选择商户</option>
+                    <volist name=":getMerchantList()" id="vo">
+                        <option value="{$vo.id}" <if condition="$_GET['merchant_id'] eq $vo['id']">selected</if>>{$vo.name}</option>
+                    </volist>
+                </select>
+            </div>
 
             <input type="hidden" name="" value="" class="sortBy">
             <div class="input-list">
@@ -116,6 +124,7 @@
                         </a>
                     </th>
                     <th>充值方式</th>
+                    <th>所属商户</th>
                     <th>
                         <a class="paixu" data-order='create_time'>
                             支付时间
@@ -154,6 +163,7 @@
                             </td>
                             <td><span>{$data.pay_amount}</span></td>
                             <td><if condition="$data['pay_way'] neq ''">{:get_pay_way($data['pay_way'])}<else/>无</if></td>
+                            <td>{:getMerchantName($data['merchant_id'])}</td>
                             <td>{:set_show_time($data['create_time'],'','pay')}</td>
                             <td>
                                 <if condition="$data['pay_status'] eq 1">
diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html
index 7a15d6d3a..3bfb254fd 100644
--- a/Application/Admin/View/Spend/lists.html
+++ b/Application/Admin/View/Spend/lists.html
@@ -150,7 +150,7 @@
                 <select id="merchant_id" name="merchant_id" class="select_gallery">
                     <option value="0">请选择商户</option>
                     <volist name=":getMerchantList()" id="vo">
-                        <option value="{$vo.id}">{$vo.name}</option>
+                        <option value="{$vo.id}" <if condition="$_GET['merchant_id'] eq $vo['id']">selected</if>>{$vo.name}</option>
                     </volist>
                 </select>
             </div>
diff --git a/Application/Admin/View/TestOrder/lists.html b/Application/Admin/View/TestOrder/lists.html
index 9cb4a9dc7..150dbc704 100644
--- a/Application/Admin/View/TestOrder/lists.html
+++ b/Application/Admin/View/TestOrder/lists.html
@@ -87,6 +87,14 @@
           <option value="17" <if condition="$_GET['pay_way']  eq '17'">selected</if>>易宝支付</option>
         </select>
       </div>
+      <div class="input-list search_item input-list-gamenoticestatus">
+        <select id="merchant_id" name="merchant_id" class="select_gallery">
+          <option value="0">请选择商户</option>
+          <volist name=":getMerchantList()" id="vo">
+            <option value="{$vo.id}" <if condition="$_GET['merchant_id'] eq $vo['id']">selected</if>>{$vo.name}</option>
+          </volist>
+        </select>
+      </div>
 
       <div class="input-list">
         <a class="sch-btn" href="javascript:;" id="search" url="{:U('TestOrder/lists','model='.$model['name'].'&row='.I('row'),false)}" style="">搜索</a>
@@ -130,6 +138,8 @@
 
           <th >充值方式</th>
 
+          <th>所属商户</th>
+
           <th >录入时间</th>
 
           <th >操作</th>
@@ -161,6 +171,7 @@
               <td >{$data.order_amount}</td>
               <td >{$data.pay_amount}</td>
               <td >{$data.pay_way|get_pay_way}</td>
+              <td>{:getMerchantName($data['merchant_id'])}</td>
               <td >{$data.add_time|date='Y-m-d H:i:s',###}</td>
               <td ><a class="confirm del" data-id="{$data.id}">删除</a></td>
             </tr>

From bbb7f3301c075569c4765c01ceea88916a89eb76 Mon Sep 17 00:00:00 2001
From: zyx <as123498@qq.com>
Date: Sat, 1 Aug 2020 13:45:54 +0800
Subject: [PATCH 03/31] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=B8=81=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=A2=9E=E5=8A=A0=E5=95=86=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/ExportController.class.php      | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 408269e65..0bd47117e 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -1200,7 +1200,7 @@ class ExportController extends Controller
 
 
                 $xlsCell = array(
-                    "支付订单号","CP订单号", "充值时间","支付时间", "玩家账号", "游戏名称", L('Subordinate_channel'), "所属推广公司", "所属市场专员", "充值ip","区服ID", "游戏区服",
+                    "支付订单号","CP订单号", "充值时间","支付时间", "玩家账号", "游戏名称", L('Subordinate_channel'), "所属推广公司", "所属市场专员","所属商户", "充值ip","区服ID", "游戏区服",
                     "角色ID","角色名称", "订单金额", "实付金额", "充值方式", L('Order_status'), "游戏通知状态", "消费"."{$total}"
                 );
 
@@ -1232,7 +1232,7 @@ class ExportController extends Controller
 //                        ->join($tab_promote_join)
 //                        ->order('pay_time DESC')
 //                        ->select();
-                        ->field('pay_order_number,extend,pay_time,payed_time,user_account,game_name,promote_account, 0 as company_name,market_admin_id,spend_ip,server_id,server_name,game_player_id,game_player_name,cost,pay_amount,pay_way,pay_status,pay_game_status, promote_id')
+                        ->field('pay_order_number,extend,pay_time,payed_time,user_account,game_name,promote_account, 0 as company_name,market_admin_id,merchant_id,spend_ip,server_id,server_name,game_player_id,game_player_name,cost,pay_amount,pay_way,pay_status,pay_game_status, promote_id')
                         // ->join('tab_promote on tab_promote.id = tab_spend.promote_id', 'left')
                         // ->join('tab_promote_company on tab_promote_company.id and tab_promote.company_id', 'left')
                         ->where($map)
@@ -1254,6 +1254,7 @@ class ExportController extends Controller
                         }else {
                             $value['payed_time'] = "------";
                         }
+                        $value['merchant_id'] = getMerchantName($value['merchant_id']);
                         checkEncryptionAuth($value['user_account'],'spend_lists');
 //                        $value['user_account'] = encryption($value['user_account']);
                         ($value['promote_account']=='官方渠道'||$value['promote_account']=='自然注册')?($value['promote_account']=C('OFFICIEL_CHANNEL')):'';
@@ -1369,6 +1370,7 @@ class ExportController extends Controller
                         array('pay_amount', "充值平台币"),
                         array('pay_way', "充值方式", 'get_pay_way', '*'),
                         array('pay_ip', "充值ip"),
+                        array('merchant_id', "所属商户"),
                         array('create_time', "充值时间"),
                         array('payed_time','支付时间'),
                         array('pay_status', L('Order_status'), 'get_info_status', '*', '9'),
@@ -1384,6 +1386,8 @@ class ExportController extends Controller
 
                         ($xlsData[$key]['promote_account']=='官方渠道'||$xlsData[$key]['promote_account']=='自然注册')?($xlsData[$key]['promote_account']=C('OFFICIEL_CHANNEL')):'';
 
+                        $xlsData[$key]['merchant_id'] = getMerchantName($value['merchant_id']);
+
                         $xlsData[$key]['create_time'] = date('Y-m-d H:i:s', $value['create_time']);
                         if ($value['pay_status'] == 1){
                             $xlsData[$key]['payed_time'] = date('Y-m-d H:i:s', $value['payed_time']);
@@ -2411,6 +2415,7 @@ class ExportController extends Controller
                         array('promote_account', L('Subordinate_channel')),
                         array('pay_amount', "充值平台币"),
                         array('pay_way', "充值方式"),
+                        array('merchant_id', "所属商户"),
                         array('create_time', "充值时间"),
                         array('pay_status', L('Order_status'), 'get_info_status', '*', '9'),
                         array('', "共计充值{$total}"),
@@ -2427,6 +2432,7 @@ class ExportController extends Controller
 //                    var_dump($xlsData);die();
                     foreach ($xlsData as $key => $value) {
                         $xlsData[$key]['create_time'] = date('Y-m-d H:i:s', $value['create_time']);
+                        $xlsData[$key]['merchant_id'] = getMerchantName($value['merchant_id']);
                         if(!$xlsData[$key]['pay_way']) {
                             $xlsData[$key]['pay_way'] = '无';
                         } else {
@@ -2449,6 +2455,7 @@ class ExportController extends Controller
                         array('order_amount', '订单金额'),
                         array('pay_amount', '实付金额'),
                         array('pay_way', '充值方式'),
+                        array('merchant_id', '所属商户'),
                         array('add_time', '录入时间'),
                     );
     
@@ -2517,6 +2524,7 @@ class ExportController extends Controller
                         $order_list['pay_amount'] = $v['pay_amount'];
                         $order_list['pay_way'] = get_pay_way($v['pay_way']);
                         $order_list['add_time'] = date('Y-m-d H:i:s', $v['add_time']);
+                        $order_list['merchant_id'] = getMerchantName($v['merchant_id']);
 
                         checkEncryptionAuth($order_list['user_account'],'TestOrder_lists');
 

From 3c8f6372400065ff1e01c28ba42124a4312cbe94 Mon Sep 17 00:00:00 2001
From: zyx <as123498@qq.com>
Date: Sat, 1 Aug 2020 13:49:25 +0800
Subject: [PATCH 04/31] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=B8=81=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=A2=9E=E5=8A=A0=E5=95=86=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/Deposit/lists.html   | 2 +-
 Application/Admin/View/Spend/lists.html     | 2 +-
 Application/Admin/View/TestOrder/lists.html | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/View/Deposit/lists.html b/Application/Admin/View/Deposit/lists.html
index 0875d4093..8b9a258d9 100644
--- a/Application/Admin/View/Deposit/lists.html
+++ b/Application/Admin/View/Deposit/lists.html
@@ -224,7 +224,7 @@
                 </empty>
                 <tr class="data_summary">
                     <td>汇总</td>
-                    <td colspan="9">
+                    <td colspan="10">
                         当页充值：{:array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount'))}；
                         今日充值：{$ttotal} ；
                         昨日充值：{$ytotal} ；
diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html
index 3bfb254fd..fdcc521d4 100644
--- a/Application/Admin/View/Spend/lists.html
+++ b/Application/Admin/View/Spend/lists.html
@@ -308,7 +308,7 @@
                     <if condition="$rule_count_check">
                     <tr class="data_summary">
                         <td>汇总</td>
-                        <td colspan="18">
+                        <td colspan="19">
                             当页充值：{:null_to_0(array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount')))}
                             <!-- 今日充值：{$ttotal}-->
                             <!-- 昨日充值：{$ytotal}-->
diff --git a/Application/Admin/View/TestOrder/lists.html b/Application/Admin/View/TestOrder/lists.html
index 150dbc704..f75eb69ef 100644
--- a/Application/Admin/View/TestOrder/lists.html
+++ b/Application/Admin/View/TestOrder/lists.html
@@ -190,6 +190,7 @@
             <td >------</td>
             <td >------</td>
             <td >------</td>
+            <td >------</td>
           </tr>
         </notemtpy>
         </tbody>

From 9df721d1f5860826330d623bda33c5856591348a Mon Sep 17 00:00:00 2001
From: zyx <as123498@qq.com>
Date: Sat, 1 Aug 2020 14:48:25 +0800
Subject: [PATCH 05/31] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=B8=81=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BAbug=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/ExportController.class.php      | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 0bd47117e..b980cc7f4 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -1127,6 +1127,12 @@ class ExportController extends Controller
                     }
                     unset($_REQUEST['pay_way']);
                 }
+
+                if ($_REQUEST['merchant_id']) {
+                    $map['merchant_id'] = $_REQUEST['merchant_id'];
+                    unset($_REQUEST['merchant_id']);
+                }
+
                 if (isset($_REQUEST['pay_game_status'])) {
                     $map['pay_game_status'] = $_REQUEST['pay_game_status'];
                     unset($_REQUEST['pay_game_status']);
@@ -1353,6 +1359,10 @@ class ExportController extends Controller
                     $map['pay_status'] = $_REQUEST['pay_status'];
                     unset($_REQUEST['pay_status']);
                 }
+                if ($_REQUEST['merchant_id']) {
+                    $map['merchant_id'] = $_REQUEST['merchant_id'];
+                    unset($_REQUEST['merchant_id']);
+                }
                 $map1 = $map;
                 $map1['pay_status'] = 1;
 
@@ -2394,6 +2404,10 @@ class ExportController extends Controller
                         $map['pay_status'] = $_REQUEST['pay_status'];
                         unset($_REQUEST['pay_status']);
                     }
+                    if ($_REQUEST['merchant_id']) {
+                        $map['merchant_id'] = $_REQUEST['merchant_id'];
+                        unset($_REQUEST['merchant_id']);
+                    }
                     $map1 = $map;
                     $map1['pay_status'] = 1;
 
@@ -2497,6 +2511,10 @@ class ExportController extends Controller
                         $timeend = strtotime($params['timeend'])+86399;
                         $map['t.pay_time'] = array("ELT",$timeend);
                     }
+                    if ($_REQUEST['merchant_id']) {
+                        $map['merchant_id'] = $_REQUEST['merchant_id'];
+                        unset($_REQUEST['merchant_id']);
+                    }
     
     
                     $orderData =M('test_order t', 'tab_')

From 9b32f0cd0e35a7bb9245261506f79fd4131175bb Mon Sep 17 00:00:00 2001
From: chenzhi <294767167@11qq.com>
Date: Sat, 1 Aug 2020 23:00:06 +0800
Subject: [PATCH 06/31] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8E=B7=E5=8F=96cp?=
 =?UTF-8?q?=E6=AF=94=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/CompanyStatementSetController.class.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php
index 22ab90e12..23b5eb792 100644
--- a/Application/Admin/Controller/CompanyStatementSetController.class.php
+++ b/Application/Admin/Controller/CompanyStatementSetController.class.php
@@ -303,7 +303,7 @@ class CompanyStatementSetController extends Controller {
 				$game['pay_amount'] =$va['pay_money'];
 				$game['game_name'] =$ke;
 				//获取游戏id及比例
-				$game_id = $GameDb->where("game_name='{$ke}' OR original_package_name='{$ke}'")->field("id,relation_game_id")->find();
+				$game_id = $GameDb->where("relation_game_name='{$ke}' OR original_package_name='{$ke}'")->field("id,relation_game_id")->find();
 				if(empty($game_id)){
 					$game['relation_game_id']=0;
 					// $game['sum_money']=0;

From 007ca52afa60d6358378f015b5e51d874510e528 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 3 Aug 2020 09:33:44 +0800
Subject: [PATCH 07/31] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E6=AF=94=E4=BE=8B=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/CompanyStatementSetController.class.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php
index 23b5eb792..bcb5cb754 100644
--- a/Application/Admin/Controller/CompanyStatementSetController.class.php
+++ b/Application/Admin/Controller/CompanyStatementSetController.class.php
@@ -935,6 +935,7 @@ class CompanyStatementSetController extends Controller {
 			$v['reward'] = 0;
 			$v['platform_amount'] = 0;
 			if(!isset($v['list'])){continue;}
+			$company_belong = $pc[$v['id']]['company_belong'];
 			//服务器费用
             if ($type < 2) {
                 if ($v['has_server_fee'] == 1 && $v['server_fee'] > 0) {

From 553ee7a752b62ab089ffa0c0a22c22a08c839656 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 3 Aug 2020 09:40:03 +0800
Subject: [PATCH 08/31] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Payment/Common/extend.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Payment/Common/extend.php b/Application/Payment/Common/extend.php
index 2e4b75364..1cb8c0d56 100644
--- a/Application/Payment/Common/extend.php
+++ b/Application/Payment/Common/extend.php
@@ -2162,7 +2162,7 @@ function getGamePromoteCompanyRadio($company_id,$relation_game_id,$endtime,$amou
     if(empty($cgr_res)){
         //模板搜索
         //获取公司类型
-        if($company_belong === false){
+        if($company_belong == false){
             $company_belong =  M("PromoteCompany","tab_")->field("company_belong")->where("id='{$company_id}'")->find()['company_belong'];
         }
         $mwhere = "company_belong='{$company_belong}' and relation_game_id='{$relation_game_id}'";

From 3fc9b578a98de7cd7b7882fccd8d1d952306fd52 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 3 Aug 2020 10:03:32 +0800
Subject: [PATCH 09/31] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E9=87=8D=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompanyStatementPoolController.class.php         |  2 +-
 .../CompanyStatementSetController.class.php          | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php
index 91a8eeeb2..091555059 100644
--- a/Application/Admin/Controller/CompanyStatementPoolController.class.php
+++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php
@@ -787,7 +787,7 @@ class CompanyStatementPoolController extends ThinkController
         //重新计算
         $stime = $info['statement_end_time']-0+1;
         $type = $info['withdraw_type'];
-        A("CompanyStatementSet")->promoteUserPool($type,$stime,true);
+        A("CompanyStatementSet")->promoteUserPool($type,$stime,true,$info['is_payment']);
 
         M()->commit();
         $this->ajaxReturn(array(
diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php
index bcb5cb754..d3ea8805d 100644
--- a/Application/Admin/Controller/CompanyStatementSetController.class.php
+++ b/Application/Admin/Controller/CompanyStatementSetController.class.php
@@ -791,7 +791,7 @@ class CompanyStatementSetController extends Controller {
 			
 		}
 	}
-	public function promoteUserPool($type,$stime,$recount = false){
+	public function promoteUserPool($type,$stime,$recount = false,$is_payment=false){
 		$t = $this->setBeginAndEndTime($type,$stime);
 		$begintime = $t[0];
 		$endtime = $t[1];
@@ -835,9 +835,15 @@ class CompanyStatementSetController extends Controller {
 			$user['withdraw_type'] = 2;
 			$this->doPromoteUserPool($user,$users,2,$stime,$recount);
 		}
+		if($is_payment !== false && $is_payment==1){
+			$this->savePromotateUserPool($users);
+		}else if($is_payment !== false && $is_payment==2){
+			$this->savePromotateUserPool($user);
+		}else{
+			$this->savePromotateUserPool($users);
+			$this->savePromotateUserPool($user);
+		}
 		
-		$this->savePromotateUserPool($users);
-		$this->savePromotateUserPool($user);
 	}
 
 	/**

From 52345e4eb16d9f60a75d836e8eb9a9bc72464f58 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 3 Aug 2020 11:07:34 +0800
Subject: [PATCH 10/31] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=AF=E4=BB=98=E5=AE=9D=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/View/CompanyStatementPool/viewPuPool.html    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Application/Admin/View/CompanyStatementPool/viewPuPool.html b/Application/Admin/View/CompanyStatementPool/viewPuPool.html
index 5b6b25910..3655703d3 100644
--- a/Application/Admin/View/CompanyStatementPool/viewPuPool.html
+++ b/Application/Admin/View/CompanyStatementPool/viewPuPool.html
@@ -115,6 +115,10 @@
                         <th>银行卡号</th>
                         <th>开户支行</th>
                         <th>帐户类型</th>
+
+                        <th>支付宝真实姓名</th>
+                        <th>支付宝账号</th>
+
                         <th>备注</th>
                         <th>是否结算</th>
                         <if condition="!$is_export">
@@ -154,6 +158,10 @@
                             <td rowspan="{$com.statement_count}">&nbsp;{$com.company_info.bank_account}</td>
                             <td rowspan="{$com.statement_count}">{$com.company_info.opening_bank}</td>
                             <td rowspan="{$com.statement_count}"></td>
+
+                            <td rowspan="{$com.statement_count}">{$com.company_info.ali_user}</td>
+                            <td rowspan="{$com.statement_count}">{$com.company_info.ali_account}</td>
+
                             <td rowspan="{$com.statement_count}">{$com.remark}</td>
                             <td rowspan="{$com.statement_count}"><if condition="$com['st'] eq 0">否 <else /> 是 </if></td>
                             <if condition="!$is_export">
@@ -207,6 +215,8 @@
                         <td></td>
                         <td></td>
                         <td></td>
+                        <td></td>
+                        <td></td>
                         <if condition="!$is_export">
                             <td></td>
                         </if>

From e34d28e2c820a2f7b662794d658735e86dde9846 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Mon, 3 Aug 2020 13:04:45 +0800
Subject: [PATCH 11/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/ExportController.class.php     | 26 ++++++++++++--
 .../Controller/FinanceController.class.php    | 34 +++++++++++++++++--
 Application/Common/Common/extend.php          |  8 +++++
 3 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 3e430fb47..2cf7457d2 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -8279,11 +8279,14 @@ class ExportController extends Controller
 
         $map = [];
 
+        $searchGameIds = null;
         $game_ids = array_column(getGameByName(I("game_name"), I("sdk_type")), 'id');
         if ($game_ids) {
             $map['s.game_id'] = ['in', $game_ids];
+            $searchGameIds = $game_ids;
         }
 
+
         if (!empty(I('partner_id'))) {
             $map['g.partner_id'] = I('partner_id');
         }
@@ -8303,20 +8306,39 @@ class ExportController extends Controller
 
         if (!empty(I('game_type_id'))) {
             $map['g.game_type_id'] = I('game_type_id');
+            $searchGameIds = M('game', 'tab_')->where(['game_type_id' => I('game_type_id', 0)])->getField('id', true);
         }
 
         $xlsData = D("spend")->gameStatistics($map);
 
         $uniqueCodes = array_column($xlsData, 'unique_code');
+        $gameIds = array_column($data, 'game_id');
         $uniqueCodes = array_filter($uniqueCodes, function($value) {
             if ($value) {
                 return true;
             }
             return false;
         });
+
+        $gameSets = [];
+        if (count($gameIds) > 0) {
+            $gameSets = M('game_set', 'tab_')->field(['game_id', 'pay_notify_url'])->where(['game_id' => ['in', $gameIds]])->select();
+            $gameSets = index_by_column('game_id', $gameSets);
+        }
+
+        $searchGameCodes = [];
+        if (count($searchGameIds) > 0) {
+            $searchGameCodes = M('game', 'tab_')->where(['id' => ['in', $searchGameIds], 'unique_code' => ['neq', '']])->getField('unique_code', true);
+            $searchGameCodes = array_unique($searchGameCodes);
+        }
         
         $client = new AggregateClient();
-        $result = $client->api('game-data', ['unique_codes' => $uniqueCodes, 'started_at' => I('timestart', ''), 'ended_at' => I('timeend', '')]);
+        $result = $client->api('game-data', [
+            'unique_codes' => $uniqueCodes, 
+            'started_at' => I('timestart', ''), 
+            'ended_at' => I('timeend', ''),
+            'search_games' => $searchGameCodes,
+        ]);
         $aggData = [];
         $aggTotal = '0.00';
         if ($result['code'] == '0000') {
@@ -8332,7 +8354,7 @@ class ExportController extends Controller
                 $aggAmount = number_format($aggData[$value['unique_code']][$deviceType], 2, '.', '');
             }
             $xlsData[$key]['agg_amount'] = $aggAmount;
-            if ($aggAmount != '0.00') {
+            if (isset($gameSets[$value['game_id']]) && isAggGame($gameSets[$value['game_id']]['pay_notify_url'])) {
                 $value['cash_count'] = 0;
                 $value['balance_coin_count'] = 0;
                 $value['inside_cash_count'] = 0;
diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php
index 4cfd24076..a47e7bdfa 100644
--- a/Application/Admin/Controller/FinanceController.class.php
+++ b/Application/Admin/Controller/FinanceController.class.php
@@ -707,9 +707,11 @@ class FinanceController extends ThinkController
 
         $map = [];
 
+        $searchGameIds = null;
         $game_ids = array_column(getGameByName(I("game_name"), I("sdk_type")), 'id');
         if ($game_ids) {
             $map['s.game_id'] = ['in', $game_ids];
+            $searchGameIds = $game_ids;
         }
 
         if (!empty(I('partner_id'))) {
@@ -731,10 +733,13 @@ class FinanceController extends ThinkController
 
         if (!empty(I('game_type_id'))) {
             $map['g.game_type_id'] = I('game_type_id');
+            $searchGameIds = M('game', 'tab_')->where(['game_type_id' => I('game_type_id', 0)])->getField('id', true);
         }
+        
         $startTime = time();
        //游戏统计列表
         $data = D("spend")->gameStatistics($map, $row, $p);
+        $gameIds = array_column($data, 'game_id');
         $uniqueCodes = array_column($data, 'unique_code');
         $uniqueCodes = array_filter($uniqueCodes, function($value) {
             if ($value) {
@@ -743,8 +748,32 @@ class FinanceController extends ThinkController
             return false;
         });
         
+        $gameSets = [];
+        if (count($gameIds) > 0) {
+            $gameSets = M('game_set', 'tab_')->field(['game_id', 'pay_notify_url'])->where(['game_id' => ['in', $gameIds]])->select();
+            $gameSets = index_by_column('game_id', $gameSets);
+        }
+
+        $searchGameCodes = [];
+        if (count($searchGameIds) > 0) {
+            $searchGameCodes = M('game', 'tab_')->where(['id' => ['in', $searchGameIds], 'unique_code' => ['neq', '']])->getField('unique_code', true);
+            $searchGameCodes = array_unique($searchGameCodes);
+        }
+
+        var_dump([
+            'unique_codes' => $uniqueCodes, 
+            'started_at' => I('timestart', ''), 
+            'ended_at' => I('timeend', ''),
+            'search_games' => $searchGameCodes,
+        ]);
+
         $client = new AggregateClient();
-        $result = $client->api('game-data', ['unique_codes' => $uniqueCodes, 'started_at' => I('timestart', ''), 'ended_at' => I('timeend', '')]);
+        $result = $client->api('game-data', [
+            'unique_codes' => $uniqueCodes,
+            'started_at' => I('timestart', ''),
+            'ended_at' => I('timeend', ''),
+            'search_games' => $searchGameCodes,
+        ]);
         $aggData = [];
         $aggTotal = '0.00';
         if ($result['code'] == '0000') {
@@ -760,7 +789,8 @@ class FinanceController extends ThinkController
             if ($value['unique_code'] && isset($aggData[$value['unique_code']]) && isset($aggData[$value['unique_code']][$deviceType])) {
                 $aggAmount = number_format($aggData[$value['unique_code']][$deviceType], 2, '.', '');
             }
-            if ($aggAmount != '0.00') {
+            // if ($aggAmount != '0.00') {
+            if (isset($gameSets[$value['game_id']]) && isAggGame($gameSets[$value['game_id']]['pay_notify_url'])) {
                 $data[$key]['cash_count'] = $value['cash_count'] = 0;
                 $data[$key]['balance_coin_count'] = $value['balance_coin_count'] = 0;
                 $data[$key]['inside_cash_count'] = $value['inside_cash_count'] = 0;
diff --git a/Application/Common/Common/extend.php b/Application/Common/Common/extend.php
index 526108922..127fdec6f 100644
--- a/Application/Common/Common/extend.php
+++ b/Application/Common/Common/extend.php
@@ -3029,4 +3029,12 @@ function db2csv(&$data,$title,$header=false){
 function hideRealName($realName)
 {
 	return mb_strlen($realName,'utf-8') == 2 ? mb_substr($realName,0,1,'utf-8').'*':mb_substr($realName,0,1,'utf-8').'**';
+}
+
+function isAggGame($payUrl)
+{
+    if (strpos($payUrl, 'sdk-pay-a.wmtxkj') !== false || strpos($payUrl, 'sdk-pay-i.wmtxkj') !== false ) {
+        return true;
+    }
+    return false;
 }
\ No newline at end of file

From 7471dcf3386086e418959c82e7a85a6f0a498ae2 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Mon, 3 Aug 2020 13:47:31 +0800
Subject: [PATCH 12/31] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/FinanceController.class.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php
index a47e7bdfa..ab1fee944 100644
--- a/Application/Admin/Controller/FinanceController.class.php
+++ b/Application/Admin/Controller/FinanceController.class.php
@@ -760,13 +760,6 @@ class FinanceController extends ThinkController
             $searchGameCodes = array_unique($searchGameCodes);
         }
 
-        var_dump([
-            'unique_codes' => $uniqueCodes, 
-            'started_at' => I('timestart', ''), 
-            'ended_at' => I('timeend', ''),
-            'search_games' => $searchGameCodes,
-        ]);
-
         $client = new AggregateClient();
         $result = $client->api('game-data', [
             'unique_codes' => $uniqueCodes,

From 71d0d2c9d19b86d47bfcbb32a73d6852db0d7609 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 3 Aug 2020 14:35:44 +0800
Subject: [PATCH 13/31] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompanyStatementPoolController.class.php  | 19 ++++------
 .../View/CompanyStatementPool/viewPuPool.html | 36 +++++++++++--------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php
index 091555059..f83a57c60 100644
--- a/Application/Admin/Controller/CompanyStatementPoolController.class.php
+++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php
@@ -207,7 +207,7 @@ class CompanyStatementPoolController extends ThinkController
         //获取基本信息
         $infolist = M("company_statement_info","tab_")->field("*,'1' as st")->where("pool_id = '{$id}'")->select();
         //获取母单
-        $pool_info =  M("company_statement_pool","tab_")->field('statement_num,create_lack_ids,verify_status')->where("id={$id}")->find();
+        $pool_info =  M("company_statement_pool","tab_")->field('statement_num,create_lack_ids,verify_status,is_payment')->where("id={$id}")->find();
         $statement_num = $pool_info['statement_num'];
         $this->assign("title",$statement_num);
         $this->assign("pool_status",$pool_info['verify_status']);
@@ -226,12 +226,12 @@ class CompanyStatementPoolController extends ThinkController
 
                 $infolist =array_merge($infolist,$lack_info);
             }
-            $this->viewPuPool($infolist,$is_export);
+            $this->viewPuPool($infolist,$is_export,$pool_info);
         }
 
     }
     //个人汇总结算查看
-    public function viewPuPool(&$infolist,$is_export){
+    public function viewPuPool(&$infolist,$is_export,$pool_info){
         // dd($infolist);
         $line = 1;
         $count = [];
@@ -260,26 +260,19 @@ class CompanyStatementPoolController extends ThinkController
                     }else{
                         $va['sum_money'] =  "=J{$line}*(K{$line}+L{$line})+M{$line}-N{$line}";
                     }
-                    $count['sum_money_exp'] .= "O{$line}+";
-                    $count['platform_amount_exp'] .= "J{$line}+";
                 }else{
                     $count['platform_amount'] += $va['pay_amount'];
                     $count['sum_money'] +=  $va['sum_money'];
                 }
             }
             $v['statement_count'] = count($v['statement_info']);
-            
         }
         if($is_export){
-            $platform_amount_exp = trim($count["platform_amount_exp"],"+");
-            $sum_money_exp = trim($count["sum_money_exp"],"+");
-            if(empty($platform_amount_exp)){ $platform_amount_exp = 0;}
-            if(empty($sum_money_exp)){ $sum_money_exp = 0;}
-            
-            $count["platform_amount"] = "=".$platform_amount_exp;
-            $count["sum_money"] = "=".$sum_money_exp;
+            $count["platform_amount"] = "=SUM(J2:J".$line.")";
+            $count["sum_money"] = "=SUM(O2:O".$line.")";
         }
         $this->assign("data",$infolist);
+        $this->assign("is_payment",$pool_info['is_payment']);
         $this->assign("count",$count);
         $this->assign("is_export",$is_export);
         $this->display("CompanyStatementPool/viewPuPool");
diff --git a/Application/Admin/View/CompanyStatementPool/viewPuPool.html b/Application/Admin/View/CompanyStatementPool/viewPuPool.html
index 3655703d3..1673f7f1b 100644
--- a/Application/Admin/View/CompanyStatementPool/viewPuPool.html
+++ b/Application/Admin/View/CompanyStatementPool/viewPuPool.html
@@ -111,13 +111,16 @@
                         <th>奖励</th>
                         <th>罚款</th>
                         <th>结算金额</th>
-                        <th>开户名</th>
-                        <th>银行卡号</th>
-                        <th>开户支行</th>
-                        <th>帐户类型</th>
-
-                        <th>支付宝真实姓名</th>
-                        <th>支付宝账号</th>
+                        <if condition="$is_paymen eq 2">
+                            <th>开户名</th>
+                            <th>银行卡号</th>
+                            <th>开户支行</th>
+                            <th>帐户类型</th>
+                        </if>
+                        <if condition="$is_paymen eq 1">
+                            <th>支付宝真实姓名</th>
+                            <th>支付宝账号</th>
+                        </if>
 
                         <th>备注</th>
                         <th>是否结算</th>
@@ -154,13 +157,17 @@
                             <td>{$com['statement_info'][0]['fine']}</td>
                             <td>{$com['statement_info'][0]['sum_money']}</td>
 
-                            <td rowspan="{$com.statement_count}">{$com.company_info.payee_name}</td>
-                            <td rowspan="{$com.statement_count}">&nbsp;{$com.company_info.bank_account}</td>
-                            <td rowspan="{$com.statement_count}">{$com.company_info.opening_bank}</td>
-                            <td rowspan="{$com.statement_count}"></td>
+                            <if condition="$is_paymen eq 2">
+                                <td rowspan="{$com.statement_count}">{$com.company_info.payee_name}</td>
+                                <td rowspan="{$com.statement_count}">&nbsp;{$com.company_info.bank_account}</td>
+                                <td rowspan="{$com.statement_count}">{$com.company_info.opening_bank}</td>
+                                <td rowspan="{$com.statement_count}"></td>
+                            </if>
 
-                            <td rowspan="{$com.statement_count}">{$com.company_info.ali_user}</td>
-                            <td rowspan="{$com.statement_count}">{$com.company_info.ali_account}</td>
+                            <if condition="$is_paymen eq 1">
+                                <td rowspan="{$com.statement_count}">{$com.company_info.ali_user}</td>
+                                <td rowspan="{$com.statement_count}">{$com.company_info.ali_account}</td>
+                            </if>
 
                             <td rowspan="{$com.statement_count}">{$com.remark}</td>
                             <td rowspan="{$com.statement_count}"><if condition="$com['st'] eq 0">否 <else /> 是 </if></td>
@@ -208,11 +215,12 @@
                         <td></td>
                         <td></td>
                         <td>{$count.sum_money|default=0}</td>
-                       
+                        <if condition="$is_paymen eq 2">
                         <td></td>
                         <td></td>
                         <td></td>
                         <td></td>
+                        
                         <td></td>
                         <td></td>
                         <td></td>

From 12f232219c23527f2a06627a1556a690ec8c1f65 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 3 Aug 2020 14:38:32 +0800
Subject: [PATCH 14/31] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=B8=B8?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../View/CompanyStatementPool/viewPuPool.html | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/Application/Admin/View/CompanyStatementPool/viewPuPool.html b/Application/Admin/View/CompanyStatementPool/viewPuPool.html
index 1673f7f1b..f3f9dcf08 100644
--- a/Application/Admin/View/CompanyStatementPool/viewPuPool.html
+++ b/Application/Admin/View/CompanyStatementPool/viewPuPool.html
@@ -111,13 +111,13 @@
                         <th>奖励</th>
                         <th>罚款</th>
                         <th>结算金额</th>
-                        <if condition="$is_paymen eq 2">
+                        <if condition="$is_payment eq 2">
                             <th>开户名</th>
                             <th>银行卡号</th>
                             <th>开户支行</th>
                             <th>帐户类型</th>
                         </if>
-                        <if condition="$is_paymen eq 1">
+                        <if condition="$is_payment eq 1">
                             <th>支付宝真实姓名</th>
                             <th>支付宝账号</th>
                         </if>
@@ -157,14 +157,14 @@
                             <td>{$com['statement_info'][0]['fine']}</td>
                             <td>{$com['statement_info'][0]['sum_money']}</td>
 
-                            <if condition="$is_paymen eq 2">
+                            <if condition="$is_payment eq 2">
                                 <td rowspan="{$com.statement_count}">{$com.company_info.payee_name}</td>
                                 <td rowspan="{$com.statement_count}">&nbsp;{$com.company_info.bank_account}</td>
                                 <td rowspan="{$com.statement_count}">{$com.company_info.opening_bank}</td>
                                 <td rowspan="{$com.statement_count}"></td>
                             </if>
 
-                            <if condition="$is_paymen eq 1">
+                            <if condition="$is_payment eq 1">
                                 <td rowspan="{$com.statement_count}">{$com.company_info.ali_user}</td>
                                 <td rowspan="{$com.statement_count}">{$com.company_info.ali_account}</td>
                             </if>
@@ -215,14 +215,16 @@
                         <td></td>
                         <td></td>
                         <td>{$count.sum_money|default=0}</td>
-                        <if condition="$is_paymen eq 2">
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        
-                        <td></td>
-                        <td></td>
+                        <if condition="$is_payment eq 2">
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                        </if>
+                        <if condition="$is_payment eq 1">
+                            <td></td>
+                            <td></td>
+                        </if>
                         <td></td>
                         <td></td>
                         <if condition="!$is_export">

From a90149b31b8d10bd796c95af924c36f1d66f9849 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 3 Aug 2020 14:40:31 +0800
Subject: [PATCH 15/31] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=BC=9A=E9=95=BF?=
 =?UTF-8?q?=E7=BB=93=E7=AE=97=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/Promote/edit.html | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/Application/Admin/View/Promote/edit.html b/Application/Admin/View/Promote/edit.html
index bfda48013..96a199a74 100644
--- a/Application/Admin/View/Promote/edit.html
+++ b/Application/Admin/View/Promote/edit.html
@@ -344,22 +344,6 @@
                             <span class="notice-text">显示推广员的平台币余额，推广员平台币用于会长代充或者转移给下级推广员</span>
                         </td>
                     </tr>
-                    <if condition="$data['level'] eq 1">
-                      <tr>
-                        <td class="l">结算模式：</td>
-                        <td class="r table_radio">
-                        <span class="form_radio table_btn">
-                            <label>
-                                <input type="radio"  value="1" name="settlement_type" <eq name="data['settlement_type']" value="1">checked="checked"</eq>>周结
-                            </label>
-                            <label>
-                                <input type="radio"  value="2" name="settlement_type" <eq name="data['settlement_type']" value="2">checked="checked"</eq>>月结
-                            </label>
-                        </span>
-                          <span class="notice-text">会长推广结算模式</span>
-                        </td>
-                      </tr>
-                    </if>
                 </tbody>
             </table>
         </div>

From 0ee5ea3c021dff83d3b56981059dc259f0830227 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Mon, 3 Aug 2020 14:49:43 +0800
Subject: [PATCH 16/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/ExportController.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 2cf7457d2..8babe453d 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -8355,9 +8355,9 @@ class ExportController extends Controller
             }
             $xlsData[$key]['agg_amount'] = $aggAmount;
             if (isset($gameSets[$value['game_id']]) && isAggGame($gameSets[$value['game_id']]['pay_notify_url'])) {
-                $value['cash_count'] = 0;
-                $value['balance_coin_count'] = 0;
-                $value['inside_cash_count'] = 0;
+                $xlsData[$key]['cash_count'] = $value['cash_count'] = 0;
+                $xlsData[$key]['balance_coin_count'] =$value['balance_coin_count'] = 0;
+                $xlsData[$key]['inside_cash_count'] =$value['inside_cash_count'] = 0;
                 $exceptIds[] = $value['game_id'];
             }
             // $xlsData[$key]['game_name'] = substr($value["game_name"],0,strrpos($value["game_name"],'('));

From 6ac8a0a9b34c6fe2e0593787d6d79adcbcfe7fea Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Mon, 3 Aug 2020 14:56:11 +0800
Subject: [PATCH 17/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/ExportController.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 8babe453d..643bf08a4 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -8312,7 +8312,7 @@ class ExportController extends Controller
         $xlsData = D("spend")->gameStatistics($map);
 
         $uniqueCodes = array_column($xlsData, 'unique_code');
-        $gameIds = array_column($data, 'game_id');
+        $gameIds = array_column($xlsData, 'game_id');
         $uniqueCodes = array_filter($uniqueCodes, function($value) {
             if ($value) {
                 return true;

From f7581f3504cdfd61ebb040fd98b4784c8dfbfba1 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 3 Aug 2020 15:16:52 +0800
Subject: [PATCH 18/31] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E5=B0=8F=E4=BA=8E0=E4=BE=9D=E6=97=A7=E7=BB=93=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/CompanyStatementSetController.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php
index d3ea8805d..2081bbc63 100644
--- a/Application/Admin/Controller/CompanyStatementSetController.class.php
+++ b/Application/Admin/Controller/CompanyStatementSetController.class.php
@@ -408,8 +408,9 @@ class CompanyStatementSetController extends Controller {
 				//金额为0不补点
 				continue;
 			}
-			if($add_data['platform_amount'] <= 0){
-				return;		
+			if($add_data['platform_amount'] == 0){
+				//全等于0表示没有流水，小于0依旧要结算
+				return;
 			}
 			//添加
 			if($recount && $company_id !== false){

From f3b145f930df523dd3029a9c0f8f0237f964fa4c Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 3 Aug 2020 15:30:43 +0800
Subject: [PATCH 19/31] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9C=AA=E7=BB=93?=
 =?UTF-8?q?=E7=AE=97=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/CompanyStatementLackController.class.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/CompanyStatementLackController.class.php b/Application/Admin/Controller/CompanyStatementLackController.class.php
index 658649fb7..2403610c6 100644
--- a/Application/Admin/Controller/CompanyStatementLackController.class.php
+++ b/Application/Admin/Controller/CompanyStatementLackController.class.php
@@ -55,7 +55,7 @@ class CompanyStatementLackController extends ThinkController
             $map['company_type'] = $_REQUEST['company_type'];
         }
         if(isset($_REQUEST['company_name'])){
-            $map['company_name'] =["LIKE","%{$_REQUEST['company_id']}%"];
+            $map['company_name'] =["LIKE","%{$_REQUEST['company_name']}%"];
         }
         if(isset($_REQUEST['statement_pool_num'])){
             $map['statement_pool_num'] =["LIKE","%{$_REQUEST['statement_pool_num']}%"];

From 744512574587332bce255ce2b74d01cb3e6417ad Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Mon, 3 Aug 2020 15:34:05 +0800
Subject: [PATCH 20/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/ExportController.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 643bf08a4..a71ccb7af 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -8293,7 +8293,7 @@ class ExportController extends Controller
 
         if (!empty(I('timestart'))) {
             $timestart = strtotime(I('timestart'));
-            $map['_string'] = "s.pay_time >= {$timestart}";
+            $map['_string'] = "s.payed_time >= {$timestart}";
         }
 
         if (!empty(I('timeend'))) {
@@ -8301,7 +8301,7 @@ class ExportController extends Controller
             if (!empty($map['_string'])) {
                 $map['_string'] .= " and ";
             }
-            $map['_string'] .= " s.pay_time < {$timeend}";
+            $map['_string'] .= " s.payed_time < {$timeend}";
         }
 
         if (!empty(I('game_type_id'))) {

From 83a1d34b2c2e5c96b6ee369e5806e609eb9dac41 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Mon, 3 Aug 2020 15:49:34 +0800
Subject: [PATCH 21/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/ExportController.class.php        |  7 ++-----
 .../Admin/Controller/FinanceController.class.php       | 10 ++++------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index a71ccb7af..069ed57ae 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -8320,11 +8320,8 @@ class ExportController extends Controller
             return false;
         });
 
-        $gameSets = [];
-        if (count($gameIds) > 0) {
-            $gameSets = M('game_set', 'tab_')->field(['game_id', 'pay_notify_url'])->where(['game_id' => ['in', $gameIds]])->select();
-            $gameSets = index_by_column('game_id', $gameSets);
-        }
+        $gameSets = M('game_set', 'tab_')->field(['game_id', 'pay_notify_url'])->where(['game_id' => ['in', $gameIds]])->select();
+        $gameSets = index_by_column('game_id', $gameSets);
 
         $searchGameCodes = [];
         if (count($searchGameIds) > 0) {
diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php
index ab1fee944..6bd50aa47 100644
--- a/Application/Admin/Controller/FinanceController.class.php
+++ b/Application/Admin/Controller/FinanceController.class.php
@@ -748,17 +748,15 @@ class FinanceController extends ThinkController
             return false;
         });
         
-        $gameSets = [];
-        if (count($gameIds) > 0) {
-            $gameSets = M('game_set', 'tab_')->field(['game_id', 'pay_notify_url'])->where(['game_id' => ['in', $gameIds]])->select();
-            $gameSets = index_by_column('game_id', $gameSets);
-        }
-
+        $gameSets = M('game_set', 'tab_')->field(['game_id', 'pay_notify_url'])->select();
+        $gameSets = index_by_column('game_id', $gameSets);
+        
         $searchGameCodes = [];
         if (count($searchGameIds) > 0) {
             $searchGameCodes = M('game', 'tab_')->where(['id' => ['in', $searchGameIds], 'unique_code' => ['neq', '']])->getField('unique_code', true);
             $searchGameCodes = array_unique($searchGameCodes);
         }
+        var_dump($gameSets);die();
 
         $client = new AggregateClient();
         $result = $client->api('game-data', [

From 8e40b43696b314236ea4a7b98858056bb3a4e124 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Mon, 3 Aug 2020 15:49:51 +0800
Subject: [PATCH 22/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/FinanceController.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php
index 6bd50aa47..5c9d9e249 100644
--- a/Application/Admin/Controller/FinanceController.class.php
+++ b/Application/Admin/Controller/FinanceController.class.php
@@ -750,13 +750,12 @@ class FinanceController extends ThinkController
         
         $gameSets = M('game_set', 'tab_')->field(['game_id', 'pay_notify_url'])->select();
         $gameSets = index_by_column('game_id', $gameSets);
-        
+
         $searchGameCodes = [];
         if (count($searchGameIds) > 0) {
             $searchGameCodes = M('game', 'tab_')->where(['id' => ['in', $searchGameIds], 'unique_code' => ['neq', '']])->getField('unique_code', true);
             $searchGameCodes = array_unique($searchGameCodes);
         }
-        var_dump($gameSets);die();
 
         $client = new AggregateClient();
         $result = $client->api('game-data', [

From 95672ffc905ede8b4a1b4490b7c408a1c8b9952e Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Mon, 3 Aug 2020 16:08:02 +0800
Subject: [PATCH 23/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/ExportController.class.php       |  3 +--
 .../Admin/Controller/FinanceController.class.php      |  3 +--
 Application/Common/Common/extend.php                  | 11 +++++++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 069ed57ae..e05aa5125 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -8343,7 +8343,7 @@ class ExportController extends Controller
             $aggTotal = $result['data']['total'];
         }
 
-        $exceptIds = [];
+        $exceptIds = getAggExceptIds($gameSets);
         foreach ($xlsData as $key => $value) {
             $aggAmount = '0.00';
             $deviceType = $value['sdk_version'] == 1 ? 'android' : 'ios';
@@ -8355,7 +8355,6 @@ class ExportController extends Controller
                 $xlsData[$key]['cash_count'] = $value['cash_count'] = 0;
                 $xlsData[$key]['balance_coin_count'] =$value['balance_coin_count'] = 0;
                 $xlsData[$key]['inside_cash_count'] =$value['inside_cash_count'] = 0;
-                $exceptIds[] = $value['game_id'];
             }
             // $xlsData[$key]['game_name'] = substr($value["game_name"],0,strrpos($value["game_name"],'('));
             $xlsData[$key]['all_cash_count'] = $value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count'];
diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php
index 5c9d9e249..3940b4203 100644
--- a/Application/Admin/Controller/FinanceController.class.php
+++ b/Application/Admin/Controller/FinanceController.class.php
@@ -772,7 +772,7 @@ class FinanceController extends ThinkController
         }
 
         $endTime = time();
-        $exceptIds = [];
+        $exceptIds = getAggExceptIds($gameSets);
         foreach ($data as $key => $value) {
             $aggAmount = '0.00';
             $deviceType = $value['sdk_version'] == 1 ? 'android' : 'ios';
@@ -784,7 +784,6 @@ class FinanceController extends ThinkController
                 $data[$key]['cash_count'] = $value['cash_count'] = 0;
                 $data[$key]['balance_coin_count'] = $value['balance_coin_count'] = 0;
                 $data[$key]['inside_cash_count'] = $value['inside_cash_count'] = 0;
-                $exceptIds[] = $value['game_id'];
             }
             $data[$key]['all_cash_count'] = number_format($value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count'],2,'.','');
             $data[$key]['agg_amount'] = $value['unique_code'] ? $aggAmount : '0.00';
diff --git a/Application/Common/Common/extend.php b/Application/Common/Common/extend.php
index 127fdec6f..6a50765dc 100644
--- a/Application/Common/Common/extend.php
+++ b/Application/Common/Common/extend.php
@@ -3037,4 +3037,15 @@ function isAggGame($payUrl)
         return true;
     }
     return false;
+}
+
+function getAggExceptIds($gameSettings)
+{
+    $exceptIds = [];
+    foreach ($gameSettings as $setting) {
+        if (isAggGame($setting['pay_notify_url'])) {
+            $exceptIds[] = $setting['game_id'];
+        }
+    }
+    return $exceptIds;
 }
\ No newline at end of file

From 724fe9e60ff08865bcd524380f65c2e01c39b319 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 3 Aug 2020 16:35:04 +0800
Subject: [PATCH 24/31] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=B8=82=E5=9C=BA=E4=B8=93=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/CompanyStatementSetController.class.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php
index 2081bbc63..480dbd0ea 100644
--- a/Application/Admin/Controller/CompanyStatementSetController.class.php
+++ b/Application/Admin/Controller/CompanyStatementSetController.class.php
@@ -1146,8 +1146,8 @@ class CompanyStatementSetController extends Controller {
 		$pl =  M("promote_company","tab_")
 				->alias('pc')
 				->field("p.account,p.company_relation,IFNULL(s.nickname,'admin') nickname")
-				->join("left join (select company_id,account,company_relation from tab_promote where level = 1 group by company_id ) p on p.company_id = pc.id")//获取会长
-				->join("left join sys_member s on s.uid = pc.uid")
+				->join("left join (select company_id,account,company_relation,admin_id from tab_promote where level = 1 group by company_id ) p on p.company_id = pc.id")//获取会长
+				->join("left join sys_member s on s.uid = p.admin_id")
 				->where("pc.id = {$company_id}")
 				->find();
 		$company = array_merge($company_info,$pl);

From b9567f6fafb521ee3afb9acea9565f03be268750 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 3 Aug 2020 16:39:24 +0800
Subject: [PATCH 25/31] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=88=B3=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompanyStatementPoolController.class.php         |  4 ++--
 .../CompanyStatementSetController.class.php          | 12 ++++++------
 .../Admin/View/CompanyStatementPool/viewPuPool.html  |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php
index f83a57c60..f22f7a468 100644
--- a/Application/Admin/Controller/CompanyStatementPoolController.class.php
+++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php
@@ -239,8 +239,8 @@ class CompanyStatementPoolController extends ThinkController
         foreach($infolist as $k=>&$v){
             $v['statement_info'] = json_decode($v['statement_info'],true);
             $v['company_info'] = json_decode($v['company_info'],true);
-            $v['statement_begin_time'] = date('Y-m-d',$v['statement_begin_time']);
-            $v['statement_end_time'] = date('Y-m-d',$v['statement_end_time']);
+            $v['statement_begin_time'] = date('Y.m.d',$v['statement_begin_time']);
+            $v['statement_end_time'] = date('Y.m.d',$v['statement_end_time']);
             $cline = $line+1;
             if($is_export){
                 $v['sum_money_exp'] = "=";
diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php
index 480dbd0ea..bf7da560a 100644
--- a/Application/Admin/Controller/CompanyStatementSetController.class.php
+++ b/Application/Admin/Controller/CompanyStatementSetController.class.php
@@ -255,8 +255,8 @@ class CompanyStatementSetController extends Controller {
 		$GameDb = M("Game","tab_");
 		$StatementDb = M("CompanyStatement","tab_");
 
-		$statement_begin_time = date("Y-m-d",$begintime);
-		$statement_end_time = date("Y-m-d",$endtime);
+		$statement_begin_time = date("Y.m.d",$begintime);
+		$statement_end_time = date("Y.m.d",$endtime);
 		foreach($cpList as $k=>$v){
 			$add_data=[];
 			
@@ -566,8 +566,8 @@ class CompanyStatementSetController extends Controller {
 		$verify_log=json_encode(["create_user"=>"system","create_time"=>date("Y-m-d H:i:s")]);
 		$StatementDb = M("CompanyStatement","tab_");
 
-		$statement_begin_time = date("Y-m-d",$begintime);
-		$statement_end_time = date("Y-m-d",$endtime);
+		$statement_begin_time = date("Y.m.d",$begintime);
+		$statement_end_time = date("Y.m.d",$endtime);
 		$RewardRecord = M("RewardDetail","tab_");
 		foreach($pcList as $k=>$v){
             if(!isset($pc[$k])){continue;}//不存在的公司不结算
@@ -915,8 +915,8 @@ class CompanyStatementSetController extends Controller {
 		$this->getPromoteCompanySpend($pc,array_unique(array_keys($pc)),$begintime,$endtime);
 
 		$StatementDb = M("CompanyStatement","tab_");
-		$statement_begin_time = date("Y-m-d",$begintime);
-		$statement_end_time = date("Y-m-d",$endtime);
+		$statement_begin_time = date("Y.m.d",$begintime);
+		$statement_end_time = date("Y.m.d",$endtime);
 		// $RewardRecord = M("RewardRecord","tab_");
 		$LackStatement = M("company_lack_statement_info","tab_");
 		$StatementInfo = M("company_statement_info","tab_");
diff --git a/Application/Admin/View/CompanyStatementPool/viewPuPool.html b/Application/Admin/View/CompanyStatementPool/viewPuPool.html
index f3f9dcf08..ad3b017f0 100644
--- a/Application/Admin/View/CompanyStatementPool/viewPuPool.html
+++ b/Application/Admin/View/CompanyStatementPool/viewPuPool.html
@@ -143,7 +143,7 @@
 
                             <td>{$com['statement_info'][0]['game_name']}</td>
                             <td>{$com['statement_info'][0]['game_type_name']}</td>
-                            <td>{$com['statement_info'][0]['statement_begin_time']} ~ {$com['statement_info'][0]['statement_end_time']}</td>
+                            <td>{$com['statement_info'][0]['statement_begin_time']} - {$com['statement_info'][0]['statement_end_time']}</td>
                             <td>{$com['statement_info'][0]['pay_amount']}</td>
                             <if condition="$com['statement_info'][0]['statement_type'] neq 0">
                                 <td></td>
@@ -188,7 +188,7 @@
                                 <tr>
                                     <td>{$it['game_name']}</td>
                                     <td>{$it['game_type_name']}</td>
-                                    <td>{$it['statement_begin_time']} ~ {$it['statement_end_time']}</td>
+                                    <td>{$it['statement_begin_time']} - {$it['statement_end_time']}</td>
                                     <td>{$it['pay_amount']}</td>
 
                                     <if condition="$it['statement_type'] neq 0">

From 0fd5bc7fe8312b4ed9ca7394a15d30cb5a0c0096 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 3 Aug 2020 16:41:41 +0800
Subject: [PATCH 26/31] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/CompanyStatementPoolController.class.php   | 8 ++++----
 .../Admin/View/CompanyStatementPool/viewCpPool.html       | 4 ++--
 .../Admin/View/CompanyStatementPool/viewPcPool.html       | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php
index f22f7a468..fa419b6ac 100644
--- a/Application/Admin/Controller/CompanyStatementPoolController.class.php
+++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php
@@ -292,8 +292,8 @@ class CompanyStatementPoolController extends ThinkController
         unset($pl);
         foreach($infolist as $k=>&$v){
             $v['statement_info'] = json_decode($v['statement_info'],true);
-            $v['statement_begin_time'] = date('Y-m-d',$v['statement_begin_time']);
-            $v['statement_end_time'] = date('Y-m-d',$v['statement_end_time']);
+            $v['statement_begin_time'] = date('Y.m.d',$v['statement_begin_time']);
+            $v['statement_end_time'] = date('Y.m.d',$v['statement_end_time']);
             $cline = $line+1;
             if($is_export){
                 $v['statement_money_exp'] = "=";
@@ -372,8 +372,8 @@ class CompanyStatementPoolController extends ThinkController
         //
         foreach($infolist as $k=>&$v){
             $v['statement_info'] = json_decode($v['statement_info'],true);
-            $v['statement_begin_time'] = date('Y-m-d',$v['statement_begin_time']);
-            $v['statement_end_time'] = date('Y-m-d',$v['statement_end_time']);
+            $v['statement_begin_time'] = date('Y.m.d',$v['statement_begin_time']);
+            $v['statement_end_time'] = date('Y.m.d',$v['statement_end_time']);
             $cline = $line+1;
             if($is_export){
                 $v['statement_money_exp'] = "=";
diff --git a/Application/Admin/View/CompanyStatementPool/viewCpPool.html b/Application/Admin/View/CompanyStatementPool/viewCpPool.html
index 2f0f88287..2fe543ae5 100644
--- a/Application/Admin/View/CompanyStatementPool/viewCpPool.html
+++ b/Application/Admin/View/CompanyStatementPool/viewCpPool.html
@@ -126,7 +126,7 @@
                             <td rowspan="{$com.statement_count}">{$com.company_name}</td>
                             <td rowspan="{$com.statement_count}">{$com.matche_platform}</td>
                             <!-- <td rowspan="{$com.statement_count}">{$com.statement_begin_time} ~ {$com.statement_end_time}</td> -->
-                            <td>{$com['statement_info'][0]['statement_begin_time']} ~ {$com['statement_info'][0]['statement_end_time']}</td>
+                            <td>{$com['statement_info'][0]['statement_begin_time']} - {$com['statement_info'][0]['statement_end_time']}</td>
 
                             <td>{$com['statement_info'][0]['game_name']}</td>
                             <td>{$com['statement_info'][0]['pay_amount']}</td>
@@ -145,7 +145,7 @@
                         <foreach name="com.statement_info" item="it" key="k">
                             <if condition="$k neq 0">
                                 <tr>
-                                    <td>{$it['statement_begin_time']} ~ {$it['statement_end_time']}</td>
+                                    <td>{$it['statement_begin_time']} - {$it['statement_end_time']}</td>
                                     <td>{$it['game_name']}</td>
                                     <td>{$it['pay_amount']}</td>
                                     <td>{$it['pay_amount']}</td>
diff --git a/Application/Admin/View/CompanyStatementPool/viewPcPool.html b/Application/Admin/View/CompanyStatementPool/viewPcPool.html
index b8d1c2e5a..1821046e7 100644
--- a/Application/Admin/View/CompanyStatementPool/viewPcPool.html
+++ b/Application/Admin/View/CompanyStatementPool/viewPcPool.html
@@ -127,7 +127,7 @@
                             <td rowspan="{$com.statement_count}">{$com.reward}</td>
                             <td rowspan="{$com.statement_count}">{$com.statement_money}</td>
                             <td rowspan="{$com.statement_count}">{$com.settlement_contact}</td>
-                            <td>{$com['statement_info'][0]['statement_begin_time']} ~ {$com['statement_info'][0]['statement_end_time']}</td>
+                            <td>{$com['statement_info'][0]['statement_begin_time']} - {$com['statement_info'][0]['statement_end_time']}</td>
                             <td rowspan="{$com.statement_count}">{$com.renark}</td>
                         </tr>
 
@@ -140,7 +140,7 @@
                                     <td>{$it['increment_ratio']}%</td>
                                     <td>{$it['fax_ratio']}%</td>
                                     <td>{$it['d_statement_money']}</td>
-                                    <td>{$it['statement_begin_time']} ~ {$it['statement_end_time']}</td>
+                                    <td>{$it['statement_begin_time']} - {$it['statement_end_time']}</td>
                                 </tr>
                             </if>
                         </foreach>

From 884f91938752af70beada6e02e99770a272b480c Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 3 Aug 2020 17:24:56 +0800
Subject: [PATCH 27/31] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=81=9A=E5=90=88?=
 =?UTF-8?q?=E6=B8=A0=E9=81=93=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/AggregateFinanceStatementController.class.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/AggregateFinanceStatementController.class.php b/Application/Admin/Controller/AggregateFinanceStatementController.class.php
index 51e436624..3a71b06a4 100644
--- a/Application/Admin/Controller/AggregateFinanceStatementController.class.php
+++ b/Application/Admin/Controller/AggregateFinanceStatementController.class.php
@@ -111,8 +111,8 @@ class AggregateFinanceStatementController extends ThinkController
             $data[$key]['oplist'] = $this->OpAuth($value);
         }
         $count =  M("aggregate_statement","tab_")->field("count(id) count,SUM(ratio_money) ratio_money")->where($map)->find();
-        $pay_money_count = M("aggregate_statement","tab_")->field("SUM(pay_money) pay_money")->where($map)->where("withdraw_type <> 2")->find()['pay_money'];
-
+        $map['withdraw_type'] = ["NEQ",2];
+        $pay_money_count = M("aggregate_statement","tab_")->field("SUM(pay_money) pay_money")->where($map)->find()['pay_money'];
         //分页
         $parameter['p'] = $page;
         $parameter['row'] = $row;

From 071c8c78f4a714cb2aca736f5f495d00995c8fc1 Mon Sep 17 00:00:00 2001
From: chenzhi <294767167@11qq.com>
Date: Mon, 3 Aug 2020 21:41:32 +0800
Subject: [PATCH 28/31] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=B8=B8?=
 =?UTF-8?q?=E7=BB=93=E7=AE=97=E4=B8=BA=E6=96=B0=E5=A2=9E=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/CompanyStatementSetController.class.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php
index bf7da560a..a0f1818de 100644
--- a/Application/Admin/Controller/CompanyStatementSetController.class.php
+++ b/Application/Admin/Controller/CompanyStatementSetController.class.php
@@ -757,7 +757,7 @@ class CompanyStatementSetController extends Controller {
 		$Spend = M("Spend","tab_");
 		$spenMap = [
 			"s.pay_status"=>1,
-			"s.pay_time"=>['between', [$begintime,$endtime]],
+			"s.payed_time"=>['between', [$begintime,$endtime]],
 		];
 		for ($i=0; $i <count($idarr); $i++) {
             $company_id = $idarr[$i];

From 651aa6cc8b1b9483715f46accf01fb4cbb37ad41 Mon Sep 17 00:00:00 2001
From: chenzhi <294767167@11qq.com>
Date: Mon, 3 Aug 2020 21:51:13 +0800
Subject: [PATCH 29/31] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=B8=8D=E8=B6=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/CompanyStatementPoolController.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php
index fa419b6ac..b0d01a58f 100644
--- a/Application/Admin/Controller/CompanyStatementPoolController.class.php
+++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php
@@ -214,10 +214,10 @@ class CompanyStatementPoolController extends ThinkController
         
         if($infolist[0]['company_type'] == 3){
             //上游
-            $this->viewCpPool($infolist,$is_export);
+            $this->viewCpPool($infolist,$is_export,$pool_info);
         }elseif($infolist[0]['company_type'] == 1){
             //下游公司
-            $this->viewPcPool($infolist,$is_export);
+            $this->viewPcPool($infolist,$is_export,$pool_info);
         }else{
             //获取母单
             if(!empty($pool_info['create_lack_ids'])){

From c57c40535bb2747b3798278ee7c19b61337993c2 Mon Sep 17 00:00:00 2001
From: chenzhi <294767167@11qq.com>
Date: Mon, 3 Aug 2020 22:34:05 +0800
Subject: [PATCH 30/31] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=B8=B8?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompanyStatementPoolController.class.php         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php
index b0d01a58f..3ab8f3d1b 100644
--- a/Application/Admin/Controller/CompanyStatementPoolController.class.php
+++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php
@@ -211,13 +211,14 @@ class CompanyStatementPoolController extends ThinkController
         $statement_num = $pool_info['statement_num'];
         $this->assign("title",$statement_num);
         $this->assign("pool_status",$pool_info['verify_status']);
-        
+        $this->assign("pool_status",$pool_info['verify_status']);
+        $this->assign("is_payment",$pool_info['is_payment']);
         if($infolist[0]['company_type'] == 3){
             //上游
-            $this->viewCpPool($infolist,$is_export,$pool_info);
+            $this->viewCpPool($infolist,$is_export);
         }elseif($infolist[0]['company_type'] == 1){
             //下游公司
-            $this->viewPcPool($infolist,$is_export,$pool_info);
+            $this->viewPcPool($infolist,$is_export);
         }else{
             //获取母单
             if(!empty($pool_info['create_lack_ids'])){
@@ -226,12 +227,12 @@ class CompanyStatementPoolController extends ThinkController
 
                 $infolist =array_merge($infolist,$lack_info);
             }
-            $this->viewPuPool($infolist,$is_export,$pool_info);
+            $this->viewPuPool($infolist,$is_export);
         }
 
     }
     //个人汇总结算查看
-    public function viewPuPool(&$infolist,$is_export,$pool_info){
+    public function viewPuPool(&$infolist,$is_export){
         // dd($infolist);
         $line = 1;
         $count = [];
@@ -272,7 +273,6 @@ class CompanyStatementPoolController extends ThinkController
             $count["sum_money"] = "=SUM(O2:O".$line.")";
         }
         $this->assign("data",$infolist);
-        $this->assign("is_payment",$pool_info['is_payment']);
         $this->assign("count",$count);
         $this->assign("is_export",$is_export);
         $this->display("CompanyStatementPool/viewPuPool");

From 08c4d82b0027d56f865e8280dcdd8e0f9ad2457e Mon Sep 17 00:00:00 2001
From: yulingwei <2436953959@qq.com>
Date: Tue, 4 Aug 2020 15:45:39 +0800
Subject: [PATCH 31/31] upt

---
 Application/Home/Controller/SafeController.class.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Application/Home/Controller/SafeController.class.php b/Application/Home/Controller/SafeController.class.php
index c4ddb5e71..07ec33d96 100644
--- a/Application/Home/Controller/SafeController.class.php
+++ b/Application/Home/Controller/SafeController.class.php
@@ -415,7 +415,7 @@ class SafeController extends BaseController{
         $bank = $_REQUEST["bank_card"];           //银行账号
         $bank_name = $_REQUEST["bank_name"];             //开户银行
         $bank_account = $_REQUEST['bank_account'];        //银行账户名
-        $agreementpic = $_REQUEST["agreementpic"];
+        $agreementpic = $_REQUEST["agreementpic"] ?? '';
         $alipayaccount = $_REQUEST['alipay_account'];
         $alipayrealname = $_REQUEST['alipay_real_name'];
 
@@ -482,10 +482,10 @@ class SafeController extends BaseController{
             $this->error('卡号格式错误');
             return false;
         } 
-        if(empty($agreementpic)) {
-            $this->error("补充协议不能为空");
-            return false;
-        }
+        // if(empty($agreementpic)) {
+        //     $this->error("补充协议不能为空");
+        //     return false;
+        // }
         if (empty($alipayaccount)) {
             $this->error('支付宝账户不能为空');
             return false;
@@ -519,7 +519,7 @@ class SafeController extends BaseController{
         $data['alipay_real_name'] = $alipayrealname;
 
      //  $data['agreementpic'] = $
-        $data['anothpic'] = $agreementpic;
+        $agreementpic ? $data['anothpic'] = $agreementpic : null;
         $id = get_pid();
         $updateRs = M("promote","tab_")->where(['id'=>$id])->save($data);
             if($updateRs) {