From 4f2f18ad913c320b1f8c3b41648926848b222efd Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 28 Dec 2020 11:51:02 +0800
Subject: [PATCH] =?UTF-8?q?12.28=E5=8A=9F=E8=83=BD=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/MarketPercentageController.class.php  | 1 +
 Application/Admin/View/MarketPercentage/coefficient.html   | 7 +++++--
 Application/Payment/Controller/PaymentController.class.php | 6 +++---
 Application/Payment/View/Payment/lists.html                | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php
index 317d1740e..ddb054f2f 100644
--- a/Application/Admin/Controller/MarketPercentageController.class.php
+++ b/Application/Admin/Controller/MarketPercentageController.class.php
@@ -784,6 +784,7 @@ class MarketPercentageController extends ThinkController
             $data[$key]['commission'] = number_format($data[$key]['performance_commission'] + $data[$key]['achievement_bonus'], 2, '.', '');
             $data[$key]['wait_commission'] = substr(number_format($value['wait_performance_commission'] + $value['wait_achievement_commission']*($this->coefficient[$value['pay_time']][$value['admin_id']]?$this->coefficient[$value['pay_time']][$value['admin_id']]:1), 4, '.', ''),0,-2);
             $data[$key]['extend_commission'] = $data[$key]['commission'] - $data[$key]['wait_commission'];
+//            dump($data[$key]['commission']);
 
             //两个起提流水都没达到时，不展示税后毛利
             $sum_amount = $value['performance_revenue'] + $value['appraisal_bonuses'];
diff --git a/Application/Admin/View/MarketPercentage/coefficient.html b/Application/Admin/View/MarketPercentage/coefficient.html
index 818057622..d8f59fa2c 100644
--- a/Application/Admin/View/MarketPercentage/coefficient.html
+++ b/Application/Admin/View/MarketPercentage/coefficient.html
@@ -109,7 +109,7 @@
                         <volist name="list_data" id="data">
                             <tr>
                                 <td >{$data['real_name']}</td>
-                                <td ><input style="width: auto;" name="{$data['nickname']}-{$data['uid']}-{$data['real_name']}" value="{$data['coefficient']/100}">%</td>
+                                <td ><input style="width: auto;" name="{$data['nickname']}-{$data['uid']}-{$data['real_name']}" value="{$data['coefficient']/100}"></td>
                             </tr>
                         </volist>
                     </tbody>
@@ -148,7 +148,10 @@
             success:function(data){
                 if (data.status == 1) {
                     layer.msg(data.msg);
-                    window.parent.reload();
+                    setTimeout(function(){
+                        window.parent.reload()
+                    },2000)
+
                 } else {
                     layer.msg(data.msg);
                 }
diff --git a/Application/Payment/Controller/PaymentController.class.php b/Application/Payment/Controller/PaymentController.class.php
index 4b31870d4..86b67acfd 100644
--- a/Application/Payment/Controller/PaymentController.class.php
+++ b/Application/Payment/Controller/PaymentController.class.php
@@ -94,9 +94,9 @@ class PaymentController extends BaseController
 
 //        dump($map);die();
         $sum = M("pay_statement_info","tab_")
-            ->alias('s')
-            ->field("sum(if(s.pay_status=0,s.statement_money,0)) unpay_amount,sum(if(s.pay_status>0,s.statement_money,0)) pay_amount,sum(if(s.pay_status<0,s.statement_money,0)) faild_pay_amount")
-            ->join("left join tab_company_statement_info c on s.statement_info_id = c.id")
+            ->alias('c')
+            ->field("sum(if(c.pay_status=0,c.statement_money,0)) unpay_amount,sum(if(c.pay_status>0,c.statement_money,0)) pay_amount,sum(if(c.pay_status<0,c.statement_money,0)) faild_pay_amount")
+            ->join("left join tab_company_statement_info s on c.statement_info_id = s.id")
             ->where($map)
             ->find();
 
diff --git a/Application/Payment/View/Payment/lists.html b/Application/Payment/View/Payment/lists.html
index 4507b3b0b..cc8243faf 100644
--- a/Application/Payment/View/Payment/lists.html
+++ b/Application/Payment/View/Payment/lists.html
@@ -316,7 +316,7 @@
                               </if>
                           </volist>
                         </volist>
-                        <tr><td style="line-height: 42px;">合计</td><td colspan="13" style="line-height: 42px;">待打款金额:&nbsp;{$money.statement_money|default='0.00'}&nbsp;&nbsp;打款成功:&nbsp;{$sum['pay_amount']|default='0.00'}&nbsp;打款失败:&nbsp;{$sum['faild_pay_amount']|default='0.00'}</td></tr>
+                        <tr><td style="line-height: 42px;">合计</td><td colspan="13" style="line-height: 42px;">待打款金额:&nbsp;{$sum['unpay_amount']|default='0.00'}&nbsp;&nbsp;打款成功:&nbsp;{$sum['pay_amount']|default='0.00'}&nbsp;打款失败:&nbsp;{$sum['faild_pay_amount']|default='0.00'}</td></tr>
                     </notemtpy>
                     </tbody>
                 </table>