From ee6be3b45b42a2ed1883a8ebf0a0b10b1bd0a7c5 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Fri, 17 Jul 2020 14:42:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E4=B8=9A=E7=BB=A9=E6=8F=90?=
 =?UTF-8?q?=E6=88=90=E5=BD=93=E6=B5=81=E6=B0=B4=E4=B8=8D=E8=B6=B3=E8=B5=B7?=
 =?UTF-8?q?=E6=8F=90=E6=B5=81=E6=B0=B4=E6=97=B6=EF=BC=8C=E7=A8=8E=E5=90=8E?=
 =?UTF-8?q?=E6=AF=9B=E5=88=A9=E4=B8=8D=E4=BA=88=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/MarketPercentageController.class.php  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php
index 0c01e5d05..63a95465f 100644
--- a/Application/Admin/Controller/MarketPercentageController.class.php
+++ b/Application/Admin/Controller/MarketPercentageController.class.php
@@ -591,6 +591,9 @@ class MarketPercentageController extends ThinkController
         }
 
         $data = M("market_altogether","tab_")
+            ->field("tab_market_altogether.*,market_percentage")
+            ->join("left join sys_auth_group_access access on tab_market_altogether.admin_id = access.uid")
+            ->join("left join sys_auth_group auth on access.group_id=auth.id")
             ->where($map);
 
         if ($_REQUEST['export']) {
@@ -628,6 +631,8 @@ class MarketPercentageController extends ThinkController
             $data[$key]['start_time'] = date("Y-m-1",strtotime($value['pay_time']));
             $data[$key]['end_time'] = date("Y-m-t",strtotime($value['pay_time']));
 
+            $market_percentage = json_decode($value['market_percentage'],true);
+
             if ($value['level'] == 21) {
                 $data[$key]['level'] = '初级';
             } else if ($value['level'] == 11) {
@@ -642,6 +647,13 @@ class MarketPercentageController extends ThinkController
                 $data[$key]['is_send'] = '未发放';
             }
 
+            //两个起提流水都没达到时，不展示税后毛利
+            $sum_amount = $value['performance_revenue'] + $value['appraisal_bonuses'];
+            if ($sum_amount<$market_percentage['performance_revenue']&&$sum_amount<$market_percentage['appraisal_bonuses']) {
+                $data[$key]['company_profit'] = "0.00";
+                $value['company_profit'] = "0.00";
+            }
+
             $data[$key]['wait_commission'] =
                 number_format($value['wait_performance_commission'] + $value['wait_achievement_commission'], 2, '.', '');