From 33049f5a9f29aff27e5ac4f43bb36fbdbff5ef71 Mon Sep 17 00:00:00 2001
From: yulingwei <2436953959@qq.com>
Date: Mon, 13 Jul 2020 15:38:21 +0800
Subject: [PATCH 01/10] upt

---
 .../PresidentDepositController.class.php      | 139 +++++++++++++++++-
 .../Admin/View/PresidentDeposit/form.html     |  34 +++++
 .../Admin/View/PresidentDeposit/records.html  |  85 ++++++++++-
 .../Admin/View/PresidentDeposit/show.html     |  14 ++
 Data/update.sql                               |   4 +
 5 files changed, 265 insertions(+), 11 deletions(-)

diff --git a/Application/Admin/Controller/PresidentDepositController.class.php b/Application/Admin/Controller/PresidentDepositController.class.php
index ebb57a254..67f86d97f 100644
--- a/Application/Admin/Controller/PresidentDepositController.class.php
+++ b/Application/Admin/Controller/PresidentDepositController.class.php
@@ -38,6 +38,95 @@ class PresidentDepositController extends ThinkController
                 $idStrWhere[] = '1<>1';
             }
         }
+
+        if (!empty(I('pay_confirm_time_start')) && empty(I('pay_confirm_time_end'))) {
+            $startTime = strtotime(I('pay_confirm_time_start'));
+            $endTime = strtotime(I('pay_confirm_time_end'));
+            $tempPromoteIds = M('president_deposit', 'tab_')->where("pay_confirm_time >= {$startTime}")->getField('promote_id', true);
+            if (count($tempPromoteIds) > 0) {
+                $idStrWhere[] = 'id in (' . implode(',', $tempPromoteIds) . ')';
+            } else {
+                $idStrWhere[] = '1<>1';
+            }
+        } else if (empty(I('pay_confirm_time_start')) && !empty(I('pay_confirm_time_end'))) {
+            $startTime = strtotime(I('pay_confirm_time_start'));
+            $endTime = strtotime(I('pay_confirm_time_end'));
+            $tempPromoteIds = M('president_deposit', 'tab_')->where("pay_confirm_time <= {$endTime}")->getField('promote_id', true);
+            if (count($tempPromoteIds) > 0) {
+                $idStrWhere[] = 'id in (' . implode(',', $tempPromoteIds) . ')';
+            } else {
+                $idStrWhere[] = '1<>1';
+            }
+        } else if (!empty(I('pay_confirm_time_start')) && !empty(I('pay_confirm_time_end'))) {
+            $startTime = strtotime(I('pay_confirm_time_start'));
+            $endTime = strtotime(I('pay_confirm_time_end'));
+            $tempPromoteIds = M('president_deposit', 'tab_')->where("pay_confirm_time >= {$startTime} and pay_confirm_time <= {$endTime}")->getField('promote_id', true);
+            if (count($tempPromoteIds) > 0) {
+                $idStrWhere[] = 'id in (' . implode(',', $tempPromoteIds) . ')';
+            } else {
+                $idStrWhere[] = '1<>1';
+            }
+        }
+
+        if (!empty(I('refund_time_start')) && empty(I('refund_time_end'))) {
+            $startTime = strtotime(I('refund_time_start'));
+            $endTime = strtotime(I('refund_time_end'));
+            $tempPromoteIds = M('president_deposit', 'tab_')->where("refund_time >= {$startTime}")->getField('promote_id', true);
+            if (count($tempPromoteIds) > 0) {
+                $idStrWhere[] = 'id in (' . implode(',', $tempPromoteIds) . ')';
+            } else {
+                $idStrWhere[] = '1<>1';
+            }
+        } else if (empty(I('refund_time_start')) && !empty(I('refund_time_end'))) {
+            $startTime = strtotime(I('refund_time_start'));
+            $endTime = strtotime(I('refund_time_end'));
+            $tempPromoteIds = M('president_deposit', 'tab_')->where("refund_time <= {$endTime}")->getField('promote_id', true);
+            if (count($tempPromoteIds) > 0) {
+                $idStrWhere[] = 'id in (' . implode(',', $tempPromoteIds) . ')';
+            } else {
+                $idStrWhere[] = '1<>1';
+            }
+        } else if (!empty(I('refund_time_start')) && !empty(I('refund_time_end'))) {
+            $startTime = strtotime(I('refund_time_start'));
+            $endTime = strtotime(I('refund_time_end'));
+            $tempPromoteIds = M('president_deposit', 'tab_')->where("refund_time >= {$startTime} and refund_time <= {$endTime}")->getField('promote_id', true);
+            if (count($tempPromoteIds) > 0) {
+                $idStrWhere[] = 'id in (' . implode(',', $tempPromoteIds) . ')';
+            } else {
+                $idStrWhere[] = '1<>1';
+            }
+        }
+
+        if (!empty(I('pay_accept_time_start')) && empty(I('pay_accept_time_end'))) {
+            $startTime = strtotime(I('pay_accept_time_start'));
+            $endTime = strtotime(I('pay_accept_time_end'));
+            $tempPromoteIds = M('president_deposit', 'tab_')->where("pay_confirm_time >= {$startTime}")->getField('promote_id', true);
+            if (count($tempPromoteIds) > 0) {
+                $idStrWhere[] = 'id in (' . implode(',', $tempPromoteIds) . ')';
+            } else {
+                $idStrWhere[] = '1<>1';
+            }
+        } else if (empty(I('pay_accept_time_start')) && !empty(I('pay_accept_time_end'))) {
+            $startTime = strtotime(I('pay_accept_time_start'));
+            $endTime = strtotime(I('pay_accept_time_end'));
+            $tempPromoteIds = M('president_deposit', 'tab_')->where("pay_confirm_time <= {$endTime}")->getField('promote_id', true);
+            if (count($tempPromoteIds) > 0) {
+                $idStrWhere[] = 'id in (' . implode(',', $tempPromoteIds) . ')';
+            } else {
+                $idStrWhere[] = '1<>1';
+            }
+        } else if (!empty(I('pay_accept_time_start')) && !empty(I('pay_accept_time_end'))) {
+            $startTime = strtotime(I('pay_accept_time_start'));
+            $endTime = strtotime(I('pay_accept_time_end'));
+            $tempPromoteIds = M('president_deposit', 'tab_')->where("pay_accept_time >= {$startTime} and pay_accept_time <= {$endTime}")->getField('promote_id', true);
+            if (count($tempPromoteIds) > 0) {
+                $idStrWhere[] = 'id in (' . implode(',', $tempPromoteIds) . ')';
+            } else {
+                $idStrWhere[] = '1<>1';
+            }
+        }
+
+
         if ($payType !== '') {
             $tempPromoteIds = M('president_deposit', 'tab_')->where(['pay_type' => $payType])->getField('promote_id', true);
             if (count($tempPromoteIds) > 0) {
@@ -47,7 +136,7 @@ class PresidentDepositController extends ThinkController
             }
         }
         if (count($idStrWhere) > 0) {
-            $query->where(['_string' => implode(' and ', $idStrWhere)]);
+            $query->where(['_string' => implode(' and ', array_unique($idStrWhere))]);
         }
 
         $promotes = [];
