Merge branch 'feature/add_item_other' of wmtx/platform into release

市场业绩提成修正

Application/Admin/Controller/TimingController.class.php

@@ -872,7 +872,7 @@ class TimingController extends AdminController {
 //
         $company_data = M('promote_company','tab_')
             ->field("company_belong")
-            ->where("id=$company_id")
+            ->where("id={$company_id}")
             ->find();
 //
 //        $game_ratio_mould = M("game_ratio_mould","tab_")
@@ -1211,6 +1211,10 @@ class TimingController extends AdminController {
 
                 $ungame_ids = explode(',',$cv['game_ids']);
 
+                if ($cv['end_time'] == 0 || !$cv['end_time']) {
+                    $cv['end_time'] = 99999999999;
+                }
+
                 $use_begin = 0;
                 $use_end = 0;
                 if ($value['is_settlement'] == '0') {
@@ -1347,12 +1351,12 @@ class TimingController extends AdminController {
 //            }
             $promote_data[$key]['is_settlement'] = $value['is_settlement'];
 
+            $promote_data[$key]['promote_amount'] += $specialAmount;
+
             $promote_data[$key]['company_tax'] = ($value['pay_amount']-$promote_data[$key]['cp_amount']- $promote_data[$key]['promote_amount'])*($tax/100);
 
             //毛利
-            $promote_data[$key]['company_profit'] = $value['pay_amount']-$promote_data[$key]['cp_amount']-$promote_data[$key]['promote_amount']-$promote_data[$key]['channel_amount']-$promote_data[$key]['company_tax']-$specialAmount;
-
-            $promote_data[$key]['promote_amount'] += $specialAmount;
+            $promote_data[$key]['company_profit'] = $value['pay_amount']-$promote_data[$key]['cp_amount']-$promote_data[$key]['promote_amount']-$promote_data[$key]['channel_amount']-$promote_data[$key]['company_tax'];
 //            dump($promote_data[$key]['promote_amount']);
             if ($value['promote_id'] == 0) {
 //                $promote_data[$key]['promote_account']='官方渠道';