From e153fb66ca4c5e3f44c5db794c291db292833378 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Wed, 30 Sep 2020 14:35:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=9A=E5=90=88=E9=87=8D=E6=96=B0=E6=B1=87?= =?UTF-8?q?=E6=80=BBbug=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/AggregateStatementLackController.class.php | 5 ++++- .../Controller/AggregateStatementPoolController.class.php | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/AggregateStatementLackController.class.php b/Application/Admin/Controller/AggregateStatementLackController.class.php index 554e2b790..8ef687187 100644 --- a/Application/Admin/Controller/AggregateStatementLackController.class.php +++ b/Application/Admin/Controller/AggregateStatementLackController.class.php @@ -285,7 +285,9 @@ class AggregateStatementLackController extends ThinkController //设定组合的子操作 protected function setDf(&$savedata,$v) { + $savedata['del_lack_ids'][] = $v['id']; + $savedata['withdraw_type'] = $v['withdraw_type']; unset($v['id']); $v['statement_info'] = json_decode( $v['statement_info'],true); $fine = $v['fine']; @@ -313,10 +315,11 @@ class AggregateStatementLackController extends ThinkController "fine"=>$fine, "reward"=>$reward, "statement_info"=>$v['statement_info'], - "statement_num"=>"JS_".date('Ymd').date('His').$v['company_id'].sp_random_string(5) + "statement_num"=>"JS_".date('Ymd').date('His').$v['company_id'].sp_random_string(5), ]; $savedata['company_list'][$v['company_id']] = $tdata; } + // $savedata['fine'] += $v['fine']; // $savedata['reward'] += $v['reward']; // $savedata['pay_amount'] += $v['pay_amount']; diff --git a/Application/Admin/Controller/AggregateStatementPoolController.class.php b/Application/Admin/Controller/AggregateStatementPoolController.class.php index 10ce92cf5..12e59041b 100644 --- a/Application/Admin/Controller/AggregateStatementPoolController.class.php +++ b/Application/Admin/Controller/AggregateStatementPoolController.class.php @@ -671,6 +671,7 @@ class AggregateStatementPoolController extends ThinkController "is_payment"=>$pool['is_payment'], "statement_pool_num"=>$pool['statement_num'], "statement_info"=>$v['statement_info'], + "withdraw_type"=>$pool['withdraw_type'], ]; $l_id = M("aggregate_lack_statement_info","tab_")->add($lackcompany);