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/View/CompanyStatementPool/editPuPool.html b/Application/Admin/View/CompanyStatementPool/editPuPool.html index 7af8604e3..e97a16f7d 100644 --- a/Application/Admin/View/CompanyStatementPool/editPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/editPuPool.html @@ -211,7 +211,7 @@ - +