From 2bc4bf79d9b373e1d20508f4a5b313aea014ba7e Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 29 Jun 2020 16:16:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E7=BB=93=E7=AE=97=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=85=AC=E5=8F=B8=E7=A8=8E=E7=8E=87=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/MarketPercentageController.class.php  | 12 ++++++++----
 Application/Admin/View/User/add.html                 |  2 +-
 Application/Admin/View/User/edit.html                |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php
index ac263b2db..6a2e5c3e4 100644
--- a/Application/Admin/Controller/MarketPercentageController.class.php
+++ b/Application/Admin/Controller/MarketPercentageController.class.php
@@ -128,7 +128,8 @@ class MarketPercentageController extends ThinkController
 //        dump(getMarketAdmin());die();
         $data = M("settleup_marketorder","tab_")
             ->field("pay_time,promote_account,company_belong,member.real_name,develop_type,game_name,
-            sum(pay_amount) pay_amount,sum(company_profit) company_profit,group_id,market_percentage")
+            sum(pay_amount) pay_amount,sum(company_profit) company_profit,group_id,market_percentage,
+            sum(if(develop_type = 1, pay_amount, 0)) performance_revenue,sum(if(develop_type = 2, pay_amount, 0)) appraisal_bonuses")
         ->join("left join sys_auth_group_access access on admin_id=access.uid")
         ->join("left join sys_auth_group auth on access.group_id=auth.id")
         ->join("left join sys_member member on access.uid=member.uid");
@@ -146,6 +147,8 @@ class MarketPercentageController extends ThinkController
                 ->select();
         }
 
+//        var_dump($data);die();
+
         $count = M("settleup_marketorder","tab_")
             ->field("pay_time,promote_account,company_belong,real_name,develop_type,game_name,
             sum(pay_amount) pay_amount,sum(company_profit) company_profit,group_id,market_percentage")
@@ -175,8 +178,8 @@ class MarketPercentageController extends ThinkController
             }
 
             $market_percentage = json_decode($value['market_percentage'],true);
-            $data[$key]['performance_revenue'] = number_format($market_percentage['performance_revenue'], 2, '.', '');
-            $data[$key]['appraisal_bonuses'] = number_format($market_percentage['appraisal_bonuses'], 2, '.', '');
+//            $data[$key]['performance_revenue'] = number_format($market_percentage['performance_revenue'], 2, '.', '');
+//            $data[$key]['appraisal_bonuses'] = number_format($market_percentage['appraisal_bonuses'], 2, '.', '');
             //业绩提成
             $data[$key]['performance_commission'] =
                 number_format($value['company_profit']*($market_percentage['develop_commission_ratio']/100) +
@@ -231,7 +234,8 @@ class MarketPercentageController extends ThinkController
 
         $data = M("settleup_marketorder","tab_")
             ->field("tab_settleup_marketorder.id,pay_time,promote_account,company_belong,member.real_name,develop_type,game_name,
-            sum(pay_amount) pay_amount,sum(company_profit) company_profit,group_id,market_percentage,nickname,admin_id")
+            sum(pay_amount) pay_amount,sum(company_profit) company_profit,group_id,market_percentage,nickname,admin_id,
+            sum(if(develop_type = 1, pay_amount, 0)) performance_revenue,sum(if(develop_type = 2, pay_amount, 0)) appraisal_bonuses")
             ->join("left join sys_auth_group_access access on admin_id=access.uid")
             ->join("left join sys_auth_group auth on access.group_id=auth.id")
             ->join("left join sys_member member on access.uid=member.uid");
diff --git a/Application/Admin/View/User/add.html b/Application/Admin/View/User/add.html
index c5b7a2671..755d599e1 100644
--- a/Application/Admin/View/User/add.html
+++ b/Application/Admin/View/User/add.html
@@ -24,7 +24,7 @@
               <td class="r">
                 <input name="real_name" type="text" class="">
                 <!--  <input type="hidden" class="" name="username" value="{$list.username}" > -->
-                <span class="notice-text">管理员账号用于管理后台登录</span>
+                <span class="notice-text">管理员真实姓名</span>
               </td>
             </tr>
             <tr>
diff --git a/Application/Admin/View/User/edit.html b/Application/Admin/View/User/edit.html
index 4b155719e..815296928 100644
--- a/Application/Admin/View/User/edit.html
+++ b/Application/Admin/View/User/edit.html
@@ -23,7 +23,7 @@
               <td class="r">
                 <input name="real_name" value="{$data.real_name}" type="text" class="">
                 <!--  <input type="hidden" class="" name="username" value="{$list.username}" > -->
-                <span class="notice-text">管理员账号用于管理后台登录</span>
+                <span class="notice-text">管理员真实姓名</span>
               </td>
             </tr>
             <tr>