diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index 06140f036..e554313b6 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -786,7 +786,7 @@ class CompanyStatementPoolController extends ThinkController //重新计算 $stime = $info['statement_end_time']-0+1; $type = $info['withdraw_type']; - A("CompanyStatementSet")->promoteUserPool($type,$stime,true,$info['is_payment']); + A("CompanyStatementSet")->promoteUserPool($type,$stime,true); M()->commit(); $this->ajaxReturn(array( diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index 6b6558659..85c10b0fa 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -1118,7 +1118,9 @@ class CompanyStatementSetController extends Controller { } if($data['statement_money'] == 0){ $data['verify_status'] = 5; - $data['verify_log'] = json_encode(["create_user"=>"system","create_time"=>date("Y-m-d H:i:s"),"verify_user"=>$op_name,"verify_time"=>date("Y-m-d H:i:s"),"payment_user"=>"system","payment_time"=>date("Y-m-d H:i:s")]); + $data['verify_log'] = json_encode(["create_user"=>$op_name,"create_time"=>date("Y-m-d H:i:s"),"verify_user"=>"system","verify_time"=>date("Y-m-d H:i:s"),"payment_user"=>"system","payment_time"=>date("Y-m-d H:i:s")]); + }else{ + $data['verify_log'] = json_encode(["create_user"=>$op_name,"create_time"=>date("Y-m-d H:i:s")]); } $data['create_lack_ids'] = implode(",",$data['create_lack_ids']); $data['del_lack_ids'] = implode(",",$data['del_lack_ids']); diff --git a/Application/Admin/View/CompanyStatementPool/lists.html b/Application/Admin/View/CompanyStatementPool/lists.html index 1ccc25ea1..d275a57bb 100644 --- a/Application/Admin/View/CompanyStatementPool/lists.html +++ b/Application/Admin/View/CompanyStatementPool/lists.html @@ -155,7 +155,7 @@