市场专员业绩结算结构修改

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']) {