@@ -90,10 +179,10 @@ class PresidentDepositController extends ThinkController
                 if ($promote['presidentDeposit']) {
                     $presidentDeposit = $promote['presidentDeposit'];
                     $promoteBelong = $promote['promoteBelong'];
-                    if ($presidentDeposit['pay_type'] == 3) {
+                    if ($presidentDeposit['pay_type'] == PresidentDepositService::PAY_TYPE_NONE) {
                         $record['payer'] = '--';
                         $record['pay_account'] = '--';
-                        $record['amount'] = '--';
+                        $record['amount'] = '无';
                     } else {
                         $record['payer'] = $presidentDeposit['payer'];
                         $record['pay_account'] = $presidentDeposit['pay_account'];
@@ -104,6 +193,8 @@ class PresidentDepositController extends ThinkController
                     $record['create_time'] = $presidentDeposit['create_time'] == 0 ? '--' : date('Y-m-d H:i:s', $presidentDeposit['create_time']);
                     $record['verify_time'] = $promoteBelong && $promoteBelong['verify_time'] != 0 ? date('Y-m-d H:i:s', $promoteBelong['verify_time']) : '--';
                     $record['pay_confirm_time'] = $presidentDeposit['pay_confirm_time'] == 0 ? '--' : date('Y-m-d H:i:s', $presidentDeposit['pay_confirm_time']);
+                    $record['refund_time'] = $presidentDeposit['refund_time'] == 0 ? '--' : date('Y-m-d H:i:s', $presidentDeposit['refund_time']);
+                    $record['pay_accept_time'] = $presidentDeposit['pay_accept_time'] == 0 ? '--' : date('Y-m-d H:i:s', $presidentDeposit['pay_accept_time']);
                     $record['status_text'] = $statusList[$presidentDeposit['status']];
                     $record['has_record'] = true;
                     $record['status'] = $presidentDeposit['status'];
@@ -117,6 +208,8 @@ class PresidentDepositController extends ThinkController
                     $record['create_time'] = '--';
                     $record['verify_time'] = '--';
                     $record['pay_confirm_time'] = '--';
+                    $record['refund_time'] = '--';
+                    $record['pay_accept_time'] = '--';
                     $record['status_text'] = '--';
                     $record['has_record'] = false;
                     $record['status'] = 0;
@@ -129,15 +222,17 @@ class PresidentDepositController extends ThinkController
                     'company_name' => '所属推广公司',
                     'account' => '会长账号',
                     'company_belong_text' => '工会类型',
-                    'payer' => '付款人',
+                    'payer' => '退押金账户名',
                     'pay_way_text' => '付款方式',
-                    'pay_account' => '账号',
+                    'pay_account' => '退押金账号',
                     'pay_type_text' => '押金类型',
                     'create_time' => '审批时间',
                     'amount' => '押金金额',
                     'verify_time' => '会长申请时间',
                     'status_text' => '押金状态',
                     'pay_confirm_time' => '押金确认时间',
+                    'refund_time' => '押金退款时间',
+                    'pay_accept_time' => '押金收到时间',
                 ];
 
                 addOperationLog(['op_type'=>3,'key'=>getNowDate(),'op_name'=>'导出会长押金记录','url'=>U('PresidentDeposit/records'),'menu'=>'推广员-结算管理-奖罚记录管理-导出会长押金记录']);
@@ -149,10 +244,14 @@ class PresidentDepositController extends ThinkController
 
         $this->checkListOrCountAuthRestMap($map,[]);
 
+        // 汇总金额
+        $total = M('president_deposit', 'tab_')->field('sum(amount) as totalAmount, sum(if(status = 1, amount, 0)) as confirmedAmount')->find();
+        $total['unconfirmedamount'] = $total['totalamount'] - $total['confirmedamount'];
         $page = set_pagination($count, $row);
         if($page) {
             $this->assign('_page', $page);
         }
+        $this->assign('total', $total);
         $this->assign('payWays', $payWays);
         $this->assign('payTypes', $payTypes);
         $this->assign('companyTypes', $companyTypes);
@@ -215,6 +314,9 @@ class PresidentDepositController extends ThinkController
         $payAccount = I('pay_account', '');
         $amount = I('amount', '');
         $payer = I('payer', '');
+        $payAcceptTime = I('pay_accept_time', 0) ? strtotime(I('pay_accept_time')): 0;
+        $refundTime = I('refund_time', 0) ? strtotime(I('refund_time')): 0;
+
 
         $record = M('president_deposit', 'tab_')->where(['promote_id' => $promoteId])->find();
 
@@ -253,6 +355,8 @@ class PresidentDepositController extends ThinkController
             $data['payer'] = $payer;
             $data['create_time'] = time();
             $data['update_time'] = time();
+            $data['pay_accept_time'] = $payAcceptTime;
+            $data['refund_time'] = $refundTime;
             M('president_deposit', 'tab_')->add($data);
 
             addOperationLog(['op_type'=>0,'key'=>$promoteData['account'].'/'.$amount,'op_name'=>'新增会长押金','url'=>U('PresidentDeposit/edit',['id'=>$promoteId]),'menu'=>'推广员-结算单管理-奖罚记录管理-新增会长押金']);
@@ -283,10 +387,24 @@ class PresidentDepositController extends ThinkController
         } */
 
         $data = [];
+
+        // 切换类型
+        if ($payType != $record['pay_type']) {
+            $payStatus = 0;
+            $data['pay_confirm_time'] = 0;
+        }
+
+        if ($payType == PresidentDepositService::PAY_TYPE_NONE) { // 无需押金 直接确认
+            $payStatus = 1;
+            $data['pay_confirm_time'] = time();
+        }
+        $data['pay_accept_time'] = $payAcceptTime;
+        $data['refund_time'] = $refundTime;
         $data['pay_way'] = $payType == 2 ? 4 : $payWay;
         $data['pay_type'] = $payType;
         $data['pay_account'] = $payAccount;
         $data['amount'] = floatval($amount);
+        $data['status'] = $payStatus ?? $record['status'];
         $data['payer'] = $payer;
         $data['update_time'] = time();
         M('president_deposit', 'tab_')->where(['promote_id' => $promoteId])->save($data);
@@ -321,7 +439,7 @@ class PresidentDepositController extends ThinkController
         $data['payer'] = '';
         $data['create_time'] = time();
         $data['update_time'] = time();
-
+        $data['status'] = 1;
         if (!$record) {
             $data['promote_id'] = $promoteId;
             M('president_deposit', 'tab_')->add($data);
@@ -404,12 +522,19 @@ class PresidentDepositController extends ThinkController
             ]);
         }
         $checkStatus = true;
