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

市场业绩bug修改

Application/Admin/Controller/TimingController.class.php

@@ -1351,12 +1351,12 @@ class TimingController extends AdminController {
 //            }
             $promote_data[$key]['is_settlement'] = $value['is_settlement'];
 
-            //毛利
-            $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_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'];
 //            dump($promote_data[$key]['promote_amount']);
             if ($value['promote_id'] == 0) {
 //                $promote_data[$key]['promote_account']='官方渠道';