diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index fe264dc23..2a340888f 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -1332,6 +1332,7 @@ class CompanyStatementPoolController extends ThinkController "statement_pool_num"=>$pool['statement_num'], "statement_info"=>$v['statement_info'], "withdraw_type"=>$v['withdraw_type'], + "remark"=>$v["remark"], ]; $l_id = M("company_lack_statement_info","tab_")->add($lackcompany); @@ -1711,6 +1712,7 @@ class CompanyStatementPoolController extends ThinkController $lfine = 0; $handledata = []; +// dump($st);die(); foreach ($increment_ratio as $key => $value) { @@ -1766,7 +1768,6 @@ class CompanyStatementPoolController extends ThinkController $statement_amount += $sum_money[$key][$v['account']][$gk]-$statement_info[$k]['game_list'][$gk]['withhold']; } else { $statement_lack_amount += $sum_money[$key][$v['account']][$gk]-$statement_info[$k]['game_list'][$gk]['withhold']; - } } @@ -1784,7 +1785,7 @@ class CompanyStatementPoolController extends ThinkController $lfine += $r_data['fine']; } - $model->where(['id'=>$key])->save(['statement_info'=>$statement_info_data,'statement_money'=>$amount+($r_data['reward']?$r_data['reward']:0)-($r_data['fine']?$r_data['fine']:0),'pay_amount'=>$amount,'remark'=>$remark[$key]]); + $model->where(['id'=>$key])->save(['statement_info'=>$statement_info_data,'statement_money'=>$amount+($r_data['reward']?$r_data['reward']:0)-($r_data['fine']?$r_data['fine']:0),'pay_amount'=>$amount,'remark'=>$remark[$key][$st[$key][$akey]]]); $amount = 0; diff --git a/Application/Admin/Controller/OldCountController.class.php b/Application/Admin/Controller/OldCountController.class.php index 49cb28cdd..100bb2b09 100644 --- a/Application/Admin/Controller/OldCountController.class.php +++ b/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]); - - } - - - $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]); + M("company_lack_statement_info","tab_")->where(['id'=>$value['id']])->save(['statement_info'=>$statement_info]); } diff --git a/Application/Admin/View/CompanyStatementPool/editPuPool.html b/Application/Admin/View/CompanyStatementPool/editPuPool.html index cdb9aebdd..e97a16f7d 100644 --- a/Application/Admin/View/CompanyStatementPool/editPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/editPuPool.html @@ -172,8 +172,10 @@ {$com['statement_info'][0]['game_list'][0]['sum_money']} - {$com['reward']} - {$com['fine']} + + + {$com['statement_info'][0]['reward']||default="0"} + {$com['statement_info'][0]['fine']||default="0"} @@ -209,7 +211,7 @@ - +