From c7c67f279ab15a4614c6ad1f9f49553a2da54382 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 15 Jun 2020 20:59:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E6=AC=BE=E4=BF=A1=E6=81=AF=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompanyStatementPoolController.class.php  | 48 +++++++++++++++++--
 .../View/CompanyStatementPool/lists.html      | 12 +++++
 .../CompanyStatementPool/viewPayment.html     | 22 ++-------
 3 files changed, 60 insertions(+), 22 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php
index 45679b4fa..8c72a240c 100644
--- a/Application/Admin/Controller/CompanyStatementPoolController.class.php
+++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php
@@ -27,6 +27,17 @@ class CompanyStatementPoolController extends ThinkController
         "4"=>"打款成功",
         "5"=>"无需打款"
     ];
+    public $InfoVerifyStatus=[
+        "-1"=>"配置信息不全",
+        "0"=>"信息未确认",
+        "1"=>"允许打款",
+        "2"=>"线下无需打款"
+    ];
+    public $PayStatus=[
+        "-1"=>"打款失败",
+        "0"=>"未打款",
+        "1"=>"打款成功"
+    ];
     public $admininfo;
     public $DBModel;
     public function _initialize()
@@ -499,6 +510,35 @@ class CompanyStatementPoolController extends ThinkController
         //修改状态
        $this->setOneVerifyStatus(2,"payment",$_REQUEST['pool_id'],$mgs = "打款信息提交");
     }
+    //查看打款信息
+    public function viewPayment(){
+        if(!isset($_REQUEST['id'])) $this->error("参数错误");
+        $id = $_REQUEST['id'];
+        $CompanyInfo = M("company_statement_info","tab_")
+                      ->alias('i')
+                      ->field("i.id,i.pool_id,i.company_name,i.company_info,i.statement_money,p.statement_num,i.remark,i.pay_status,i.verify_status,p.statement_money all_money")
+                      ->join("tab_company_statement_pool p ON p.id = i.pool_id")
+                      ->where("pool_id='{$id}'")
+                      ->select();
+        foreach($CompanyInfo as $k=>&$v){
+            $v['company_info'] = json_decode($v['company_info'],true);
+            $v['company_info']['ali_user'] ?? '';
+            $v['company_info']['ali_account'] ?? '';
+            $v['verify_status_str'] = $this->InfoVerifyStatus[ $v['verify_status']];
+           
+            if($v['verify_status'] == 1){
+                
+                $v['verify_status_str'] = $this->PayStatus[$v['pay_status']];
+                if($v['pay_status'] == 1){
+                    $v['pay_type'] = $v['pay_type'] == 1 ? "提现" :"线上打款";
+                    $v['verify_status_str'] .= ("/". $v['pay_type']);
+                }
+            }
+        }
+
+        $this->assign("CompanyInfo",$CompanyInfo);
+        $this->display();
+    }
     
     //保存备注
     public function saveRemark(){
@@ -782,7 +822,7 @@ class CompanyStatementPoolController extends ThinkController
 
             "setPayment"=>"<a class='confirm setPayment' data-id='{$id}'>打款信息提交</a>",
             "editPayment"=>"<a class='confirm editPayment' data-id='{$id}'>打款信息编辑</a>",
-            "viePayment"=>"<a class='confirm viePayment' data-id='{$id}'>打款详情</a>",
+            "viewPayment"=>"<a class='confirm viewPayment' data-id='{$id}'>打款详情</a>",
 
             'reCount'=>"<a class='confirm reCount' data-id='{$id}'>重算</a>",
             'cancelPool'=>"<a class='confirm cancelPool' data-id='{$id}'>撤销汇总</a>",
@@ -803,10 +843,10 @@ class CompanyStatementPoolController extends ThinkController
                 $optist = ["viewPool","addRemark","viewRemark","editRemark","viewVoucher","editVoucher","uploadVoucher","editPayment"];
                 break;
             case '3':
-                $optist = ["viewPool","addRemark","viewRemark","editRemark","viewVoucher","editVoucher","uploadVoucher","editPayment","viePayment"];
+                $optist = ["viewPool","addRemark","viewRemark","editRemark","viewVoucher","editVoucher","uploadVoucher","editPayment","viewPayment"];
                 break;
             case '4':
-                $optist = ["viewPool","addRemark","viewRemark","editRemark","viewVoucher","editVoucher","uploadVoucher","viePayment"];
+                $optist = ["viewPool","addRemark","viewRemark","editRemark","viewVoucher","editVoucher","uploadVoucher","viewPayment"];
                 break;
             case '5':
                 $optist = ["viewPool","addRemark","viewRemark","editRemark","reCount","cancelPool"];
@@ -845,7 +885,7 @@ class CompanyStatementPoolController extends ThinkController
         if($info['is_payment'] == 1){
             $optist = array_diff($optist, ["setUlPayment"]);
         }else{
-            $optist = array_diff($optist, ["setPayment","editPayment","viePayment"]);
+            $optist = array_diff($optist, ["setPayment","editPayment","viewPayment"]);
         }
 
         if(empty($info['remark'])){
diff --git a/Application/Admin/View/CompanyStatementPool/lists.html b/Application/Admin/View/CompanyStatementPool/lists.html
index fd4a4397c..fead729a1 100644
--- a/Application/Admin/View/CompanyStatementPool/lists.html
+++ b/Application/Admin/View/CompanyStatementPool/lists.html
@@ -421,6 +421,18 @@
                     content: url
                 });
             })
