Merge branch 'hotfix/bug_repair' of wmtx/platform into master

未结算接口修改

Application/Admin/Controller/OldCountController.class.php

@@ -12,7 +12,7 @@ class OldCountController extends \Think\Controller
 
     public function oldRewardChange() {
 
-        $data = M("company_statement_info","tab_")
+        $data = M("company_lack_statement_info","tab_")
             ->where("(fine > 0 or reward > 0) and company_type = 2")
             ->select();
 
@@ -23,20 +23,7 @@ class OldCountController extends \Think\Controller
             $statement_info[0]['game_list'][0]['reward'] = $value['reward'];
             $statement_info = json_encode($statement_info);
 
-            M("company_statement_info","tab_")->where(['id'=>$value['id']])->save(['statement_info'=>$statement_info]);
+            M("company_lack_statement_info","tab_")->where(['id'=>$value['id']])->save(['statement_info'=>$statement_info]);
-
-        }
-
-
-        $pool_data = M("company_statement_pool",'tab_')->where(['id'=>['in',[22,27]]])->select();
-        foreach ($pool_data as $key => $value) {
-
-            $save = json_decode($value['verify_log'],true);
-            $save['firstverify_user'] = $save['verify_user'];
-            $save['firstverify_time'] = $save['verify_time'];
-            $save = json_encode($save);
-
-            M('company_statement_pool','tab_')->where(['id'=>$value['id']])->save(['verify_log'=>$save]);
 
         }
 

Application/Admin/View/CompanyStatementPool/editPuPool.html

@@ -172,8 +172,10 @@
                                     <td><span class="sum_money_span">{$com['statement_info'][0]['game_list'][0]['sum_money']}</span>
                                         <input class="sum_money" name="sum_money[{$com['id']}][{$com['statement_info'][0]['account']}][]" value="{$com['statement_info'][0]['game_list'][0]['sum_money']}" style="width: 20px;display: none">
                                         <input class="st" name="st[{$com['id']}][{$com['statement_info'][0]['account']}]" value="{$com['st']}" style="width: 20px;display: none"></td>
-                                    <td rowspan="{$com['statement_info'][0]['time_row']}">{$com['reward']}</td>
+<!--                                    <td rowspan="{$com['statement_info'][0]['time_row']}">{$com['reward']}</td>-->
-                                    <td rowspan="{$com['statement_info'][0]['time_row']}">{$com['fine']}</td>
+<!--                                    <td rowspan="{$com['statement_info'][0]['time_row']}">{$com['fine']}</td>-->
+                                    <td rowspan="{$com['statement_info'][0]['time_row']}">{$com['statement_info'][0]['reward']||default="0"}</td>
+                                    <td rowspan="{$com['statement_info'][0]['time_row']}">{$com['statement_info'][0]['fine']||default="0"}</td>
                                     <td rowspan="{$com['statement_info'][0]['time_row']}">
                                       <input class="withhold" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$com['statement_info'][0]['withhold_amount']|default=0}" style="width: 40px;" name="withhold[{$com['id']}][{$com['statement_info'][0]['account']}][{$com['statement_info'][0]['game_list'][0]['statement_begin_time']}]">
                                       <input class="oldwithhold" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$com['statement_info'][0]['withhold_amount']|default=0}" style="width: 40px;display: none" >