Merge branch 'hotfix/market_percentage' of wmtx/platform into release

特殊补点加入下游结算中

Application/Admin/Controller/TimingController.class.php

@@ -1153,6 +1153,8 @@ class TimingController extends AdminController {
             //毛利
             $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;
+
             if ($value['promote_id'] == 0) {
 //                $promote_data[$key]['promote_account']='官方渠道';
 //                $promote_data[$key]['company_id']='0';