市场结算管理优化

Application/Admin/Controller/MarketPercentageController.class.php

@@ -351,6 +351,14 @@ class MarketPercentageController extends ThinkController
             $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'];
 
+            //两个起提流水都没达到时，不展示税后毛利
+            $sum_amount = $value['performance_revenue'] + $value['appraisal_bonuses'];
+            if ($sum_amount<$market_percentage['performance_revenue']&&$sum_amount<$market_percentage['appraisal_bonuses']) {
+                $data[$key]['company_profit'] = "0.00";
+                $value['company_profit'] = "0.00";
+            }
+
+
             if ($market_percentage['time'] == 1) {
 
                 if ($month == '07') {
@@ -487,6 +495,9 @@ class MarketPercentageController extends ThinkController
                 $line = $key+2;
 //                $develop_commission_ratio = $value['develop_commission_ratio']/100;
                 $data[$key]['pay_time'] = '`'.$data[$key]['pay_time'];
+                if ($value['']) {
+
+                }
                 $data[$key]['performance_commission'] = "=ROUND(J{$line}*(F{$line}/100)+J{$line}*(G{$line}/100),2)";
                 $data[$key]['achievement_bonus'] = "=ROUND(J{$line}*(H{$line}/100)+J{$line}*(I{$line}/100),2)";
                 $data[$key]['commission'] = "=ROUND(K{$line}+L{$line},2)";

Application/Home/View/default/Withdraw/withdrawdetail.html

@@ -391,6 +391,7 @@
 
                                 <volist name="statemnt_info" id="s" index="key">
                                     <if condition="$key egt 1">
+                                        <tr >
                                             <td>{$s['game_name']}</td>
                                             <td>{$s['game_type']}</td>
                                             <td>{$s['statement_begin_time']|default="无"}-{$statemnt_info[0]['statement_end_time']|default="无"}</td>
@@ -404,6 +405,7 @@
                                             <td>
                                                 <a href="javascript:;" class="apply" data-id="{$s.id}">查看详情</a>
                                             </td>
+                                        </tr>
                                     </if>
                                 </volist>