-        $records = M('president_deposit', 'tab_')->field(['id', 'status'])->where(['promote_id' => ['in', $promoteIds]])->select();
+        $records = M('president_deposit', 'tab_')->where(['promote_id' => ['in', $promoteIds]])->select();
         foreach ($records as $record) {
             if ($record['status'] != 0) {
                 $checkStatus = false;
                 break;
             }
+            // 如果不是无需押金，并且没有填写收到押金时间
+            if ($record['pay_type'] != PresidentDepositService::PAY_TYPE_NONE && empty($record['pay_accept_time'])) {
+                $this->ajaxReturn([
+                    'status' => 0,
+                    'message' => '含有待确认收到押金时间记录，不可批量操作'
+                ]);
+            }
         }
         if (!$checkStatus) {
             $this->ajaxReturn([
diff --git a/Application/Admin/View/PresidentDeposit/form.html b/Application/Admin/View/PresidentDeposit/form.html
index 2acb46ed7..3a2722b65 100644
--- a/Application/Admin/View/PresidentDeposit/form.html
+++ b/Application/Admin/View/PresidentDeposit/form.html
@@ -7,6 +7,7 @@
   <script type="text/javascript" src="__STATIC__/uploadify/jquery.uploadify.min.js"></script>
   <script type="text/javascript" src="__STATIC__/provincecityarea/AreaData_min.js"></script>
   <script src="__STATIC__/layer/layer.js"></script>
+  <script src="__STATIC__/laydate/laydate.js"></script>
   <script type="text/javascript" src="__JS__/select2.min.js"></script>
 
   <style>
@@ -132,6 +133,18 @@
                 <span class="notice-text"></span>
               </td>
             </tr>
+            <tr>
+              <td class="l">押金收到时间：</td>
+              <td class="r">
+                <input type="text" class="txt time-stamp" name="pay_accept_time" id="pay_accept_time" value="<?= $record['pay_accept_time']?date('Y-m-d H:i:s', $record['pay_accept_time']):''?>" readonly>
+              </td>
+            </tr>
+            <tr>
+              <td class="l">押金退款时间：</td>
+              <td class="r">
+                <input type="text" class="txt time-stamp" name="refund_time" id="refund_time" value="<?=$record['refund_time']?date('Y-m-d H:i:s', $record['refund_time']):''?>" readonly>
+              </td>
+            </tr>
             </tbody>
           </table>
         </div>
@@ -182,6 +195,27 @@ $(function(){
         minView:'year',
         maxView:'year',
     });
+    
+    $('.time-stamp').each(function(){
+      laydate.render({
+      elem: this,
+      type: 'datetime'
+    });
+    })
+    
+    // $('.time-stamp').datetimepicker({
+    //         format: 'yyyy-mm-dd hh:ii:ss',
+    //         dateFormat: 'yyyy-mm-dd',//日期显示格式
+    //         timeFormat: 'HH:mm:ss',//时间显示格式
+    //         autoclose : true,
+    //         todayBtn : true,
+    //         todayHighlight : true,
+    //         language : 'zh-CN',
+    //         startView : 2,//月视图
+    //         showMeridian : true,
+    //         pickerPosition : "bottom-left",
+    //         minuteStep : 1
+    //     });
     showTab();
 
     $('#pay_type').change(function() {
diff --git a/Application/Admin/View/PresidentDeposit/records.html b/Application/Admin/View/PresidentDeposit/records.html
index 6a8858fda..378cfde03 100644
--- a/Application/Admin/View/PresidentDeposit/records.html
+++ b/Application/Admin/View/PresidentDeposit/records.html
@@ -2,6 +2,7 @@
 <block name="css">
     <link rel="stylesheet" href="__CSS__/select2.min.css" type="text/css" />
     <link rel="stylesheet" href="__CSS__/promote.css" type="text/css"/>
+    <script src="__STATIC__/laydate/laydate.js"></script>
     <link rel="stylesheet" type="text/css" href="__STATIC__/webuploader/webuploader.css" media="all">
     <style>
         .select2-container--default .select2-selection--single {
@@ -96,6 +97,36 @@
                     <?php endforeach;?>
                 </select>
             </div>
+            <div class="input-list input-list-promote search_label_rehab">
+                <input type="text" readonly name="pay_confirm_time_start" class="time-select" value="{:I('pay_confirm_time_start')}"
+                       placeholder="押金确认开始时间"/>
+                -
+                <div class="input-append date" id="datetimepicker" style="display:inline-block">
+                    <input type="text" readonly name="pay_confirm_time_end" class="time-select" value="{:I('pay_confirm_time_end')}"
+                           placeholder="押金确认结束时间"/>
+                    <span class="add-on"><i class="icon-th"></i></span>
+                </div>
+            </div>
+            <div class="input-list input-list-promote search_label_rehab">
+                <input type="text" readonly name="refund_time_start" class="time-select" value="{:I('refund_time_start')}"
+                       placeholder="押金退款开始时间"/>
+                -
+                <div class="input-append date" id="datetimepicker" style="display:inline-block">
+                    <input type="text" readonly name="refund_time_end" class="time-select" value="{:I('refund_time_end')}"
+                           placeholder="押金退款结束时间"/>
+                    <span class="add-on"><i class="icon-th"></i></span>
+                </div>
+            </div>
+            <div class="input-list input-list-promote search_label_rehab">
+                <input type="text" readonly name="pay_accept_time_start" class="time-select" value="{:I('pay_accept_time_start')}"
+                       placeholder="押金收到开始时间"/>
+                -
+                <div class="input-append date" id="datetimepicker" style="display:inline-block">
+                    <input type="text" readonly name="pay_accept_time_end" class="time-select" value="{:I('pay_accept_time_end')}"
+                           placeholder="押金收到结束时间"/>
+                    <span class="add-on"><i class="icon-th"></i></span>
+                </div>
+            </div>
             <div class="input-list">
                 <a class="sch-btn" href="javascript:;" id="search" url="{:U('PresidentDeposit/records')}">搜索</a>
             </div>
@@ -118,15 +149,17 @@
                     <th>所属推广公司</th>
                     <th>会长账号</th>
                     <th>工会类型</th>
-                    <th>付款人</th>
+                    <th>退押金账户名</th>
                     <th>付款方式</th>
-                    <th>账号</th>
+                    <th>退押金账号</th>
                     <th>押金类型</th>
                     <th>审批时间</th>
                     <th>押金金额</th>
                     <th>会长申请时间</th>
                     <th>押金状态</th>
                     <th>押金确认时间</th>
+                    <th>押金退款时间</th>
+                    <th>押金收到时间</th>
                     <th>操作</th>
                 </tr>
                 </thead>
@@ -134,7 +167,7 @@
                 <!-- 列表 -->
                 <tbody>
                 <empty name ="records">
-                    <td colspan="14" class="text-center">aOh! 暂时还没有内容!</td>
+                    <td colspan="99" class="text-center">aOh! 暂时还没有内容!</td>
                     <else />
                     <volist name="records" id="data">
                         <tr data-id="<?=$data['id']?>">
@@ -157,7 +190,8 @@
                             <td>{$data.verify_time}</td>
                             <td>{$data.status_text}</td>
                             <td>{$data.pay_confirm_time}</td>
-
+                            <td>{$data.refund_time}</td>
+                            <td>{$data.pay_accept_time}</td>
                             <?php if($data['has_record']):?>
                             <td>
                                 <div class="partakebtn">
@@ -179,6 +213,13 @@
                         </tr>
                     </volist>
                 </empty>
+                <tr>
+                    <td colspan="99" class="text-center">
+                        <span>总押金:{$total['totalamount']}</span>&nbsp;&nbsp;&nbsp;&nbsp;
+                        <span>待确认押金:{$total['unconfirmedamount']}</span>&nbsp;&nbsp;&nbsp;&nbsp;
+                        <span>已确认押金:{$total['confirmedamount']}</span>
+                    </td>
+                </tr>
                 </tbody>
             </table>
         </div>
@@ -215,8 +256,44 @@
         //导航高亮
         highlight_subnav('{:U('PresidentDeposit/records')}');
         $(function(){
+            $('.time-select').each(function(){
+                laydate.render({
+                elem: this,
+                type: 'date'
+                });
+            });
             //搜索功能
             $("#search").click(function(){
+                var sdate = Date.parse($("input[name='pay_confirm_time_start']").val()) / 1000;
+                var edate = Date.parse($("input[name='pay_confirm_time_end']").val()) / 1000;
+                if (sdate > edate) {
+                    layer.msg('开始时间必须小于等于结束时间');
+                    return false;
+                }
+                if ((edate - sdate) > 2592000) {
+                    layer.msg('时间间隔不能超过31天，请重新选择日期');
+                    return false;
+                }
+                var sdate = Date.parse($("input[name='refund_time_start']").val()) / 1000;
+                var edate = Date.parse($("input[name='refund_time_end']").val()) / 1000;
+                if (sdate > edate) {
+                    layer.msg('开始时间必须小于等于结束时间');
+                    return false;
+                }
+                if ((edate - sdate) > 2592000) {
+                    layer.msg('时间间隔不能超过31天，请重新选择日期');
+                    return false;
+                }
+                var sdate = Date.parse($("input[name='pay_accept_time_start']").val()) / 1000;
+                var edate = Date.parse($("input[name='pay_accept_time_end']").val()) / 1000;
+                if (sdate > edate) {
+                    layer.msg('开始时间必须小于等于结束时间');
+                    return false;
+                }
+                if ((edate - sdate) > 2592000) {
+                    layer.msg('时间间隔不能超过31天，请重新选择日期');
+                    return false;
+                }
                 var url = $(this).attr('url');
                 var query  = $('.jssearch').find('input').serialize();
                 query  += "&"+$('.jssearch').find('select').serialize();
diff --git a/Application/Admin/View/PresidentDeposit/show.html b/Application/Admin/View/PresidentDeposit/show.html
index 5fb026988..64fa293b8 100644
--- a/Application/Admin/View/PresidentDeposit/show.html
+++ b/Application/Admin/View/PresidentDeposit/show.html
@@ -108,6 +108,20 @@
                 <span class="notice-text"></span>
               </td>
             </tr>
+            <tr>
+              <td class="l">押金退款时间：</td>
+              <td class="r table_radio">
+                <span class="form_radio table_btn"><?=$record['refund_time']?date('Y-m-d H:i:s', $record['refund_time']) : ''?></span>
+                <span class="notice-text"></span>
+              </td>
+            </tr>
+            <tr>
+              <td class="l">押金收到时间：</td>
+              <td class="r table_radio">
+                <span class="form_radio table_btn"><?=$record['pay_accept_time']?date('Y-m-d H:i:s', $record['pay_accept_time']) : ''?></span>
+                <span class="notice-text"></span>
+              </td>
+            </tr>
             <tr>
               <td class="l">付款人：</td>
               <td class="r table_radio">
diff --git a/Data/update.sql b/Data/update.sql
index aa6d436fe..aea52ee7b 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -2165,4 +2165,8 @@ CREATE TABLE `tab_payment_member` (
 
 INSERT INTO `tab_payment_member` (`id`, `real_name`, `mobile`, `last_login_time`) VALUES ('1', '胡歌', '18959188422', '0')
 
+--- 押金收到时间
+ALTER TABLE `tab_president_deposit`
+ADD COLUMN `pay_accept_time`  int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '押金收到时间' AFTER `pay_confirm_time`;
+
 

From adc3acd992aae7c59fd013697409c19a7671b86b Mon Sep 17 00:00:00 2001
From: yulingwei <2436953959@qq.com>
Date: Mon, 13 Jul 2020 17:39:55 +0800
Subject: [PATCH 02/10] upt

---
 Application/Admin/View/PresidentDeposit/records.html          | 4 ++--
 .../Admin/View/StatementMangement/rewardManageSave.html       | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/View/PresidentDeposit/records.html b/Application/Admin/View/PresidentDeposit/records.html
index 378cfde03..a6263ab59 100644
--- a/Application/Admin/View/PresidentDeposit/records.html
+++ b/Application/Admin/View/PresidentDeposit/records.html
@@ -297,8 +297,8 @@
                 var url = $(this).attr('url');
                 var query  = $('.jssearch').find('input').serialize();
                 query  += "&"+$('.jssearch').find('select').serialize();
-                query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g,'');
-                query = query.replace(/^&/g,'');
+                //query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g,'');
+                //query = query.replace(/^&/g,'');
                 if( url.indexOf('?')>0 ){
                     url += '&' + query;
                 }else{
diff --git a/Application/Admin/View/StatementMangement/rewardManageSave.html b/Application/Admin/View/StatementMangement/rewardManageSave.html
index f36b33eff..64b6938c4 100644
--- a/Application/Admin/View/StatementMangement/rewardManageSave.html
+++ b/Application/Admin/View/StatementMangement/rewardManageSave.html
@@ -172,7 +172,9 @@
 </block>
 <block name="script">
     <script type="text/javascript">
+    
         highlight_subnav('{:U('StatementMangement/rewardManageList')}');
+
         $(".bnt_add").bind("click",function(){
             var a=  '<li class="user-account"><label>涉及账号</label><select name="user_type[]" class="select_gallery user_type" onchange="userAccountChange(this)"><option value="1">推广员</option><option value="2">玩家</option></select><input type="text" class="txt table_text_input" name="account[]" value="" placeholder="账号"><button type="button" class="bnt_remove">✖</button>';
             $(".user-account:last").after(a);

From 555fd052fef255e1723f11e273db3699c569ed6e Mon Sep 17 00:00:00 2001
From: yulingwei <2436953959@qq.com>
Date: Tue, 14 Jul 2020 16:12:59 +0800
Subject: [PATCH 03/10] upt

---
 .../Admin/Controller/PresidentDepositController.class.php | 8 +++-----
 Application/Admin/View/PresidentDeposit/records.html      | 3 ++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Application/Admin/Controller/PresidentDepositController.class.php b/Application/Admin/Controller/PresidentDepositController.class.php
index 67f86d97f..54ad99d6e 100644
--- a/Application/Admin/Controller/PresidentDepositController.class.php
+++ b/Application/Admin/Controller/PresidentDepositController.class.php
@@ -146,6 +146,8 @@ class PresidentDepositController extends ThinkController
         } else {
             $countQuery = clone $query;
             $promotes = $query->page($page, $row)->select();
+            // 汇总金额
+            $total = M('president_deposit', 'tab_')->where(['promote_id'=>['in', $countQuery->getField('id', true)]])->field('sum(amount) as totalAmount, sum(if(status = 1, amount, 0)) as confirmedAmount, sum(if(status = 2, amount, 0)) as refundedAmount')->find();
             $count = $countQuery->count();
         }
 
@@ -241,12 +243,8 @@ class PresidentDepositController extends ThinkController
                 exit;
             }
         }
-
         $this->checkListOrCountAuthRestMap($map,[]);
-
-        // 汇总金额
-        $total = M('president_deposit', 'tab_')->field('sum(amount) as totalAmount, sum(if(status = 1, amount, 0)) as confirmedAmount')->find();
-        $total['unconfirmedamount'] = $total['totalamount'] - $total['confirmedamount'];
+        $total['unconfirmedamount'] = $total['totalamount'] - $total['confirmedamount'] - $total['refundedamount'];
         $page = set_pagination($count, $row);
         if($page) {
             $this->assign('_page', $page);
diff --git a/Application/Admin/View/PresidentDeposit/records.html b/Application/Admin/View/PresidentDeposit/records.html
index 378cfde03..a501d106a 100644
--- a/Application/Admin/View/PresidentDeposit/records.html
+++ b/Application/Admin/View/PresidentDeposit/records.html
@@ -217,7 +217,8 @@
                     <td colspan="99" class="text-center">
                         <span>总押金:{$total['totalamount']}</span>&nbsp;&nbsp;&nbsp;&nbsp;
                         <span>待确认押金:{$total['unconfirmedamount']}</span>&nbsp;&nbsp;&nbsp;&nbsp;
-                        <span>已确认押金:{$total['confirmedamount']}</span>
+                        <span>已确认押金:{$total['confirmedamount']}</span>&nbsp;&nbsp;&nbsp;&nbsp;
+                        <span>已退款押金:{$total['refundedamount']}</span>&nbsp;&nbsp;&nbsp;&nbsp;
                     </td>
                 </tr>
                 </tbody>

From 20ac65f12a2cdc7bbe2ad00a52b89b3e695d5583 Mon Sep 17 00:00:00 2001
From: yulingwei <2436953959@qq.com>
Date: Tue, 14 Jul 2020 17:14:54 +0800
Subject: [PATCH 04/10] upt

---
 .../PresidentDepositController.class.php      | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/Application/Admin/Controller/PresidentDepositController.class.php b/Application/Admin/Controller/PresidentDepositController.class.php
index 54ad99d6e..bc72db3c6 100644
--- a/Application/Admin/Controller/PresidentDepositController.class.php
+++ b/Application/Admin/Controller/PresidentDepositController.class.php
@@ -41,7 +41,7 @@ class PresidentDepositController extends ThinkController
 
         if (!empty(I('pay_confirm_time_start')) && empty(I('pay_confirm_time_end'))) {
             $startTime = strtotime(I('pay_confirm_time_start'));
-            $endTime = strtotime(I('pay_confirm_time_end'));
+            $endTime = strtotime(I('pay_confirm_time_end')) + 86400;
             $tempPromoteIds = M('president_deposit', 'tab_')->where("pay_confirm_time >= {$startTime}")->getField('promote_id', true);
             if (count($tempPromoteIds) > 0) {
                 $idStrWhere[] = 'id in (' . implode(',', $tempPromoteIds) . ')';
@@ -50,7 +50,7 @@ class PresidentDepositController extends ThinkController
             }
         } else if (empty(I('pay_confirm_time_start')) && !empty(I('pay_confirm_time_end'))) {
             $startTime = strtotime(I('pay_confirm_time_start'));
-            $endTime = strtotime(I('pay_confirm_time_end'));
+            $endTime = strtotime(I('pay_confirm_time_end')) + 86400;
             $tempPromoteIds = M('president_deposit', 'tab_')->where("pay_confirm_time <= {$endTime}")->getField('promote_id', true);
             if (count($tempPromoteIds) > 0) {
                 $idStrWhere[] = 'id in (' . implode(',', $tempPromoteIds) . ')';
@@ -59,7 +59,7 @@ class PresidentDepositController extends ThinkController
             }
         } else if (!empty(I('pay_confirm_time_start')) && !empty(I('pay_confirm_time_end'))) {
             $startTime = strtotime(I('pay_confirm_time_start'));
-            $endTime = strtotime(I('pay_confirm_time_end'));
+            $endTime = strtotime(I('pay_confirm_time_end')) + 86400;
             $tempPromoteIds = M('president_deposit', 'tab_')->where("pay_confirm_time >= {$startTime} and pay_confirm_time <= {$endTime}")->getField('promote_id', true);
             if (count($tempPromoteIds) > 0) {
                 $idStrWhere[] = 'id in (' . implode(',', $tempPromoteIds) . ')';
@@ -70,7 +70,7 @@ class PresidentDepositController extends ThinkController
 
         if (!empty(I('refund_time_start')) && empty(I('refund_time_end'))) {
             $startTime = strtotime(I('refund_time_start'));
-            $endTime = strtotime(I('refund_time_end'));
+            $endTime = strtotime(I('refund_time_end')) + 86400;
             $tempPromoteIds = M('president_deposit', 'tab_')->where("refund_time >= {$startTime}")->getField('promote_id', true);
             if (count($tempPromoteIds) > 0) {
                 $idStrWhere[] = 'id in (' . implode(',', $tempPromoteIds) . ')';
@@ -79,7 +79,7 @@ class PresidentDepositController extends ThinkController
             }
         } else if (empty(I('refund_time_start')) && !empty(I('refund_time_end'))) {
             $startTime = strtotime(I('refund_time_start'));
-            $endTime = strtotime(I('refund_time_end'));
+            $endTime = strtotime(I('refund_time_end'))+ 86400;
             $tempPromoteIds = M('president_deposit', 'tab_')->where("refund_time <= {$endTime}")->getField('promote_id', true);
             if (count($tempPromoteIds) > 0) {
                 $idStrWhere[] = 'id in (' . implode(',', $tempPromoteIds) . ')';
@@ -88,7 +88,7 @@ class PresidentDepositController extends ThinkController
             }
         } else if (!empty(I('refund_time_start')) && !empty(I('refund_time_end'))) {
             $startTime = strtotime(I('refund_time_start'));
-            $endTime = strtotime(I('refund_time_end'));
+            $endTime = strtotime(I('refund_time_end'))+ 86400;
             $tempPromoteIds = M('president_deposit', 'tab_')->where("refund_time >= {$startTime} and refund_time <= {$endTime}")->getField('promote_id', true);
             if (count($tempPromoteIds) > 0) {
                 $idStrWhere[] = 'id in (' . implode(',', $tempPromoteIds) . ')';
@@ -99,7 +99,7 @@ class PresidentDepositController extends ThinkController
 
         if (!empty(I('pay_accept_time_start')) && empty(I('pay_accept_time_end'))) {
             $startTime = strtotime(I('pay_accept_time_start'));
-            $endTime = strtotime(I('pay_accept_time_end'));
+            $endTime = strtotime(I('pay_accept_time_end'))+ 86400;
             $tempPromoteIds = M('president_deposit', 'tab_')->where("pay_confirm_time >= {$startTime}")->getField('promote_id', true);
             if (count($tempPromoteIds) > 0) {
                 $idStrWhere[] = 'id in (' . implode(',', $tempPromoteIds) . ')';
@@ -108,7 +108,7 @@ class PresidentDepositController extends ThinkController
             }
         } else if (empty(I('pay_accept_time_start')) && !empty(I('pay_accept_time_end'))) {
             $startTime = strtotime(I('pay_accept_time_start'));
-            $endTime = strtotime(I('pay_accept_time_end'));
+            $endTime = strtotime(I('pay_accept_time_end'))+ 86400;
             $tempPromoteIds = M('president_deposit', 'tab_')->where("pay_confirm_time <= {$endTime}")->getField('promote_id', true);
             if (count($tempPromoteIds) > 0) {
                 $idStrWhere[] = 'id in (' . implode(',', $tempPromoteIds) . ')';
@@ -117,7 +117,7 @@ class PresidentDepositController extends ThinkController
             }
         } else if (!empty(I('pay_accept_time_start')) && !empty(I('pay_accept_time_end'))) {
             $startTime = strtotime(I('pay_accept_time_start'));
-            $endTime = strtotime(I('pay_accept_time_end'));
+            $endTime = strtotime(I('pay_accept_time_end'))+ 86400;
             $tempPromoteIds = M('president_deposit', 'tab_')->where("pay_accept_time >= {$startTime} and pay_accept_time <= {$endTime}")->getField('promote_id', true);
             if (count($tempPromoteIds) > 0) {
                 $idStrWhere[] = 'id in (' . implode(',', $tempPromoteIds) . ')';
@@ -144,10 +144,11 @@ class PresidentDepositController extends ThinkController
         if (I('export', 0) == 1) {
             $promotes = $query->select();
         } else {
+            $totalQuery = clone $query;
             $countQuery = clone $query;
             $promotes = $query->page($page, $row)->select();
             // 汇总金额
-            $total = M('president_deposit', 'tab_')->where(['promote_id'=>['in', $countQuery->getField('id', true)]])->field('sum(amount) as totalAmount, sum(if(status = 1, amount, 0)) as confirmedAmount, sum(if(status = 2, amount, 0)) as refundedAmount')->find();
+            $total = M('president_deposit', 'tab_')->where(['promote_id'=>['in', $totalQuery->getField('id', true)]])->field('sum(amount) as totalAmount, sum(if(status = 1, amount, 0)) as confirmedAmount, sum(if(status = 2, amount, 0)) as refundedAmount')->find();
             $count = $countQuery->count();
         }
 

From eaa25ebcda3cc588445a5b3ffd17fd6d0d82efae Mon Sep 17 00:00:00 2001
From: yulingwei <2436953959@qq.com>
Date: Mon, 20 Jul 2020 10:40:13 +0800
Subject: [PATCH 05/10] feature/desposit

---
 .../PresidentDepositController.class.php      | 28 +++++----
 .../Admin/View/PresidentDeposit/records.html  | 60 ++++++++++++++-----
 .../Service/PresidentDepositService.class.php |  2 +-
 3 files changed, 62 insertions(+), 28 deletions(-)

diff --git a/Application/Admin/Controller/PresidentDepositController.class.php b/Application/Admin/Controller/PresidentDepositController.class.php
index bc72db3c6..8f53211e9 100644
--- a/Application/Admin/Controller/PresidentDepositController.class.php
+++ b/Application/Admin/Controller/PresidentDepositController.class.php
@@ -141,17 +141,18 @@ class PresidentDepositController extends ThinkController
 
         $promotes = [];
         $count = 0;
-        if (I('export', 0) == 1) {
+        $totalQuery = clone $query;
+        if (I('export', 0) == 1 || $row == 'all') {
             $promotes = $query->select();
         } else {
-            $totalQuery = clone $query;
             $countQuery = clone $query;
             $promotes = $query->page($page, $row)->select();
-            // 汇总金额
-            $total = M('president_deposit', 'tab_')->where(['promote_id'=>['in', $totalQuery->getField('id', true)]])->field('sum(amount) as totalAmount, sum(if(status = 1, amount, 0)) as confirmedAmount, sum(if(status = 2, amount, 0)) as refundedAmount')->find();
             $count = $countQuery->count();
         }
 
+        // 汇总金额
+        $total = M('president_deposit', 'tab_')->where(['promote_id'=>['in', $totalQuery->getField('id', true)]])->field('sum(amount) as totalAmount, sum(if(status = 1, amount, 0)) as confirmedAmount, sum(if(status = 2, amount, 0)) as refundedAmount')->find();
+
         $relationQuery = M('promote_company', 'tab_')->field(['id', 'company_name']);
         $promotes = $this->mergeOneReletions('company', $promotes, $relationQuery, 'company_id', 'id');
         $relationQuery = M('president_deposit', 'tab_');
@@ -213,7 +214,7 @@ class PresidentDepositController extends ThinkController
                     $record['pay_confirm_time'] = '--';
                     $record['refund_time'] = '--';
                     $record['pay_accept_time'] = '--';
-                    $record['status_text'] = '--';
+                    $record['status_text'] = '市场待确认';
                     $record['has_record'] = false;
                     $record['status'] = 0;
                     $record['pay_type'] = 0;
@@ -246,7 +247,7 @@ class PresidentDepositController extends ThinkController
         }
         $this->checkListOrCountAuthRestMap($map,[]);
         $total['unconfirmedamount'] = $total['totalamount'] - $total['confirmedamount'] - $total['refundedamount'];
-        $page = set_pagination($count, $row);
+        $page = set_pagination($count, $row == 'all' ? 1 : $row);
         if($page) {
             $this->assign('_page', $page);
         }
@@ -528,12 +529,12 @@ class PresidentDepositController extends ThinkController
                 break;
             }
             // 如果不是无需押金，并且没有填写收到押金时间
-            if ($record['pay_type'] != PresidentDepositService::PAY_TYPE_NONE && empty($record['pay_accept_time'])) {
-                $this->ajaxReturn([
-                    'status' => 0,
-                    'message' => '含有待确认收到押金时间记录，不可批量操作'
-                ]);
-            }
+            // if ($record['pay_type'] != PresidentDepositService::PAY_TYPE_NONE && empty($record['pay_accept_time'])) {
+            //     $this->ajaxReturn([
+            //         'status' => 0,
+            //         'message' => '含有待确认收到押金时间记录，不可批量操作'
+            //     ]);
+            // }
         }
         if (!$checkStatus) {
             $this->ajaxReturn([
@@ -560,7 +561,8 @@ class PresidentDepositController extends ThinkController
         M('president_deposit', 'tab_')->where(['promote_id' => ['in', $promoteIds]])->save([
             'status' => 1,
             'pay_confirm_time' => time(),
-            'update_time' => time()
+            'update_time' => time(),
+            'pay_accept_time' => strtotime(I('accept_time'))
         ]);
         $this->ajaxReturn([
             'status' => 1,
diff --git a/Application/Admin/View/PresidentDeposit/records.html b/Application/Admin/View/PresidentDeposit/records.html
index 0cacd8e01..18ff5be20 100644
--- a/Application/Admin/View/PresidentDeposit/records.html
+++ b/Application/Admin/View/PresidentDeposit/records.html
@@ -257,6 +257,14 @@
         //导航高亮
         highlight_subnav('{:U('PresidentDeposit/records')}');
         $(function(){
+            // 添加全部选项
+            
+            if ('all' == "{:I('row', 0)}") {
+                $("#pagechange").append("<option value='all' selected>全部</option>");
+            } else {
+                $("#pagechange").append("<option value='all'>全部</option>");
+            }
+
             $('.time-select').each(function(){
                 laydate.render({
                 elem: this,
@@ -358,22 +366,46 @@
             $('#pay-confirm-btn').on({
                 click: function() {
                     var ids = getIds();
-                    $.ajax({
-                        url: '{:U("payConfirm")}',
-                        type: 'post',
-                        dataType: 'json',
-                        data: {ids: ids},
-                        success: function(result) {
-                            if (result.status == 1) {
-                                layer.msg(result.message)
-                                setTimeout(function() {
-                                    window.location.href = window.location.href
-                                }, 200)
-                            } else {
-                                layer.msg(result.message)
+                    var accept_time = '';
+
+                    layer.open({
+                        title : '押金收到时间确认',
+                        content : `<input type="text" readonly id="deposit_recept_time" value=""placeholder="押金收到时间"/>`,
+                        success : function() {
+                            laydate.render({
+                                elem: '#deposit_recept_time',
+                                type: 'datetime',
+                                value: new Date() 
+                            });
+                        },
+                        yes : function(index, layero) {
+                            accept_time = $('#deposit_recept_time').val();
+                            if (!accept_time) {
+                                layer.msg('请选择押金收到时间');
+                                return true;
                             }
+
+                            $.ajax({
+                                url: '{:U("payConfirm")}',
+                                type: 'post',
+                                dataType: 'json',
+                                data: {ids: ids, accept_time : accept_time},
+                                success: function(result) {
+                                    if (result.status == 1) {
+                                        layer.msg(result.message)
+                                        setTimeout(function() {
+                                            window.location.href = window.location.href
+                                        }, 200)
+                                    } else {
+                                        layer.msg(result.message)
+                                        layer.close(index);
+                                    }
+                                }
+                            })
+                            return true;
                         }
-                    })
+                    });
+                    
                 }
             })
             function getIds() {
diff --git a/Application/Base/Service/PresidentDepositService.class.php b/Application/Base/Service/PresidentDepositService.class.php
index 2dcd8db0c..ef12da126 100644
--- a/Application/Base/Service/PresidentDepositService.class.php
+++ b/Application/Base/Service/PresidentDepositService.class.php
@@ -27,7 +27,7 @@ class PresidentDepositService
 	];
 
 	public static $statusList = [
-		0 => '待确认',
+		0 => '财务待确认',
 		1 => '已收到',
 		2 => '已退款',
 	];

From 25dec010bef439be6c7a990a808adaf9679fe27e Mon Sep 17 00:00:00 2001
From: yulingwei <2436953959@qq.com>
Date: Mon, 20 Jul 2020 11:57:42 +0800
Subject: [PATCH 06/10] upt

---
 .../PresidentDepositController.class.php      | 25 ++++++++++++++++++-
 .../Admin/View/PresidentDeposit/records.html  | 10 +++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/PresidentDepositController.class.php b/Application/Admin/Controller/PresidentDepositController.class.php
index 8f53211e9..341eff12d 100644
--- a/Application/Admin/Controller/PresidentDepositController.class.php
+++ b/Application/Admin/Controller/PresidentDepositController.class.php
@@ -135,6 +135,11 @@ class PresidentDepositController extends ThinkController
                 $idStrWhere[] = '1<>1';
             }
         }
+
+        if (!empty(I('admin_id', 0))) {
+            $query->where(['admin_id' => I('admin_id', 0)]);
+        }
+        
         if (count($idStrWhere) > 0) {
             $query->where(['_string' => implode(' and ', array_unique($idStrWhere))]);
         }
@@ -151,7 +156,14 @@ class PresidentDepositController extends ThinkController
         }
 
         // 汇总金额
-        $total = M('president_deposit', 'tab_')->where(['promote_id'=>['in', $totalQuery->getField('id', true)]])->field('sum(amount) as totalAmount, sum(if(status = 1, amount, 0)) as confirmedAmount, sum(if(status = 2, amount, 0)) as refundedAmount')->find();
+        if (count($promotes) > 0 || (isset($count) && $count > 0)) {
+            $total = M('president_deposit', 'tab_')->where(['promote_id'=>['in', $totalQuery->getField('id', true)]])->field('sum(amount) as totalAmount, sum(if(status = 1, amount, 0)) as confirmedAmount, sum(if(status = 2, amount, 0)) as refundedAmount')->find();
+        } else {
+            $total = [
+                'totalamount' => 0, 'confirmedamount' => 0, 'refundedamount' => 0
+            ];
+        }
+        
 
         $relationQuery = M('promote_company', 'tab_')->field(['id', 'company_name']);
         $promotes = $this->mergeOneReletions('company', $promotes, $relationQuery, 'company_id', 'id');
@@ -346,7 +358,18 @@ class PresidentDepositController extends ThinkController
                 }
             }
 
+            // 市场部门无法操作押金退款和收到时间
+            if ((($record['pay_accept_time'] != $payAcceptTime) || ($record['refund_time'] != $refundTime)) && isMarketAdmin()) {
+                return $this->error('无法操作记录');
+            }
             $data = [];
+
+            // 填写押金到账时间后自动变为押金已确认到账状态，并且状态在待确认时候
+            if ($record['pay_accept_time'] != $payAcceptTime && $record['status'] == 0) {
+               $data = ['status' => 1,
+                'pay_confirm_time' => time()];
+            }
+
             $data['pay_way'] = $payType == 2 ? 4 : $payWay;
             $data['pay_type'] = $payType;
             $data['promote_id'] = $promoteId;
diff --git a/Application/Admin/View/PresidentDeposit/records.html b/Application/Admin/View/PresidentDeposit/records.html
index 18ff5be20..c2952569c 100644
--- a/Application/Admin/View/PresidentDeposit/records.html
+++ b/Application/Admin/View/PresidentDeposit/records.html
@@ -127,6 +127,14 @@
                     <span class="add-on"><i class="icon-th"></i></span>
                 </div>
             </div>
+            <div class="input-list input-list-promote search_label_rehab">
+                <select id="admin_id" name="admin_id" class="select_gallery" style="width:120px;">
+                    <option value="">所属市场专员</option>
+                    <volist name=":getMarketAdmins()" id="vo">
+                        <option value="{$vo.id}" <?php if(I('admin_id') == $vo['id']):?>selected<?php endif;?> >{$vo.username}</option>
+                    </volist>
+                </select>
+            </div>
             <div class="input-list">
                 <a class="sch-btn" href="javascript:;" id="search" url="{:U('PresidentDeposit/records')}">搜索</a>
             </div>
@@ -307,7 +315,7 @@
                 var query  = $('.jssearch').find('input').serialize();
                 query  += "&"+$('.jssearch').find('select').serialize();
                 //query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g,'');
-                //query = query.replace(/^&/g,'');
+                query = query.replace(/^&/g,'');
                 if( url.indexOf('?')>0 ){
                     url += '&' + query;
                 }else{

From deac7da5ffaceb5250ff50c0c244c8dc768248be Mon Sep 17 00:00:00 2001
From: yulingwei <2436953959@qq.com>
Date: Mon, 20 Jul 2020 13:48:17 +0800
Subject: [PATCH 07/10] upt

---
 .../PresidentDepositController.class.php       | 18 ++++++++++++++----
 .../Admin/View/PresidentDeposit/records.html   |  1 +
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/PresidentDepositController.class.php b/Application/Admin/Controller/PresidentDepositController.class.php
index 341eff12d..7f4cbe245 100644
--- a/Application/Admin/Controller/PresidentDepositController.class.php
+++ b/Application/Admin/Controller/PresidentDepositController.class.php
@@ -31,11 +31,18 @@ class PresidentDepositController extends ThinkController
 
         $promoteIds = [];
         if ($status !== '') {
-            $tempPromoteIds = M('president_deposit', 'tab_')->where(['status' => $status])->getField('promote_id', true);
-            if (count($tempPromoteIds) > 0) {
-                $idStrWhere[] = 'id in (' . implode(',', $tempPromoteIds) . ')';
+            if ($status == '-1') { // 市场待审核
+                $tempPromoteIds = M('president_deposit', 'tab_')->getField('promote_id', true);
+                if (count($tempPromoteIds) > 0) {
+                    $idStrWhere[] = 'id not in (' . implode(',', $tempPromoteIds) . ')';
+                }
             } else {
-                $idStrWhere[] = '1<>1';
+                $tempPromoteIds = M('president_deposit', 'tab_')->where(['status' => $status])->getField('promote_id', true);
+                if (count($tempPromoteIds) > 0) {
+                    $idStrWhere[] = 'id in (' . implode(',', $tempPromoteIds) . ')';
+                } else {
+                    $idStrWhere[] = '1<>1';
+                }
             }
         }
 
@@ -158,6 +165,9 @@ class PresidentDepositController extends ThinkController
         // 汇总金额
         if (count($promotes) > 0 || (isset($count) && $count > 0)) {
             $total = M('president_deposit', 'tab_')->where(['promote_id'=>['in', $totalQuery->getField('id', true)]])->field('sum(amount) as totalAmount, sum(if(status = 1, amount, 0)) as confirmedAmount, sum(if(status = 2, amount, 0)) as refundedAmount')->find();
+            $total = [
+                'totalamount' => $total['totalamount'] ?? 0, 'confirmedamount' => $total['confirmedamount'] ?? 0, 'refundedamount' => $total['refundedamount'] ?? 0
+            ];
         } else {
             $total = [
                 'totalamount' => 0, 'confirmedamount' => 0, 'refundedamount' => 0
diff --git a/Application/Admin/View/PresidentDeposit/records.html b/Application/Admin/View/PresidentDeposit/records.html
index c2952569c..6b18e5c54 100644
--- a/Application/Admin/View/PresidentDeposit/records.html
+++ b/Application/Admin/View/PresidentDeposit/records.html
@@ -84,6 +84,7 @@
             <div class="input-list input-list-promote search_label_rehab">
                 <select id="status" name="status" class="select_gallery" style="width:120px;">
                     <option value="">押金状态</option>
+                    <option value="-1">市场待确认</option>
                     <?php foreach($statusList as $key => $name):?>
                     <option value="<?=$key?>"><?=$name?></option>
                     <?php endforeach;?>

From 7830cef93d3ee6d901a7f07eccada41ab1f3aba3 Mon Sep 17 00:00:00 2001
From: yulingwei <2436953959@qq.com>
Date: Mon, 20 Jul 2020 18:20:51 +0800
Subject: [PATCH 08/10] upt

---
 .../PresidentDepositController.class.php      | 53 ++++++++++++++-----
 .../StatementMangementController.class.php    |  2 +-
 .../Admin/View/PresidentDeposit/records.html  |  3 +-
 3 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/Application/Admin/Controller/PresidentDepositController.class.php b/Application/Admin/Controller/PresidentDepositController.class.php
index 7f4cbe245..1a064944f 100644
--- a/Application/Admin/Controller/PresidentDepositController.class.php
+++ b/Application/Admin/Controller/PresidentDepositController.class.php
@@ -107,7 +107,7 @@ class PresidentDepositController extends ThinkController
         if (!empty(I('pay_accept_time_start')) && empty(I('pay_accept_time_end'))) {
             $startTime = strtotime(I('pay_accept_time_start'));
             $endTime = strtotime(I('pay_accept_time_end'))+ 86400;
-            $tempPromoteIds = M('president_deposit', 'tab_')->where("pay_confirm_time >= {$startTime}")->getField('promote_id', true);
+            $tempPromoteIds = M('president_deposit', 'tab_')->where("pay_accept_time >= {$startTime}")->getField('promote_id', true);
             if (count($tempPromoteIds) > 0) {
                 $idStrWhere[] = 'id in (' . implode(',', $tempPromoteIds) . ')';
             } else {
@@ -116,7 +116,7 @@ class PresidentDepositController extends ThinkController
         } else if (empty(I('pay_accept_time_start')) && !empty(I('pay_accept_time_end'))) {
             $startTime = strtotime(I('pay_accept_time_start'));
             $endTime = strtotime(I('pay_accept_time_end'))+ 86400;
-            $tempPromoteIds = M('president_deposit', 'tab_')->where("pay_confirm_time <= {$endTime}")->getField('promote_id', true);
+            $tempPromoteIds = M('president_deposit', 'tab_')->where("pay_accept_time <= {$endTime}")->getField('promote_id', true);
             if (count($tempPromoteIds) > 0) {
                 $idStrWhere[] = 'id in (' . implode(',', $tempPromoteIds) . ')';
             } else {
@@ -156,6 +156,7 @@ class PresidentDepositController extends ThinkController
         $totalQuery = clone $query;
         if (I('export', 0) == 1 || $row == 'all') {
             $promotes = $query->select();
+            $count = count($promotes);
         } else {
             $countQuery = clone $query;
             $promotes = $query->page($page, $row)->select();
@@ -269,7 +270,8 @@ class PresidentDepositController extends ThinkController
         }
         $this->checkListOrCountAuthRestMap($map,[]);
         $total['unconfirmedamount'] = $total['totalamount'] - $total['confirmedamount'] - $total['refundedamount'];
-        $page = set_pagination($count, $row == 'all' ? 1 : $row);
+        $page = set_pagination($count, $row == 'all' ? 99999999 : $row);
+        //dd($row == 'all' ? 99999999 : $row);
         if($page) {
             $this->assign('_page', $page);
         }
@@ -340,10 +342,16 @@ class PresidentDepositController extends ThinkController
         $refundTime = I('refund_time', 0) ? strtotime(I('refund_time')): 0;
 
 
+
         $record = M('president_deposit', 'tab_')->where(['promote_id' => $promoteId])->find();
 
         $promoteData = M('promote', 'tab_')->field('account')->where(['id' => $promoteId])->find();
 
+        // 市场部门无法操作押金退款和收到时间
+        if ((($record['pay_accept_time'] != $payAcceptTime) || ($record['refund_time'] != $refundTime)) && isMarketAdmin()) {
+            return $this->error('无法操作记录');
+        }
+
         if ($payType == 0) {
             return $this->error('请选择押金付款方式');
         }
@@ -368,10 +376,6 @@ class PresidentDepositController extends ThinkController
                 }
             }
 
-            // 市场部门无法操作押金退款和收到时间
-            if ((($record['pay_accept_time'] != $payAcceptTime) || ($record['refund_time'] != $refundTime)) && isMarketAdmin()) {
-                return $this->error('无法操作记录');
-            }
             $data = [];
 
             // 填写押金到账时间后自动变为押金已确认到账状态，并且状态在待确认时候
@@ -390,6 +394,7 @@ class PresidentDepositController extends ThinkController
             $data['update_time'] = time();
             $data['pay_accept_time'] = $payAcceptTime;
             $data['refund_time'] = $refundTime;
+
             M('president_deposit', 'tab_')->add($data);
 
             addOperationLog(['op_type'=>0,'key'=>$promoteData['account'].'/'.$amount,'op_name'=>'新增会长押金','url'=>U('PresidentDeposit/edit',['id'=>$promoteId]),'menu'=>'推广员-结算单管理-奖罚记录管理-新增会长押金']);
@@ -424,15 +429,12 @@ class PresidentDepositController extends ThinkController
         // 切换类型
         if ($payType != $record['pay_type']) {
             $payStatus = 0;
-            $data['pay_confirm_time'] = 0;
+            $data['refund_time'] = $data['pay_accept_time'] = $data['pay_confirm_time'] = 0;
+        } else {
+            $data['pay_accept_time'] = $payAcceptTime;
+            $data['refund_time'] = $refundTime;
         }
 
-        if ($payType == PresidentDepositService::PAY_TYPE_NONE) { // 无需押金 直接确认
-            $payStatus = 1;
-            $data['pay_confirm_time'] = time();
-        }
-        $data['pay_accept_time'] = $payAcceptTime;
-        $data['refund_time'] = $refundTime;
         $data['pay_way'] = $payType == 2 ? 4 : $payWay;
         $data['pay_type'] = $payType;
         $data['pay_account'] = $payAccount;
@@ -440,6 +442,7 @@ class PresidentDepositController extends ThinkController
         $data['status'] = $payStatus ?? $record['status'];
         $data['payer'] = $payer;
         $data['update_time'] = time();
+
         M('president_deposit', 'tab_')->where(['promote_id' => $promoteId])->save($data);
 
         addOperationLog(['op_type'=>1,'key'=>$promoteData['account'].'/'.$amount,'op_name'=>'编辑会长押金','url'=>U('PresidentDeposit/edit',['id'=>$promoteId]),'menu'=>'推广员-结算单管理-会长押金管理-编辑会长押金']);
@@ -449,6 +452,12 @@ class PresidentDepositController extends ThinkController
 
     public function delete()
     {
+        if (isMarketAdmin()) {
+            $this->ajaxReturn([
+                'status' => 0,
+                'message' => '无法操作记录'
+            ]);
+        }
         $promoteId = I('id', 0);
         M('president_deposit', 'tab_')->where(['promote_id' => $promoteId])->delete();
 
@@ -460,6 +469,9 @@ class PresidentDepositController extends ThinkController
         ]);
     }
 
+    /**
+     * 处理无需押金
+     */
     public function handleNoDeposit($promoteId)
     {
         $record = M('president_deposit', 'tab_')->where(['promote_id' => $promoteId])->find();
@@ -470,13 +482,17 @@ class PresidentDepositController extends ThinkController
         $data['pay_account'] = '';
         $data['amount'] = 0;
         $data['payer'] = '';
+        $data['pay_confirm_time'] = time();
         $data['create_time'] = time();
         $data['update_time'] = time();
         $data['status'] = 1;
         if (!$record) {
+            $data['pay_accept_time'] = time();
             $data['promote_id'] = $promoteId;
             M('president_deposit', 'tab_')->add($data);
         } else {
+            $data['pay_accept_time'] = strtotime(I('pay_accept_time', 0));
+            $data['refund_time'] = strtotime(I('refund_time', 0));
             M('president_deposit', 'tab_')->where(['promote_id' => $promoteId])->save($data);
         }
         
@@ -496,6 +512,9 @@ class PresidentDepositController extends ThinkController
 
     public function refund()
     {
+        if (isMarketAdmin()) {
+            return $this->error('无法操作记录');
+        }
         $promoteIds = I('ids', []);
         if (count($promoteIds) == 0) {
             $this->ajaxReturn([
@@ -547,6 +566,12 @@ class PresidentDepositController extends ThinkController
 
     public function payConfirm()
     {
+        if (isMarketAdmin()) {
+            $this->ajaxReturn([
+                'status' => 0,
+                'message' => '无权限操作记录'
+            ]);
+        }
         $promoteIds = I('ids', []);
         if (count($promoteIds) == 0) {
             $this->ajaxReturn([
diff --git a/Application/Admin/Controller/StatementMangementController.class.php b/Application/Admin/Controller/StatementMangementController.class.php
index 0e741a1d6..1d6eb751e 100644
--- a/Application/Admin/Controller/StatementMangementController.class.php
+++ b/Application/Admin/Controller/StatementMangementController.class.php
@@ -11,7 +11,7 @@ use User\Api\UserApi as UserApi;
 class StatementMangementController extends ThinkController
 {
     public function lists() {
-
+        
         $map = [];
 
         if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) {
diff --git a/Application/Admin/View/PresidentDeposit/records.html b/Application/Admin/View/PresidentDeposit/records.html
index 6b18e5c54..5a4d4c201 100644
--- a/Application/Admin/View/PresidentDeposit/records.html
+++ b/Application/Admin/View/PresidentDeposit/records.html
@@ -269,7 +269,8 @@
             // 添加全部选项
             
             if ('all' == "{:I('row', 0)}") {
-                $("#pagechange").append("<option value='all' selected>全部</option>");
+                
+                $("#pagechange").prepend("<option value='all' selected>全部</option>");
             } else {
                 $("#pagechange").append("<option value='all'>全部</option>");
             }

From 0a9e7ed3efd30f71b5fafb44bae4f4574da89a4c Mon Sep 17 00:00:00 2001
From: yulingwei <2436953959@qq.com>
Date: Mon, 20 Jul 2020 19:59:54 +0800
Subject: [PATCH 09/10] upt

---
 .../Controller/PresidentDepositController.class.php   | 11 ++++++-----
 Application/Admin/View/PresidentDeposit/records.html  |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Application/Admin/Controller/PresidentDepositController.class.php b/Application/Admin/Controller/PresidentDepositController.class.php
index 1a064944f..2cb522999 100644
--- a/Application/Admin/Controller/PresidentDepositController.class.php
+++ b/Application/Admin/Controller/PresidentDepositController.class.php
@@ -482,17 +482,17 @@ class PresidentDepositController extends ThinkController
         $data['pay_account'] = '';
         $data['amount'] = 0;
         $data['payer'] = '';
+        $data['status'] = 1;
         $data['pay_confirm_time'] = time();
         $data['create_time'] = time();
         $data['update_time'] = time();
         $data['status'] = 1;
+        $data['pay_accept_time'] = $data['refund_time'] = 0;
+        
         if (!$record) {
-            $data['pay_accept_time'] = time();
-            $data['promote_id'] = $promoteId;
             M('president_deposit', 'tab_')->add($data);
         } else {
-            $data['pay_accept_time'] = strtotime(I('pay_accept_time', 0));
-            $data['refund_time'] = strtotime(I('refund_time', 0));
+            $data['promote_id'] = $promoteId;
             M('president_deposit', 'tab_')->where(['promote_id' => $promoteId])->save($data);
         }
         
@@ -556,7 +556,8 @@ class PresidentDepositController extends ThinkController
         M('president_deposit', 'tab_')->where(['promote_id' => ['in', $promoteIds]])->save([
             'status' => 2,
             'refund_time' => time(),
-            'update_time' => time()
+            'update_time' => time(),
+            'pay_accept_time' => 0
         ]);
         $this->ajaxReturn([
             'status' => 1,
diff --git a/Application/Admin/View/PresidentDeposit/records.html b/Application/Admin/View/PresidentDeposit/records.html
index 5a4d4c201..52b5c5288 100644
--- a/Application/Admin/View/PresidentDeposit/records.html
+++ b/Application/Admin/View/PresidentDeposit/records.html
@@ -272,7 +272,7 @@
                 
                 $("#pagechange").prepend("<option value='all' selected>全部</option>");
             } else {
-                $("#pagechange").append("<option value='all'>全部</option>");
+                $("#pagechange").prepend("<option value='all'>全部</option>");
             }
 
             $('.time-select').each(function(){

From 1c633e60cbaa23ff1865d98461f948a8cd6f8008 Mon Sep 17 00:00:00 2001
From: yulingwei <2436953959@qq.com>
Date: Wed, 22 Jul 2020 10:48:06 +0800
Subject: [PATCH 10/10] upt

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

diff --git a/Application/Admin/Controller/PresidentDepositController.class.php b/Application/Admin/Controller/PresidentDepositController.class.php
index 2cb522999..7d9f847ac 100644
--- a/Application/Admin/Controller/PresidentDepositController.class.php
+++ b/Application/Admin/Controller/PresidentDepositController.class.php
@@ -488,11 +488,11 @@ class PresidentDepositController extends ThinkController
         $data['update_time'] = time();
         $data['status'] = 1;
         $data['pay_accept_time'] = $data['refund_time'] = 0;
+        $data['promote_id'] = $promoteId;
         
         if (!$record) {
             M('president_deposit', 'tab_')->add($data);
         } else {
-            $data['promote_id'] = $promoteId;
             M('president_deposit', 'tab_')->where(['promote_id' => $promoteId])->save($data);
         }