From 414f471ac16830a26b2db445733f33a46d880666 Mon Sep 17 00:00:00 2001 From: zyx Date: Fri, 1 Nov 2019 09:53:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=A0=8F=E6=96=87?= =?UTF-8?q?=E5=AD=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Finance/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/Finance/index.html b/Application/Admin/View/Finance/index.html index 26153b1d2..fbc07a9c7 100644 --- a/Application/Admin/View/Finance/index.html +++ b/Application/Admin/View/Finance/index.html @@ -135,7 +135,7 @@
平台币流水平台币所支付的流水
-
内充流水管理后台下发的所有平台币，绑定币流水（平台币订单-后台发放（玩家/推广员），绑币订单-后台发放（玩家）,平台币回收与绑币回收需要进行扣除
+
内充流水管理后台下发的所有平台币，绑定币流水（平台币订单-后台发放（玩家/推广员）），绑币订单-后台发放（玩家）,平台币回收与绑币回收需要进行扣除
总流水现金流水+平台币流水+内充流水
From b4b4e7bc00a65456d7134d2b17998165349f8ceb Mon Sep 17 00:00:00 2001 From: chenzhi <“chenzhi063@qq.com> Date: Fri, 1 Nov 2019 10:16:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BC=BA=E5=88=B6?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SpendCountSetController.class.php | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/SpendCountSetController.class.php b/Application/Admin/Controller/SpendCountSetController.class.php index 33aedc6ec..881c9f03c 100644 --- a/Application/Admin/Controller/SpendCountSetController.class.php +++ b/Application/Admin/Controller/SpendCountSetController.class.php @@ -17,11 +17,13 @@ class SpendCountSetController extends \Think\Controller public function _initialize(){ //初始化 $this->beginThismonth = mktime(0,0,0,date('m')-1,1,date('Y')); - $this->endThismonth = mktime(0,0,0,date('m')-1,date('t'),date('Y'))-1; + $this->endThismonth = mktime(0,0,0,date('m'),1,date('Y'))-1; $this->date = date('Y')."-".((date('m')-1) > 9 ? (date('m')-1) : "0".(date('m')-1)); $this->nowdata =time(); $this->model =M("spend_count",'tab_'); $this->usermodel =M("spend_user_count",'tab_'); + $this->monthmodel =M("spend_month_count",'tab_'); + } /** * TODO:仅供测试，测试结束后删除 @@ -36,9 +38,28 @@ class SpendCountSetController extends \Think\Controller $tarry = explode('-',$month); $this->beginThismonth=mktime(0,0,0,$tarry[1],1,$tarry[0]); $this->endThismonth=mktime(0,0,0,$tarry[1]-0+1,1,$tarry[0])-1; - + $this->reCount(); $this->setSpendCount(); } + /** + * 强制重新聚合 + */ + public function reCount() + { + $recount = I("recount"); + if(empty($recount) || $recount != 1){return ;} + # code... + //清理之前的聚合 + $temp =array( + "count_date"=>$this->date + ); + + $this->model->where($temp)->delete(); + $this->usermodel->where($temp)->delete(); + $this->monthmodel->where($temp)->delete(); + echo "重置成功执行重新生成:"; + } + /** * 每个月的统计接口 @@ -608,6 +629,7 @@ class SpendCountSetController extends \Think\Controller ); $add = M("provide","tab_")->field("sum(amount) amount")->where($map)->find()['amount']; $add || $add=0; + $jq = M("deduct_bind_record","tab_")->field("sum(quantity) quantity")->where(array( "create_time"=> array('BETWEEN',array($this->beginThismonth, $this->endThismonth)) From 27e8a0c0b5ed3bf396033ba4fef22111b0cb4473 Mon Sep 17 00:00:00 2001 From: zyx Date: Fri, 1 Nov 2019 10:16:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=A0=8F=E6=96=87?= =?UTF-8?q?=E5=AD=97=E8=B0=83=E6=95=B4,=E7=BB=84=E9=95=BF=E6=B8=A0?= =?UTF-8?q?=E9=81=93=E4=B8=8E=E6=8E=A8=E5=B9=BF=E5=91=98=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E5=AD=97=E6=8F=90=E7=A4=BA=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/View/Finance/gameFinance.html | 2 +- .../Admin/View/Finance/getParentUser.html | 49 +++++++++++++++++-- .../Admin/View/Finance/getPromoteUser.html | 48 ++++++++++++++++-- .../Admin/View/Finance/getRootUser.html | 2 +- 4 files changed, 91 insertions(+), 10 deletions(-) diff --git a/Application/Admin/View/Finance/gameFinance.html b/Application/Admin/View/Finance/gameFinance.html index daf1fad0b..a49331e4a 100644 --- a/Application/Admin/View/Finance/gameFinance.html +++ b/Application/Admin/View/Finance/gameFinance.html @@ -131,7 +131,7 @@
平台币流水平台币所支付的流水
-
内充消耗绑币消费所产生的流水（游戏订单-游戏充值-绑定币充值）
+
内充消耗绑币消费所产生的流水
总流水现金流水+平台币流水+内充流水
diff --git a/Application/Admin/View/Finance/getParentUser.html b/Application/Admin/View/Finance/getParentUser.html index 726385295..ea1e0f0bf 100644 --- a/Application/Admin/View/Finance/getParentUser.html +++ b/Application/Admin/View/Finance/getParentUser.html @@ -25,6 +25,47 @@ height:26px;line-height:26px;font-size:12px; } .select2-results__option[aria-selected] {font-size:12px;} + + .tooltip { + position: relative; + display: inline-block; + color: #056dae; + } + + .tooltip .tooltiptext { + visibility: hidden; + width: 250%; + background-color: #fff; + color: #fff; + text-align: center; + border-radius: 6px; + padding: 5px 0; + position: absolute; + z-index: 1; + bottom: 80%; + left: 0; + margin-left: -70%; + border: #000 solid 1px; + } + + .tooltip .tooltiptext::after { + content: ""; + position: absolute; + top: 100%; + left: 50%; + margin-left: -5px; + border-width: 5px; + border-style: solid; + border-color: black transparent transparent transparent; + } + + .tooltip:hover .tooltiptext { + + color: #000; + visibility: visible; + line-height: 20px; + } + @@ -69,13 +110,13 @@ 组长渠道 - 游戏现金流水 +
游戏现金流水第三方支付（微信，支付宝，快捷）。
- 平台币流水 +
平台币流水平台币所支付的流水
- 内充发放 +
内充发放平台直接下放给公会的平台币
- 总流水 +
总流水现金流水+平台币流水+内充流水
操作 diff --git a/Application/Admin/View/Finance/getPromoteUser.html b/Application/Admin/View/Finance/getPromoteUser.html index 0dca08660..5108b5b77 100644 --- a/Application/Admin/View/Finance/getPromoteUser.html +++ b/Application/Admin/View/Finance/getPromoteUser.html @@ -25,6 +25,46 @@ height:26px;line-height:26px;font-size:12px; } .select2-results__option[aria-selected] {font-size:12px;} + + .tooltip { + position: relative; + display: inline-block; + color: #056dae; + } + + .tooltip .tooltiptext { + visibility: hidden; + width: 250%; + background-color: #fff; + color: #fff; + text-align: center; + border-radius: 6px; + padding: 5px 0; + position: absolute; + z-index: 1; + bottom: 80%; + left: 0; + margin-left: -70%; + border: #000 solid 1px; + } + + .tooltip .tooltiptext::after { + content: ""; + position: absolute; + top: 100%; + left: 50%; + margin-left: -5px; + border-width: 5px; + border-style: solid; + border-color: black transparent transparent transparent; + } + + .tooltip:hover .tooltiptext { + + color: #000; + visibility: visible; + line-height: 20px; + } @@ -61,13 +101,13 @@ 推广员渠道 - 游戏现金流水 +
游戏现金流水第三方支付（微信，支付宝，快捷）。
- 平台币流水 +
平台币流水平台币所支付的流水
- 内充发放 +
内充发放平台直接下放给公会的平台币
- 总流水 +
总流水现金流水+平台币流水+内充流水
操作 diff --git a/Application/Admin/View/Finance/getRootUser.html b/Application/Admin/View/Finance/getRootUser.html index a3947785d..1201c5762 100644 --- a/Application/Admin/View/Finance/getRootUser.html +++ b/Application/Admin/View/Finance/getRootUser.html @@ -115,7 +115,7 @@
平台币流水平台币所支付的流水
-
内充发放平台直接下放给公会（平台币订单-后台发放（推广员））的平台币 +
内充发放平台直接下放给公会的平台币
总流水现金流水+平台币流水+内充流水