From 5c76d1180d5c6627811db9610f53c3baabbb5b68 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Sat, 4 Jul 2020 16:49:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E4=B8=93=E5=91=98=E4=B8=9A?= =?UTF-8?q?=E7=BB=A9=E7=BB=93=E7=AE=97=E7=BB=93=E6=9E=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/MarketPercentageController.class.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php index dac14829b..0fa2c8660 100644 --- a/Application/Admin/Controller/MarketPercentageController.class.php +++ b/Application/Admin/Controller/MarketPercentageController.class.php @@ -159,7 +159,7 @@ class MarketPercentageController extends ThinkController $all_data = M("market_altogether","tab_") - ->where($map) +// ->where($map) ->select(); $wait_amount = []; foreach ($all_data as $key => $value) { @@ -189,6 +189,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'], 4, '.', ''),0,-2); + $data[$key]['extend_commission'] = $data[$key]['commission'] - $data[$key]['wait_commission']; if ($market_percentage['time'] == 1) { @@ -260,7 +261,7 @@ class MarketPercentageController extends ThinkController $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'] .date("Y-m",strtotime("last month",strtotime($value['pay_time']))).'achievement_bonus']; } // $data[$key]['extend_commission'] = number_format($data[$key]['extend_commission'], 2, '.', ''); - $data[$key]['extend_commission'] = $data[$key]['commission'] - $data[$key]['wait_commission']; +// if ($market_percentage['time'] == 1) { @@ -292,6 +293,7 @@ class MarketPercentageController extends ThinkController } } +// die(); if ($_REQUEST['export']) {