From 8b4814cbf5340372822f55527a700c15c6258703 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 1 Feb 2021 15:19:15 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/CompanyStatementOfflineController.class.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementOfflineController.class.php b/Application/Admin/Controller/CompanyStatementOfflineController.class.php index 940c312c6..8879eb6a5 100644 --- a/Application/Admin/Controller/CompanyStatementOfflineController.class.php +++ b/Application/Admin/Controller/CompanyStatementOfflineController.class.php @@ -67,7 +67,7 @@ class CompanyStatementOfflineController extends ThinkController ->alias("c") ->field("c.*,p.statement_num,p.verify_status") ->where($map) - ->where(['p.verify_status'=>['neq',6]]) + ->where('p.verify_status <> 6') ->join("tab_company_statement_pool as p ON c.pool_id = p.id") ->order("id desc") ->select(); @@ -81,10 +81,8 @@ class CompanyStatementOfflineController extends ThinkController ->alias("c") ->field("c.*,p.statement_num,p.verify_status") ->where($map) - ->where(['p.verify_status'=>['neq',6]]) - + ->where('p.verify_status <> 6') ->join("tab_company_statement_pool as p ON c.pool_id = p.id") - ->page($page,$row) ->order("id desc") ->select(); From a10174b3e6ae46f4527eade5acd5b0e252818452 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 1 Feb 2021 17:12:46 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=93=E6=AC=BE?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=99=BB=E9=99=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Payment/Controller/PublicController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Payment/Controller/PublicController.class.php b/Application/Payment/Controller/PublicController.class.php index 8b39453d8..4e26a57ee 100644 --- a/Application/Payment/Controller/PublicController.class.php +++ b/Application/Payment/Controller/PublicController.class.php @@ -130,7 +130,7 @@ class PublicController extends \Think\Controller public function checksafecode($phone, $code) { //测试验证码 - if($code == "txsb0601"){ + if(C('PAYMENT_MOBILE_DEBUG') && $code === C('PAYMENT_MOBILE_DEBUG')){ return true; } $taskClient = new TaskClient(); From 926b8975f1db5846f47effd15c7b1c16b4a62e1b Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 2 Feb 2021 14:21:37 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8D=E8=AF=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Payment/View/ExcelPayment/lists.html | 2 +- Application/Payment/View/Payment/lists.html | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Application/Payment/View/ExcelPayment/lists.html b/Application/Payment/View/ExcelPayment/lists.html index 642808597..22a090899 100644 --- a/Application/Payment/View/ExcelPayment/lists.html +++ b/Application/Payment/View/ExcelPayment/lists.html @@ -145,7 +145,7 @@
+
+ +
+
From 0c54e6ecb7b2dad56ab6ba74b73a782b70b96ed7 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 2 Feb 2021 16:50:09 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E6=9F=A5=E6=89=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Payment/Controller/PaymentController.class.php | 10 ++++++++++ Application/Payment/View/Payment/lists.html | 7 ++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Application/Payment/Controller/PaymentController.class.php b/Application/Payment/Controller/PaymentController.class.php index 08f953372..bd7294ee4 100644 --- a/Application/Payment/Controller/PaymentController.class.php +++ b/Application/Payment/Controller/PaymentController.class.php @@ -73,6 +73,16 @@ class PaymentController extends BaseController $map['s.verify_time'] = ['ELT', strtotime($_REQUEST['verifytime_end']) + 86399]; } + if(isset($_REQUEST['statement_num'])){ + $statement_num = $_REQUEST['statement_num']; + $pool_ids = M("company_statement_pool","tab_")->where("statement_num like '%{$statement_num}%'")->getField("id",true); + if(!empty($pool_ids)){ + $map['s.pool_id'] = ['in', $pool_ids]; + }else{ + $map['s.pool_id'] = 0; + } + } + if(isset($_REQUEST['company_type'])){ $map['s.company_type'] = $_REQUEST['company_type']; } diff --git a/Application/Payment/View/Payment/lists.html b/Application/Payment/View/Payment/lists.html index e1b963bf9..7b5ae0576 100644 --- a/Application/Payment/View/Payment/lists.html +++ b/Application/Payment/View/Payment/lists.html @@ -181,11 +181,8 @@
- -
- - - + +
 -  From fa514335cd7fea36ec37000ce29fd0b361235dd0 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 2 Feb 2021 16:57:33 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=89=93=E6=AC=BE?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Payment/View/ExcelPayment/lists.html | 2 +- Application/Payment/View/Payment/lists.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Payment/View/ExcelPayment/lists.html b/Application/Payment/View/ExcelPayment/lists.html index 22a090899..e4e140aae 100644 --- a/Application/Payment/View/ExcelPayment/lists.html +++ b/Application/Payment/View/ExcelPayment/lists.html @@ -258,7 +258,7 @@ 合计 - 打款成功金额: {$money.success_money}  /  待打款金额: {$money.statement_money}  /  打款失败金额: {$money.error_money} + 待打款金额: {$money.statement_money}    打款成功金额: {$money.success_money}    打款失败金额: {$money.error_money} diff --git a/Application/Payment/View/Payment/lists.html b/Application/Payment/View/Payment/lists.html index 7b5ae0576..e55b532f0 100644 --- a/Application/Payment/View/Payment/lists.html +++ b/Application/Payment/View/Payment/lists.html @@ -325,7 +325,7 @@ - 合计待打款金额: {$sum['unpay_amount']|default='0.00'}  打款成功金额: {$sum['pay_amount']|default='0.00'} 打款失败金额: {$sum['faild_pay_amount']|default='0.00'} + 合计待打款金额: {$sum['unpay_amount']|default='0.00'}    打款成功金额: {$sum['pay_amount']|default='0.00'}    打款失败金额: {$sum['faild_pay_amount']|default='0.00'} From 35c25119e42cf179a375e1e538756bb201108a64 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 2 Feb 2021 17:12:49 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=BA=BF=E4=B8=8B=E6=89=93=E6=AC=BE=E5=90=88?= =?UTF-8?q?=E8=AE=A1=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementOfflineController.class.php | 13 ++++++++++--- .../Admin/View/CompanyStatementOffline/lists.html | 11 ++++++++++- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementOfflineController.class.php b/Application/Admin/Controller/CompanyStatementOfflineController.class.php index 8879eb6a5..e2bd1aecf 100644 --- a/Application/Admin/Controller/CompanyStatementOfflineController.class.php +++ b/Application/Admin/Controller/CompanyStatementOfflineController.class.php @@ -47,6 +47,9 @@ class CompanyStatementOfflineController extends ThinkController $time_end = strtotime($_REQUEST['time_end'])+ 86399; $map["_string"] = "(c.statement_begin_time <= {$time_end} ) OR (c.statement_end_time <= {$time_end})"; } + if(isset($_REQUEST['pay_status'])){ + $map['c.pay_status'] = $_REQUEST['pay_status']; + } //其他 if(isset($_REQUEST['company_type'])){ @@ -115,9 +118,12 @@ class CompanyStatementOfflineController extends ThinkController $v['oplist'] = $this->OpAuth($v); } - - $count = SM("company_statement_info","tab_")->alias("c")->field("count(c.id) count,sum(c.statement_money) statement_money")->join("tab_company_statement_pool as p ON c.pool_id = p.id")->where($map)->find(); - // dd($count); + //pay_status + $field = "count(c.id) count,IFNULL(SUM(CASE WHEN pay_status = 1 THEN c.statement_money ELSE 0 END),0) as success_money, + IFNULL(SUM(CASE WHEN pay_status = 0 THEN c.statement_money ELSE 0 END),0) as statement_money, + IFNULL(SUM(CASE WHEN pay_status = -1 THEN c.statement_money ELSE 0 END),0) as error_money"; + $count = SM("company_statement_info","tab_")->alias("c")->field($field)->join("tab_company_statement_pool as p ON c.pool_id = p.id")->where($map)->find(); + $params['p'] = $page; $params['row'] = $row; $page = set_pagination($count['count'], $row, $params); @@ -128,6 +134,7 @@ class CompanyStatementOfflineController extends ThinkController $this->assign('data',$data); $this->assign('count',$count); $this->assign('CompanyType',$this->CompanyType); + $this->assign("PayStatus", $this->PayStatus); $this->display(); } diff --git a/Application/Admin/View/CompanyStatementOffline/lists.html b/Application/Admin/View/CompanyStatementOffline/lists.html index d7805a15b..b14365a3a 100644 --- a/Application/Admin/View/CompanyStatementOffline/lists.html +++ b/Application/Admin/View/CompanyStatementOffline/lists.html @@ -117,6 +117,14 @@
 
+
+ +
  @@ -195,7 +203,8 @@ - 合计结算总金额: {$count.statement_money} + 合计待打款金额: {$count.statement_money}    打款成功金额: {$count.success_money}    打款失败金额: {$count.error_money} + From 4a80ee2f87892a88941d0cc94103b5240e9afe4f Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 2 Feb 2021 18:00:20 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=AC=E4=BC=9A?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/View/FinancePromote/index.html | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/Application/Admin/View/FinancePromote/index.html b/Application/Admin/View/FinancePromote/index.html index a5f4f39aa..4094d65e6 100644 --- a/Application/Admin/View/FinancePromote/index.html +++ b/Application/Admin/View/FinancePromote/index.html @@ -76,12 +76,30 @@ display: block; } + .main-place .question_content:before{ + right: 20px; + left: auto; + }

公会统计

-

说明：公会相关统计不含不参与结算的订单数据

+

说明：公会相关统计

+
+ ? +
    +
  • 数据相关说明
    • +
  • + 不结算充值合计: + 该工会未推广的游戏所产生的流水将被记为不结算充值 +
    • +
  • + 下游结算: + 下游结算时不包含不结算订单 +
    • +
+