From 8abf4e4eb8e8be16e6beb38efc11c64b752ef162 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 27 May 2021 14:03:48 +0800 Subject: [PATCH 1/6] =?UTF-8?q?5.27=E6=96=B0=E5=8A=9F=E8=83=BD=E4=B8=8A?= =?UTF-8?q?=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ompanyStatementOfflineController.class.php | 58 ++++++++++++++++--- .../viewstatement.html | 4 +- 2 files changed, 53 insertions(+), 9 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementOfflineController.class.php b/Application/Admin/Controller/CompanyStatementOfflineController.class.php index d7695444b..687deb31a 100644 --- a/Application/Admin/Controller/CompanyStatementOfflineController.class.php +++ b/Application/Admin/Controller/CompanyStatementOfflineController.class.php @@ -564,7 +564,7 @@ class CompanyStatementOfflineController extends ThinkController $saveData = [ "pay_type"=>3, "pay_status"=>1, - "pay_info"=>json_encode(["payment_user"=>$_SESSION['onethink_admin']['user_auth']["username"],"payment_time"=>$payment_time]) + "pay_info"=>json_encode(["payment_user"=>$_SESSION['onethink_admin']['user_auth']["username"],"payment_time"=>$payment_time]),'pay_time'=>time() ]; if($info_id) { $companyStatementInfo->where(['id'=>['in',$info_id]])->save($saveData); @@ -575,6 +575,7 @@ class CompanyStatementOfflineController extends ThinkController "pay_type"=>3, "pay_status"=>2, "pay_info"=>json_encode(["payment_user"=>$_SESSION['onethink_admin']['user_auth']["username"],"payment_time"=>$payment_time]) + ,'pay_time'=>time() ]; $unPayData = SM("company_statement_info_part","tab_") @@ -609,8 +610,8 @@ class CompanyStatementOfflineController extends ThinkController } SM("company_statement_info_part","tab_") - ->where(['info_id'=>$value['id']]) - ->save(["pay_status"=>1]); + ->where(['info_id'=>$value['id'],'pay_status'=>['neq',1]]) + ->save(["pay_status"=>1,'pay_time'=>time()]); if($value['statement_money'] - $handlePayData[$value['id']] <=0) { //打款成功 @@ -619,7 +620,8 @@ class CompanyStatementOfflineController extends ThinkController "pay_type"=>3, "pay_status"=>1, "pay_info"=>json_encode(["payment_user"=>$_SESSION['onethink_admin']['user_auth']["username"],"payment_time"=>$payment_time]), - "remark"=>$saveData['remark'] + "remark"=>$saveData['remark'], + 'pay_time'=>time() ]); } else { $companyStatementInfo->where(['id'=>$value['id']])->save($saveData); @@ -707,7 +709,7 @@ class CompanyStatementOfflineController extends ThinkController $id = $_REQUEST['id']; $CompanyInfo = M("company_statement_info","tab_") ->alias('i') - ->field("i.id,i.pool_id,i.company_name,i.company_info,i.statement_money,i.remark,i.pay_status,i.verify_status,p.statement_num,i.statement_money,i.pay_check") + ->field("i.id,i.pool_id,i.company_name,i.company_info,i.statement_money,i.remark,i.pay_status,i.verify_status,p.statement_num,i.statement_money,i.pay_check,pay_time") ->join("tab_company_statement_pool p ON p.id = i.pool_id") ->where("i.id in({$id}) and (pay_check=1 or pay_check=2)") ->select(); @@ -718,7 +720,7 @@ class CompanyStatementOfflineController extends ThinkController if ($CompanyInfo[0]['id']) { $CompanyInfoSecord = M("company_statement_info_part","tab_") ->alias('i') - ->field("i.id,i.pool_id,i.company_name,i.company_info,i.statement_money,i.remark,i.pay_status,i.verify_status,p.statement_num,i.statement_money,i.pay_check") + ->field("info_id id,i.pool_id,i.company_name,i.company_info,i.statement_money,i.remark,i.pay_status,i.verify_status,p.statement_num,i.statement_money,i.pay_check,pay_time") ->join("tab_company_statement_pool p ON p.id = i.pool_id") ->where("i.info_id ={$CompanyInfo[0]['id']}") ->select(); @@ -727,7 +729,45 @@ class CompanyStatementOfflineController extends ThinkController $CompanyInfo = $CompanyInfoSecord; } - $all_money = 0; + + $unPayData = SM("company_statement_info_part","tab_") + ->field("sum(statement_money) statement_money,info_id") + ->where(["pay_status"=>1,'info_id'=>['in',$_REQUEST['id']]]) + ->group("info_id") + ->select(); + + $handleData = []; + foreach ($unPayData as $key => $value) { + $handleData[$value['info_id']] = $value['statement_money']; + } + + $payData = SM("company_statement_info","tab_") + ->field("id,sum(statement_money) statement_money,pay_status") + ->where(['id'=>['in',$_REQUEST['id']]]) + ->group("id") + ->select(); + + + $handleAllData = []; + foreach ($payData as $key => $value) { + $handleAllData[$value['id']] = $value['statement_money']; + } +// dump($payData); + + $surplurAmount = array_sum($handleData); + $all_money = array_sum($handleAllData); + + foreach ($payData as $key => $value) { + if ($value['pay_status'] == 1) { + $surplurAmount -= $handleData[$value['id']]; + $surplurAmount += $value['statement_money']; + } + + } + + + $sAmount = number_format($all_money-$surplurAmount,2,'.',''); + foreach($CompanyInfo as $k=>&$v){ if($v['verify_status'] == 2){ $v['is_payment'] = 2; @@ -738,11 +778,13 @@ class CompanyStatementOfflineController extends ThinkController $v['company_info'] = json_decode($v['company_info'],true); $v['company_info']['ali_user'] ?? ''; $v['company_info']['ali_account'] ?? ''; + $v['time'] = date("Y-m-d H:i:s",$v['pay_time']); - $all_money += $v['statement_money']; +// $all_money += $v['statement_money']; } + $this->assign('surplur_amount',$sAmount); $this->assign('all_money',$all_money); $this->assign("CompanyInfo",$CompanyInfo); $this->assign("id",$id); diff --git a/Application/Admin/View/CompanyStatementOffline/viewstatement.html b/Application/Admin/View/CompanyStatementOffline/viewstatement.html index 8766e64eb..2cc0926ba 100644 --- a/Application/Admin/View/CompanyStatementOffline/viewstatement.html +++ b/Application/Admin/View/CompanyStatementOffline/viewstatement.html @@ -113,6 +113,7 @@ 关联结算汇总单订单号 结算金额(元) + 打款时间 备注 @@ -135,13 +136,14 @@ {$vo.statement_num} {$vo.statement_money} + {$vo.time} {$vo.remark} 合计: - 结算总金额:{$all_money} + 结算总金额:{$all_money}剩余打款金额:{$surplur_amount} From ad49a9a4194c8775ee8328fc7a9c2b17c952f023 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 27 May 2021 18:12:53 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/GameMarginController.class.php | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/Application/Admin/Controller/GameMarginController.class.php b/Application/Admin/Controller/GameMarginController.class.php index b4fb909da..062412a04 100644 --- a/Application/Admin/Controller/GameMarginController.class.php +++ b/Application/Admin/Controller/GameMarginController.class.php @@ -171,12 +171,16 @@ class GameMarginController extends AdminController private function moreMarginExport($info) { $line = 3; + $dateBing = 3; $excelData = []; $countLineArr = []; foreach ($info as $index => $date) { $marginInfo = json_decode($date['margin_info'],true); - foreach ($marginInfo as $v) { + foreach ($marginInfo as $k=>$v) { // $v["cp_ratio"] = "=ROUND(G{$line}/D{$line},4)"; + if($k == 0){ + $dateBing = $line; + } if($v["pc_pay_amount"] > 0){ $v["pc_ratio"] ="=ROUND(M{$line}/K{$line},2)"; @@ -214,33 +218,33 @@ class GameMarginController extends AdminController "count_year" => $date['count_year'], 'count_month' => $date['count_month'], 'relation_game_name'=>"小计", - "pay_amount"=>"=SUM(D3:D{$line})", + "pay_amount"=>"=SUM(D{$dateBing}:D{$line})", - "cp_statement_amount"=>"=SUM(G3:G{$line})", - "cp_rebate_amount"=>"=SUM(I3:I{$line})", - "cp_other_amount"=>"=SUM(J3:J{$line})", + "cp_statement_amount"=>"=SUM(G{$dateBing}:G{$line})", + "cp_rebate_amount"=>"=SUM(I{$dateBing}:I{$line})", + "cp_other_amount"=>"=SUM(J{$dateBing}:J{$line})", - "pc_pay_amount"=>"=SUM(K3:K{$line})", + "pc_pay_amount"=>"=SUM(K{$dateBing}:K{$line})", "pc_ratio"=>"=ROUND(M{$countLine}/K{$countLine},4)", - "pc_statement_amount"=>"=SUM(M3:M{$line})", - "pc_margin_amount"=>"=SUM(N3:N{$line})", + "pc_statement_amount"=>"=SUM(M{$dateBing}:M{$line})", + "pc_margin_amount"=>"=SUM(N{$dateBing}:N{$line})", "pc_margin_ratio"=>"=ROUND(N{$countLine}/K{$countLine},4)", - "pu_pay_amount"=>"=SUM(P3:P{$line})", - "pu_statement_amount"=>"=SUM(R3:R{$line})", + "pu_pay_amount"=>"=SUM(P{$dateBing}:P{$line})", + "pu_statement_amount"=>"=SUM(R{$dateBing}:R{$line})", "pu_ratio"=>"=ROUND(R{$countLine}/P{$countLine},4)", - "pu_margin_amount"=>"=SUM(S3:S{$line})", + "pu_margin_amount"=>"=SUM(S{$dateBing}:S{$line})", "pu_margin_ratio"=>"=ROUND(S{$countLine}/P{$countLine},4)", "platform_margin_ratio"=>"=ROUND((D{$countLine}-V{$countLine}-G{$countLine}-I{$countLine}-J{$countLine}-M{$countLine}-R{$countLine})/(D{$countLine}-V{$countLine}),4)", - "jh_pay_amount"=>"=SUM(V3:V{$line})", - "jh_statement_amount"=>"=SUM(X3:X{$line})", + "jh_pay_amount"=>"=SUM(V{$dateBing}:V{$line})", + "jh_statement_amount"=>"=SUM(X{$dateBing}:X{$line})", "jh_ratio"=>"=ROUND(X{$countLine}/V{$countLine},4)", - "jh_margin_amount"=>"=SUM(Y3:Y{$line})", + "jh_margin_amount"=>"=SUM(Y{$dateBing}:Y{$line})", "jh_margin_ratio"=>"=ROUND(Y{$countLine}/V{$countLine},4)", "margin_ratio"=>"=ROUND(AB{$countLine}/D{$countLine},4)", - "margin_amount"=>"=SUM(AB3:AB{$line})", + "margin_amount"=>"=SUM(AB{$dateBing}:AB{$line})", ]; $line += 2; @@ -318,6 +322,7 @@ class GameMarginController extends AdminController $allCountData['margin_amount'] = rtrim($allCountData['margin_amount'], ",").")"; $excelData[] = $allCountData; + // dd($excelData); $this->exportExcel($excelData,"毛利分析表汇总"); } private function exportExcel($arr,$title) From a4bf7ff1085a124f46926b803203758eb2cbf50c Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 28 May 2021 10:23:52 +0800 Subject: [PATCH 3/6] =?UTF-8?q?5.27=E6=96=B0=E5=8A=9F=E8=83=BD=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementOfflineController.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementOfflineController.class.php b/Application/Admin/Controller/CompanyStatementOfflineController.class.php index 687deb31a..f12c90358 100644 --- a/Application/Admin/Controller/CompanyStatementOfflineController.class.php +++ b/Application/Admin/Controller/CompanyStatementOfflineController.class.php @@ -564,7 +564,7 @@ class CompanyStatementOfflineController extends ThinkController $saveData = [ "pay_type"=>3, "pay_status"=>1, - "pay_info"=>json_encode(["payment_user"=>$_SESSION['onethink_admin']['user_auth']["username"],"payment_time"=>$payment_time]),'pay_time'=>time() + "pay_info"=>json_encode(["payment_user"=>$_SESSION['onethink_admin']['user_auth']["username"],"payment_time"=>$payment_time]),'pay_time'=>strtotime($payment_time) ]; if($info_id) { $companyStatementInfo->where(['id'=>['in',$info_id]])->save($saveData); @@ -575,7 +575,7 @@ class CompanyStatementOfflineController extends ThinkController "pay_type"=>3, "pay_status"=>2, "pay_info"=>json_encode(["payment_user"=>$_SESSION['onethink_admin']['user_auth']["username"],"payment_time"=>$payment_time]) - ,'pay_time'=>time() + ,'pay_time'=>strtotime($payment_time) ]; $unPayData = SM("company_statement_info_part","tab_") @@ -611,7 +611,7 @@ class CompanyStatementOfflineController extends ThinkController SM("company_statement_info_part","tab_") ->where(['info_id'=>$value['id'],'pay_status'=>['neq',1]]) - ->save(["pay_status"=>1,'pay_time'=>time()]); + ->save(["pay_status"=>1,'pay_time'=>strtotime($payment_time)]); if($value['statement_money'] - $handlePayData[$value['id']] <=0) { //打款成功 @@ -621,7 +621,7 @@ class CompanyStatementOfflineController extends ThinkController "pay_status"=>1, "pay_info"=>json_encode(["payment_user"=>$_SESSION['onethink_admin']['user_auth']["username"],"payment_time"=>$payment_time]), "remark"=>$saveData['remark'], - 'pay_time'=>time() + 'pay_time'=>strtotime($payment_time) ]); } else { $companyStatementInfo->where(['id'=>$value['id']])->save($saveData); From b58bdab7054b39466e7acdbdd72fc1fab48ce335 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 28 May 2021 10:57:04 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=87=91=E9=A2=9D=E9=94=99=E8=AF=AFbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/CompanyStatementOfflineController.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/CompanyStatementOfflineController.class.php b/Application/Admin/Controller/CompanyStatementOfflineController.class.php index f12c90358..2d7797e19 100644 --- a/Application/Admin/Controller/CompanyStatementOfflineController.class.php +++ b/Application/Admin/Controller/CompanyStatementOfflineController.class.php @@ -165,7 +165,7 @@ class CompanyStatementOfflineController extends ThinkController ->join("tab_company_statement_pool as p ON c.pool_id = p.id") ->where($map) ->find(); - + unset($map['c.pay_status']); $countSuccess = SM("company_statement_info_part","tab_")->alias("c") ->field("IFNULL(SUM(CASE WHEN c.pay_status = 0 THEN c.statement_money ELSE 0 END),0) as statement_money, IFNULL(SUM(CASE WHEN c.pay_status = 1 THEN c.statement_money ELSE 0 END),0) as success_money") @@ -181,6 +181,7 @@ class CompanyStatementOfflineController extends ThinkController $count['statement_money'] -= $countSuccess['success_money']; $count['error_money'] += $countPart['error_money']; + $params['p'] = $page; $params['row'] = $row; $page = set_pagination($count['count'], $row, $params); From b1c82bfd695e2ee4bde60c6db1f79b36c9c6714a Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 28 May 2021 11:05:07 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=87=91=E9=A2=9D=E9=94=99=E8=AF=AFbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/CompanyStatementOfflineController.class.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Application/Admin/Controller/CompanyStatementOfflineController.class.php b/Application/Admin/Controller/CompanyStatementOfflineController.class.php index 2d7797e19..cc1da063f 100644 --- a/Application/Admin/Controller/CompanyStatementOfflineController.class.php +++ b/Application/Admin/Controller/CompanyStatementOfflineController.class.php @@ -165,7 +165,9 @@ class CompanyStatementOfflineController extends ThinkController ->join("tab_company_statement_pool as p ON c.pool_id = p.id") ->where($map) ->find(); + unset($map['c.pay_status']); + $countSuccess = SM("company_statement_info_part","tab_")->alias("c") ->field("IFNULL(SUM(CASE WHEN c.pay_status = 0 THEN c.statement_money ELSE 0 END),0) as statement_money, IFNULL(SUM(CASE WHEN c.pay_status = 1 THEN c.statement_money ELSE 0 END),0) as success_money") @@ -175,8 +177,13 @@ class CompanyStatementOfflineController extends ThinkController ->where(['i.pay_status'=>['neq',1]]) ->find(); + if ($_REQUEST['pay_status'] == 1) { + $countSuccess = []; + } + // dump($countPart); // dump($countSuccess);die(); +// dump($count);die(); $count['success_money'] += $countSuccess['success_money']; $count['statement_money'] -= $countSuccess['success_money']; $count['error_money'] += $countPart['error_money']; From 80e02733e7dda3991718bffb69bf385c7ff9d242 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Sat, 29 May 2021 14:16:24 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=B0=81=E7=A6=81=E6=8E=A8=E5=B9=BF?= =?UTF-8?q?=E5=91=98=E6=8E=A8=E5=B9=BF=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Service/MendService.class.php | 3 +++ Application/Base/Service/TestingResourceService.class.php | 3 ++- Application/Home/Controller/HomeController.class.php | 6 +++++- Application/Home/Controller/PackageController.class.php | 6 +++++- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Application/Base/Service/MendService.class.php b/Application/Base/Service/MendService.class.php index 40e65b580..0e4692179 100644 --- a/Application/Base/Service/MendService.class.php +++ b/Application/Base/Service/MendService.class.php @@ -39,6 +39,9 @@ class MendService if ($orderTime == '') { throw new \Exception('没有订单日期'); } + if (strtotime($orderTime) > time()) { + throw new \Exception('订单时间不能大于今天'); + } if ($permPromote) { $levelColumn = 'level'. $permPromote['level'] . '_id'; diff --git a/Application/Base/Service/TestingResourceService.class.php b/Application/Base/Service/TestingResourceService.class.php index f1a5e191c..34a5ffb69 100644 --- a/Application/Base/Service/TestingResourceService.class.php +++ b/Application/Base/Service/TestingResourceService.class.php @@ -120,11 +120,12 @@ class TestingResourceService $orderData['provide_status'] = 2; } else { $orderData['provide_status'] = 1; + $provideAmount += $order['amount']; } } else { $orderData['provide_status'] = 1; + $provideAmount += $order['amount']; } - $provideAmount += $order['amount']; $orderData['provide_time'] = time(); M('testing_resource_order', 'tab_') ->where(['id' => $order['id']]) diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index 8681a24af..a79be52b0 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -203,11 +203,15 @@ class HomeController extends Controller $promoteId = $data['promote_id']; } - $promote = M('promote', 'tab_')->field(['id', 'parent_id', 'chain', 'level'])->where(['id' => $promoteId])->find(); + $promote = M('promote', 'tab_')->field(['id', 'account', 'parent_id', 'chain', 'level'])->where(['id' => $promoteId])->find(); if (!$promote) { $this->error('该链接已失效'); } + if ($promote['account'] == 'yl3xiaojian') { + $this->error('链接无效'); + } + $promoteService = new PromoteService(); if (!$promoteService->checkPromoteLimitRule($promote)) { $this->error('链接已失效'); diff --git a/Application/Home/Controller/PackageController.class.php b/Application/Home/Controller/PackageController.class.php index c0d2407bb..97289e22e 100644 --- a/Application/Home/Controller/PackageController.class.php +++ b/Application/Home/Controller/PackageController.class.php @@ -55,11 +55,15 @@ class PackageController extends Controller $promoteId = $data['promote_id']; } - $promote = M('promote', 'tab_')->field(['id', 'parent_id', 'chain', 'level'])->where(['id' => $promoteId])->find(); + $promote = M('promote', 'tab_')->field(['id', 'account', 'parent_id', 'chain', 'level'])->where(['id' => $promoteId])->find(); if (!$promote) { $this->error('该链接已失效'); } + if ($promote['account'] == 'yl3xiaojian') { + $this->error('链接无效'); + } + $promoteService = new PromoteService(); if (!$promoteService->checkPromoteLimitRule($promote)) { $this->error('链接已失效');