+            $(".viewPayment").on("click",function(){
+                var id = $(this).data("id");
+                var url = "{:U('viewPayment')}"+"&id="+id 
+                layer.open({
+                    type: 2,
+                    title: "海南万盟天下科技有限公司",
+                    shadeClose: true,
+                    shade: 0.8,
+                    area: ['70%', '80%'],
+                    content: url
+                });
+            })
 
             
             function cancelPoolAjax(opurl,senddata){
diff --git a/Application/Admin/View/CompanyStatementPool/viewPayment.html b/Application/Admin/View/CompanyStatementPool/viewPayment.html
index 9ace64b39..3c2edbee7 100644
--- a/Application/Admin/View/CompanyStatementPool/viewPayment.html
+++ b/Application/Admin/View/CompanyStatementPool/viewPayment.html
@@ -110,21 +110,12 @@
                         <th style="border-right: solid 1px #b6cad2;">关联结算汇总单订单号</th>
                         <th style="border-right: solid 1px #b6cad2;">金额(元)</th>
                         <th style="border-right: solid 1px #b6cad2;">备注</th>
+                        <th style="border-right: solid 1px #b6cad2;">打款状态</th>
                     </tr>
                 </thead>
                 <tbody id="statementShow">
                     <foreach name="CompanyInfo" item="vo" >
-                        <if condition="$vo['pay_status'] neq 1">
-                            <tr>
-                                <td>{$key-0+1}</td>
-                                <td>{$vo.company_name}</td>
-                                <td><input type="text" class="txt paymentset" data-id="{$vo.id}" name="ali_user" value="{$vo.company_info.ali_user}" placeholder="支付宝真实名称"></td>
-                                <td><input type="text" class="txt paymentset" data-id="{$vo.id}" name="ali_account" value="{$vo.company_info.ali_account}" placeholder="支付宝账号"></td>
-                                <td>{$vo.statement_num}</td>
-                                <td>{$vo.statement_money}</td>
-                                <td><input type="text" class="txt paymentset" data-id="{$vo.id}" name="remark" value="{$vo.remark}" placeholder="备注"></td>
-                            </tr>
-                        <else />
+ 
                             <tr>
                                 <td>{$key-0+1}</td>
                                 <td>{$vo.company_name}</td>
@@ -133,24 +124,19 @@
                                 <td>{$vo.statement_num}</td>
                                 <td>{$vo.statement_money}</td>
                                 <td>{$vo.remark}</td>
+                                <td>{$vo.verify_status_str}</td>
                             </tr>
-                        </if>
                         
                     </foreach>
                     <tr>
                         <td colspan="2">合计:</td>
-                        <td colspan="5">打款总金额:{$CompanyInfo[0]['all_money']}</td>
+                        <td colspan="6">打款总金额:{$CompanyInfo[0]['all_money']}</td>
                     </tr>
 
                 </tbody>
             </table>
         </div>
     </div>
-    <div class="search_list" style="display:flex;justify-content:flex-end;width:100%;margin-top: 30px;">
-        <div class="input-list" style="margin-left: 30px;float: right;">
-            <a class="sch-btn" href="javascript:;" id="setPayment" style="width: 150px;">确认提交</a>
-        </div>
-    </div>
     
     <script>
         $("#setPayment").on("click",function(){