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

不结算bug修改

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;
 

Application/Admin/View/CompanyStatementPool/editPuPool.html

@@ -211,7 +211,7 @@
                                 </if>
                                 <td rowspan="{$com.row}"><if condition="$com['is_payment'] eq 1">是 <else /> 否 </if></td>
                                 <td rowspan="{$com.row}"><if condition="$com['st'] eq 0">否 <else /> 是 </if></td>
-                                <td rowspan="{$com.row}"><textarea name="remark[{$com['id']}]">{$com.remark}</textarea></td>
+                                <td rowspan="{$com.row}"><textarea name="remark[{$com['id']}][{$com['st']}]">{$com.remark}</textarea></td>
 
                                 <if condition="!$is_export">
                                     <td rowspan="{$com.row}">