From f32d51480f1a09346de1f0ecda169d8660b2ce4d Mon Sep 17 00:00:00 2001 From: liyang <316606755@qq.com> Date: Mon, 12 Apr 2021 20:32:50 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E7=8E=A9=E5=AE=B6=E5=88=97=E8=A1=A8?= =?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/MemberController.class.php | 20 ++++++++++++++----- Application/Admin/View/Member/user_info.html | 11 ++++++++++ 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index 5af746288..072918190 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -139,7 +139,7 @@ class MemberController extends ThinkController $this->checkListOrCountAuthRestMap($map,["tab_user.id","tab_user.account","tab_user.device_number"]); //计算用户列表 $data = M("user","tab_") - ->field("tab_user.id,`device_number`,`age_status`,tab_user.account,`balance`,`gold_coin`,`alipay`,tab_user.promote_id,`register_type`,tab_user.promote_account,`register_time`,`lock_status`,lock_remark, + ->field("tab_user.id,`device_number`,`device_type`,`age_status`,tab_user.account,`balance`,`gold_coin`,`alipay`,tab_user.promote_id,`register_type`,tab_user.promote_account,`register_time`,`lock_status`,lock_remark, `register_way`,`register_ip`,`login_time`,`check_status`,IFNULL(ss.pay_amount,0) AS recharge_total,tab_user.is_repeat,promote.admin_id") ->where($map) ->group("tab_user.id") @@ -214,13 +214,14 @@ class MemberController extends ThinkController $v['lock_status'] = get_info_status($v['lock_status'],4); $v['check_status'] = $v['check_status']==1 ? "正常" :"拉黑"; $v['is_repeat'] = $v['is_repeat']==1 ? "是" :"否"; + $v['device_type'] = $v['device_type'] == 1 ? "安卓" :($v['device_type'] == 2 ? "IOS" :"未知"); $v['market_admin_username'] = isset($adminList[$v['promote_id']]) && $adminList[$v['promote_id']]['admin'] ? $adminList[$v['promote_id']]['admin']['username'] : '无'; } $field = array( "id"=>"账号ID","account"=>"玩家账号","promote_account"=>"所属推广员","market_admin_username"=>"所属市场专员","balance"=>"账户平台币","recharge_total"=>"累计充值","gold_coin"=>"金币", "small_count"=>"小号","vip_level"=>"VIP等级","register_type"=>"注册方式","register_time"=>"注册时间","register_ip"=>"注册IP","login_time"=>"最后登录时间", - "device_number"=>"设备号","is_repeat"=>"去重数据","lock_remark"=>"锁定备注","lock_status"=>"账号状态","check_status"=>"拉黑状态" + "device_number"=>"设备号","device_type"=>"设备类型","is_repeat"=>"去重数据","lock_remark"=>"锁定备注","lock_status"=>"账号状态","check_status"=>"拉黑状态" ); if ($showMarketAdmin == 0) { unset($field['market_admin_username']); @@ -739,7 +740,12 @@ class MemberController extends ThinkController ->where($map) ->setField('phone', $_POST['phone']); if ($pro !== false) { - $this->userEditOperationLog($_POST['id']); + // $this->userEditOperationLog($_POST['id']); + addOperationLog(array( + "op_type"=>1, + "key"=>get_user_account($_POST['id']).'的手机号修改为：'.$_POST['phone'], + "url"=>U("Member/edit",array("id"=>$_POST['id'])), + )); $this->ajaxReturn(array("status" => 1, "msg" => "手机修改成功")); } else { $this->ajaxReturn(array("status" => 0, "msg" => "手机修改失败")); @@ -761,7 +767,7 @@ class MemberController extends ThinkController if ($pro !== false) { addOperationLog(array( "op_type"=>1, - "key"=>get_user_account($_POST['id']), + "key"=>get_user_account($_POST['id']).'的真实姓名修改为：'.$_POST['real_name'], "url"=>U("Member/edit",array("id"=>$_POST['id'])), "menu"=>"用户-玩家组-玩家列表-编辑-真实姓名修改", )); @@ -790,7 +796,11 @@ class MemberController extends ThinkController ->where($map) ->setField('idcard', $_POST['idcard']); if ($pro !== false) { - $this->userEditOperationLog($_POST['id']); + addOperationLog(array( + "op_type"=>1, + "key"=>get_user_account($_POST['id']).'的身份证号码修改为：'.$_POST['idcard'], + "url"=>U("Member/edit",array("id"=>$_POST['id'])), + )); $this->ajaxReturn(array("status" => 1, "msg" => "身份证号码修改成功")); } else { $this->ajaxReturn(array("status" => 0, "msg" => "身份证号码修改失败")); diff --git a/Application/Admin/View/Member/user_info.html b/Application/Admin/View/Member/user_info.html index cba880772..2c2cddab2 100644 --- a/Application/Admin/View/Member/user_info.html +++ b/Application/Admin/View/Member/user_info.html @@ -254,6 +254,7 @@ 注册IP 最后登录时间 设备号 + 设备类型 去重数据 锁定备注 账号状态 @@ -348,6 +349,16 @@ + + + 安卓 + + IOS + + 未知 + + + 是 From 9080d521fda55527f2a1886f626ab144ef8fa5e8 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 15 Apr 2021 09:41:24 +0800 Subject: [PATCH 2/9] =?UTF-8?q?4.22=E5=8F=B7=E5=8A=9F=E8=83=BD=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementSetController.class.php | 9 ++ .../MarketPercentageController.class.php | 59 +++++----- .../StatementMangementController.class.php | 104 +++++++++++++++++- .../View/CompanyStatementPool/editCpPool.html | 27 ++++- .../View/CompanyStatementPool/editPcPool.html | 40 +++++-- .../View/CompanyStatementPool/editPuPool.html | 27 ++++- .../editSpecialPuPool.html | 44 ++++++-- .../StatementMangement/rewardManageList.html | 63 ++++++++++- .../Factory/LeavePercentageFactory.class.php | 31 ++++++ 9 files changed, 345 insertions(+), 59 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index ecd82bd39..02e956cf5 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -380,12 +380,15 @@ class CompanyStatementSetController extends Controller { "company_type"=>1, "company_id"=>$add_data['company_id'], "settlement_type"=>2, + "is_verify"=>1, ); $rfres = M("RewardDetail","tab_") ->field(" IFNULL(SUM(CASE WHEN type = 1 THEN amount ELSE 0 END),0) as reward_count, IFNULL(SUM(CASE WHEN type = 2 THEN amount ELSE 0 END),0) as fine_count ") + + ->join('tab_reward_record as r on d.record_id = r.id', 'LEFT') ->where($rrmap)->find(); if($rfres['reward_count'] > 0){ $reward_count = $rfres['reward_count']; @@ -892,12 +895,14 @@ class CompanyStatementSetController extends Controller { "company_type"=>2, "company_id"=>$add_data['company_id'], "settlement_type"=>2, + "is_verify"=>1, ); $rfres = M("RewardDetail","tab_") ->field(" IFNULL(SUM(CASE WHEN type = 1 THEN amount ELSE 0 END),0) as reward_count, IFNULL(SUM(CASE WHEN type = 2 THEN amount ELSE 0 END),0) as fine_count ") + ->join('tab_reward_record as r on d.record_id = r.id', 'LEFT') ->where($rrmap)->find(); if($rfres['reward_count'] > 0){ $reward_count = $rfres['reward_count']; @@ -2098,6 +2103,7 @@ class CompanyStatementSetController extends Controller { "d.company_type"=>2, "d.company_id"=>$cpmpamy_id, "d.settlement_type"=>2, + "is_verify"=>1, // "relation_game_id"=>$relation_game_id, ); @@ -2146,6 +2152,7 @@ class CompanyStatementSetController extends Controller { "d.company_type"=>1, "d.company_id"=>$cpmpamy_id, "d.settlement_type"=>2, + "is_verify"=>1, // "relation_game_id"=>$relation_game_id, ); @@ -2177,12 +2184,14 @@ class CompanyStatementSetController extends Controller { "d.company_type"=>2, "d.company_id"=>$cpmpamy_id, "d.settlement_type"=>2, + "is_verify"=>1, ); $rfres = M("RewardDetail","tab_") ->alias("d") ->field(" IFNULL(SUM(CASE WHEN type = 1 THEN amount ELSE 0 END),0) as reward, IFNULL(SUM(CASE WHEN type = 2 THEN amount ELSE 0 END),0) as fine") + ->join('tab_reward_record as r on d.record_id = r.id', 'LEFT') ->where($rrmap) ->group("company_id") ->find(); diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php index 0c161cba5..3d5f54ea1 100644 --- a/Application/Admin/Controller/MarketPercentageController.class.php +++ b/Application/Admin/Controller/MarketPercentageController.class.php @@ -757,12 +757,18 @@ class MarketPercentageController extends ThinkController continue; } } +// if ($value['admin_id'] == 27) { +// dump($this->leavePercentage->isSettlement($value['pay_time'],$value['admin_id'])); +// } // dump($this->leavePercentage->isSettlement($value['pay_time'],$value['admin_id'])); //离职结算判断 !($this->leavePercentage->isSettlement($value['pay_time'],$value['admin_id']))?($data[$key]['performance_commission']='0.00'):''; !($this->leavePercentage->isSettlement($value['pay_time'],$value['admin_id']))?($data[$key]['achievement_bonus']='0.00'):''; + !($this->leavePercentage->isSettlement($value['pay_time'],$value['admin_id']))?($value['wait_performance_commission']='0.00'):''; !($this->leavePercentage->isSettlement($value['pay_time'],$value['admin_id']))?($value['wait_achievement_commission']='0.00'):''; + + if ($this->unSettlementList[$value['admin_id']]&&date("Y-m",$this->unSettlementList[$value['admin_id']])<=$value['pay_time']) { $data[$key]['leave_time'] = date("Y-m-d",$this->unSettlementList[$value['admin_id']]); } @@ -834,6 +840,9 @@ class MarketPercentageController extends ThinkController $data[$key]['extend_commission'] = number_format($data[$key]['extend_commission'], 2, '.', ''); $data[$key]['should_month_bonus_ratio'] = $data[$key]['extend_commission'] - $data[$key]['should_performance_commission']; + + !($this->leavePercentage->isSettlement($value['pay_time'],$value['admin_id']))?($data[$key]['should_performance_commission']='0.00'):''; + !($this->leavePercentage->isSettlement($value['pay_time'],$value['admin_id']))?($data[$key]['should_month_bonus_ratio']='0.00'):''; // dump($this->returnMarketPercentageArray[$value['admin_id'].$value['pay_time']]['performance_commission']); // dump($this->returnMarketPercentageArray[$value['admin_id'].$value['pay_time']]['achievement_bonus']); @@ -842,11 +851,19 @@ class MarketPercentageController extends ThinkController $data[$key]['wait_commission'] = number_format($data[$key]['wait_commission'], 2, '.', ''); - $data[$key]['wait_achievement_commission'] = $data[$key]['wait_commission'] - $data[$key]['wait_performance_commission']; + !($this->leavePercentage->isSettlement($value['pay_time'],$value['admin_id']))?($data[$key]['wait_achievement_commission']='0.00'):''; + !($this->leavePercentage->isSettlement($value['pay_time'],$value['admin_id']))?($data[$key]['wait_performance_commission']='0.00'):''; + $data[$key]['achievement_bonus'] = $achievement_bonus; + !($this->leavePercentage->isTimeoutSettlement($value['pay_time'],$value['admin_id']))?($data[$key]['commission']-=$data[$key]['wait_commission']):''; + + !($this->leavePercentage->isTimeoutSettlement($value['pay_time'],$value['admin_id']))?($data[$key]['wait_performance_commission']='0.00'):''; + !($this->leavePercentage->isTimeoutSettlement($value['pay_time'],$value['admin_id']))?($data[$key]['wait_achievement_commission']='0.00'):''; + !($this->leavePercentage->isTimeoutSettlement($value['pay_time'],$value['admin_id']))?($data[$key]['wait_commission']='0.00'):''; + $sum['performance_revenue'] += $data[$key]['performance_revenue']; $sum['appraisal_bonuses'] += $data[$key]['appraisal_bonuses']; $sum['performance_commission'] += $data[$key]['performance_commission']; @@ -862,7 +879,7 @@ class MarketPercentageController extends ThinkController // $sum['wait_achievement_commission'] += $data[$key]['wait_achievement_commission']; } -// die(); + $sum['wait_commission'] = '-------'; $sum['pay_time'] = '总计'; @@ -929,34 +946,6 @@ class MarketPercentageController extends ThinkController $data[$key]['achievement_bonus'] .= ',2)'; } - -// if ($value['achievement_profit'] != "0.00") { -// if ($data[$key]['performance_commission'] == "=ROUND(") { -// $data[$key]['performance_commission'] .= "K{$line}*(G{$line}/100),2)"; -// } else { -// $data[$key]['performance_commission'] .= "+K{$line}*(G{$line}/100),2)"; -// } -// -// if ($data[$key]['achievement_bonus'] == "=ROUND(") { -// $data[$key]['achievement_bonus'] .= "K{$line}*(I{$line}/100),2)"; -// } else { -// $data[$key]['achievement_bonus'] .= "+K{$line}*(I{$line}/100),2)"; -// } -// } else { -// $data[$key]['performance_commission'] .= ",2)"; -// $data[$key]['achievement_bonus'] .= ",2)"; -// } -// -// if ($data[$key]['performance_commission'] == '=ROUND(,2)') { -// $data[$key]['performance_commission'] = "0.00"; -// } -// -// if ($data[$key]['achievement_bonus'] == '=ROUND(,2)') { -// $data[$key]['achievement_bonus'] = "0.00"; -// } - -// $data[$key]['performance_commission'] = "=ROUND(J{$line}*(F{$line}/100)+J{$line}*(G{$line}/100),2)"; -// $data[$key]['achievement_bonus'] = "=ROUND(J{$line}*(H{$line}/100)+J{$line}*(I{$line}/100),2)"; $data[$key]['commission'] = "=ROUND(L{$line}+M{$line}*N{$line},2)"; } @@ -1130,6 +1119,7 @@ class MarketPercentageController extends ThinkController !($this->leavePercentage->isSettlement($value['pay_time'],$value['admin_id']))?($data[$key]['performance_commission']='0.00'):''; !($this->leavePercentage->isSettlement($value['pay_time'],$value['admin_id']))?($data[$key]['achievement_bonus']='0.00'):''; + !($this->leavePercentage->isSettlement($value['pay_time'],$value['admin_id']))?($value['wait_performance_commission']='0.00'):''; !($this->leavePercentage->isSettlement($value['pay_time'],$value['admin_id']))?($value['wait_achievement_commission']='0.00'):''; @@ -1146,6 +1136,15 @@ class MarketPercentageController extends ThinkController $data[$key]['commission'] = number_format($data[$key]['performance_commission'] + $data[$key]['achievement_bonus'], 2, '.', '');; $data[$key]['extend_commission'] = $data[$key]['commission'] - $data[$key]['wait_commission']; + + + + !($this->leavePercentage->isTimeoutSettlement($value['pay_time'],$value['admin_id']))?($data[$key]['commission']-=$data[$key]['wait_commission']):''; + + !($this->leavePercentage->isTimeoutSettlement($value['pay_time'],$value['admin_id']))?($data[$key]['wait_performance_commission']='0.00'):''; + !($this->leavePercentage->isTimeoutSettlement($value['pay_time'],$value['admin_id']))?($data[$key]['wait_achievement_commission']='0.00'):''; + !($this->leavePercentage->isTimeoutSettlement($value['pay_time'],$value['admin_id']))?($data[$key]['wait_commission']='0.00'):''; + $sum['performance_revenue'] += $value['performance_revenue']; $sum['appraisal_bonuses'] += $value['appraisal_bonuses']; diff --git a/Application/Admin/Controller/StatementMangementController.class.php b/Application/Admin/Controller/StatementMangementController.class.php index 8f3f7cfe4..94b398ad2 100644 --- a/Application/Admin/Controller/StatementMangementController.class.php +++ b/Application/Admin/Controller/StatementMangementController.class.php @@ -346,7 +346,7 @@ class StatementMangementController extends ThinkController $list = SM('reward_record', 'tab_')->alias('r') ->field(' - r.id, r.relation_game_id, r.settlement_time, r.confirm_time, r.content, r.reward_type, r.creater_id, + r.id, r.relation_game_id, r.settlement_time, r.confirm_time, r.content, r.reward_type, r.creater_id,is_verify,verify_detail, rd.id as rid, rd.type as detail_type, rd.company_type as detail_company_type, rd.company_id as detail_company_id , rd.company_name as detail_company_name, rd.settlement_type as detail_settlement_type, rd.promote_account as detail_promote_account,rd.amount as detail_amount ') ->where($map) @@ -356,7 +356,16 @@ class StatementMangementController extends ThinkController if ($list) { $record = []; foreach ($list as $item) { - + $item["verify_detail"] = json_decode($item["verify_detail"],true); + + if($item["is_verify"] == 0) { + $verify_detail = "未审核"; + } elseif($item["is_verify"] == 1) { + $verify_detail="审核通过
"."(".$item["verify_detail"]["user"].")
".$item["verify_detail"]["time"]; + } else{ + $verify_detail="审核拒绝
"."(".$item["verify_detail"]["user"].")
".$item["verify_detail"]["time"]; + } + if (!isset($record[$item['id']])) { $record[$item['id']] = [ @@ -370,7 +379,9 @@ class StatementMangementController extends ThinkController 'maxCount' => 0, 'creater_id' => $item['creater_id'], 'totalReward' => 0, - 'totalPunish' => 0 + 'totalPunish' => 0, + 'is_verify'=>$item['is_verify'], + 'verify'=>$verify_detail ]; } if (!empty($item['rid'])) { @@ -558,6 +569,8 @@ class StatementMangementController extends ThinkController $ins = SM('reward_record', 'tab_')->add($data); $record_id = SM('reward_record', 'tab_')->getLastInsID(); + + $this->autoVerify($settlmentSet,$record_id); foreach ($settlmentSet as $item) { $item['record_id'] = $record_id; SM('reward_detail', 'tab_')->add($item); @@ -1474,4 +1487,89 @@ class StatementMangementController extends ThinkController } + //审核 + public function verify() { + $id = $_REQUEST["id"]; + $status = $_REQUEST["status"]; + + if (!isset($id)||!isset($status)) { + $this->ajaxReturn(["status"=>0,"msg"=>"参数错误"]); + } + if($status != 2) { + $data = SM("reward_record","tab_") + ->field("is_verify,company_id,company_belong") + ->join("left join tab_reward_detail on record_id=tab_reward_record.id") + ->join("left join tab_promote_company on tab_promote_company.id=tab_reward_detail.company_id") + ->where(["tab_reward_record.id"=>['in',$id]]) + ->select(); + + foreach ($data as $key => $value) { + if ($value['is_verify'] != 0) { + $this->ajaxReturn(["status"=>0,"msg"=>"含有已审核无需重新审核"]); + } + + } + + $detail = json_encode(["user"=>$_SESSION['onethink_admin']['user_auth']['username'],"time"=>date("Y-m-d H:i:s",time())]); + $is_success = SM("reward_record","tab_")->where(["id"=>['in',$id]])->save(["is_verify"=>$status,"verify_detail"=>$detail]); + + if ($is_success) { + $this->ajaxReturn(["status"=>1,"msg"=>"操作成功"]); + } else { + $this->ajaxReturn(["status"=>1,"msg"=>"操作失败"]); + } + } else { + + $data = SM("reward_record","tab_") + ->field("is_verify,company_id,company_belong") + ->join("left join tab_reward_detail on record_id=tab_reward_record.id") + ->join("left join tab_promote_company on tab_promote_company.id=tab_reward_detail.company_id") + ->where(["tab_reward_record.id"=>['in',$id]]) + ->select(); + + foreach ($data as $key => $value) { + if ($value['is_verify'] == 0) { + $this->ajaxReturn(["status"=>0,"msg"=>"含有未审核无需撤回审核"]); + } + + } + $is_success = SM("reward_record","tab_")->where(["id"=>['in',$id]])->save(["is_verify"=>0,"verify_detail"=>'']); + + if ($is_success) { + $this->ajaxReturn(["status"=>1,"msg"=>"操作成功"]); + } else { + $this->ajaxReturn(["status"=>1,"msg"=>"操作失败"]); + } + + } + + } + + //自动审核通过 + public function autoVerify($settlmentSet = [],$id = 0) { + + if (!$id) { + return false; + } + $i = 0; + $count = count($settlmentSet); + + foreach ($settlmentSet as $key => $value) { + if ($value['company_id']) { + + $data = SM("promote_company","tab_")->where(["id"=>$value['company_id']])->find(); + + if (in_array($data["company_belong"],[0,3])) { + $i++; + } + + } + } + + if ($i == $count) { + $detail = json_encode(["user"=>$_SESSION['onethink_admin']['user_auth']['username'],"time"=>date("Y-m-d H:i:s",time())]); + SM("reward_record","tab_")->where(["id"=>['in',$id]])->save(["is_verify"=>1,"verify_detail"=>$detail]); + } + } + } diff --git a/Application/Admin/View/CompanyStatementPool/editCpPool.html b/Application/Admin/View/CompanyStatementPool/editCpPool.html index 70b8c583b..793964a52 100644 --- a/Application/Admin/View/CompanyStatementPool/editCpPool.html +++ b/Application/Admin/View/CompanyStatementPool/editCpPool.html @@ -391,6 +391,19 @@ // }); // }) + $(".refund,.withhold").keyup(function() { + var val = $(this).val(); + var reg = /^(\-|\+)?\d+(\.\d+)?$/g; + + if (val == '-') { + return; + } + + if( !reg.test(val)){ + $(this).val(0) + } + }); + var pool_ids = "{$_GET['id']}"; $(".split_RewardOrFail").on("click",function() { @@ -535,12 +548,24 @@ }); $(".refund").on("blur",function () { + + var val = $(this).val(); + if (val == '-') { + $(this).val(0); + } + caculate_sum_money(this); changeStatementAmount(this); changeSumAmount(); }); $(".withhold").on("blur",function () { + + var val = $(this).val(); + if (val == '-') { + $(this).val(0); + } + caculate_sum_money(this); changeStatementAmount(this); changeSumAmount(); @@ -576,7 +601,7 @@ } //退款 var refund = $(_this).parent().parent().find(".refund").val(); - if (!refund || refund < 0) { + if (!refund) { refund = 0; $(_this).parent().parent().find(".refund").val(refund); } else if(parseFloat(refund) > parseFloat(pay_money)) { diff --git a/Application/Admin/View/CompanyStatementPool/editPcPool.html b/Application/Admin/View/CompanyStatementPool/editPcPool.html index 68ee7b5fc..794556f3b 100644 --- a/Application/Admin/View/CompanyStatementPool/editPcPool.html +++ b/Application/Admin/View/CompanyStatementPool/editPcPool.html @@ -138,7 +138,7 @@ {$com['statement_info'][0]['pay_amount']} - + 0 @@ -172,8 +172,8 @@ {$com['statement_info'][0]['reward']-0} - - + + 0 @@ -226,7 +226,7 @@ {$it['pay_amount']} - + 0 @@ -261,8 +261,8 @@ {$it['reward']-0} - - + + 0 @@ -361,6 +361,20 @@ }); }); + + $(".refund,.withhold").keyup(function() { + var val = $(this).val(); + var reg = /^(\-|\+)?\d+(\.\d+)?$/g; + + if (val == '-') { + return; + } + + if( !reg.test(val)){ + $(this).val(0) + } + }); + // $(".no_statement").on("click",function(){ // var id = $(this).data('id'); // $.ajax({ @@ -528,12 +542,24 @@ }); $(".refund").on("blur",function () { + + var val = $(this).val(); + if (val == '-') { + $(this).val(0); + } + caculate_sum_money(this); changeStatementAmount(this); changeSumAmount(); }); $(".withhold").on("blur",function () { + + var val = $(this).val(); + if (val == '-') { + $(this).val(0); + } + caculate_sum_money(this); changeStatementAmount(this); changeSumAmount(); @@ -569,7 +595,7 @@ } //退款 var refund = $(_this).parent().parent().find(".refund").val(); - if (!refund || refund < 0) { + if (!refund) { refund = 0; $(_this).parent().parent().find(".refund").val(refund); } else if(parseFloat(refund) > parseFloat(pay_money)) { diff --git a/Application/Admin/View/CompanyStatementPool/editPuPool.html b/Application/Admin/View/CompanyStatementPool/editPuPool.html index 1f9d4666b..771c82f24 100644 --- a/Application/Admin/View/CompanyStatementPool/editPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/editPuPool.html @@ -197,8 +197,8 @@ {$com['statement_info'][0]['game_list'][0]['fine']||default="0"} - - + + 0 @@ -343,8 +343,8 @@ - - + + 0 @@ -464,9 +464,14 @@ saveForm(id); }); - $(".refund").keyup(function() { + $(".refund,.withhold").keyup(function() { var val = $(this).val(); var reg = /^(\-|\+)?\d+(\.\d+)?$/g; + + if (val == '-') { + return; + } + if( !reg.test(val)){ $(this).val(0) } @@ -610,12 +615,24 @@ }); $(".refund").on("blur",function () { + + var val = $(this).val(); + if (val == '-') { + $(this).val(0); + } + caculate_sum_money(this); changeStatementAmount(this); changeSumAmount(); }); $(".withhold").on("blur",function () { + + var val = $(this).val(); + if (val == '-') { + $(this).val(0); + } + caculate_sum_money(this); changeStatementAmount(this); changeSumAmount(); diff --git a/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html b/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html index 63feb87f7..fad0ba3d0 100644 --- a/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html @@ -168,7 +168,7 @@ {$com['statement_info'][0]['game_list'][0]['pay_amount']} - + {$com['statement_info'][0]['game_list'][0]['ratio']}% % @@ -179,8 +179,8 @@ {$com['fine']} - - + + {$com['statement_info'][0]['week_amount']} {$com['statement_money']} @@ -233,7 +233,7 @@ {$game['game_type_name']} {$game['pay_amount']} - + {$game['ratio']}% % {$game['sum_money']} @@ -264,7 +264,7 @@ {$account['game_list'][0]['pay_amount']} - + {$account['game_list'][0]['ratio']}% % @@ -280,8 +280,8 @@ - - + + {$account['week_amount']} @@ -309,7 +309,7 @@ {$game['pay_amount']} - + {$game['ratio']}% % @@ -374,6 +374,20 @@ }); }); + + $(".refund,.withhold").keyup(function() { + var val = $(this).val(); + var reg = /^(\-|\+)?\d+(\.\d+)?$/g; + + if (val == '-') { + return; + } + + if( !reg.test(val)){ + $(this).val(0) + } + }); + $(".no_statement").on("click",function(){ var id = $(this).data('id'); saveForm(id); @@ -461,12 +475,24 @@ }); $(".refund").on("blur",function () { + + var val = $(this).val(); + if (val == '-') { + $(this).val(0); + } + caculate_sum_money(this); changeStatementAmount(this); changeSumAmount(); }); $(".withhold").on("blur",function () { + + var val = $(this).val(); + if (val == '-') { + $(this).val(0); + } + caculate_sum_money(this); changeStatementAmount(this); changeSumAmount(); @@ -499,7 +525,7 @@ } //退款 var refund = $(_this).parent().parent().find(".refund").val(); - if (!refund || refund < 0) { + if (!refund) { refund = 0; $(_this).parent().parent().find(".refund").val(refund); } else if(parseFloat(refund) > parseFloat(pay_money)) { diff --git a/Application/Admin/View/StatementMangement/rewardManageList.html b/Application/Admin/View/StatementMangement/rewardManageList.html index 838361b13..8e1e7b1fe 100644 --- a/Application/Admin/View/StatementMangement/rewardManageList.html +++ b/Application/Admin/View/StatementMangement/rewardManageList.html @@ -166,6 +166,11 @@
+ + 审核通过 + 审核拒绝 + + 审核撤回 奖惩导入 @@ -179,6 +184,7 @@ + 游戏名 游戏合作方 结算时间 @@ -202,6 +208,7 @@ 结算方式 添加人 + 审核状态 操作 @@ -218,6 +225,7 @@ + {$data['relation_game_name']} {$data['relation_game_partner']} {$data['settlement_time']} @@ -239,10 +247,20 @@ 无 {:get_admin_name($data['creater_id'])} + + {$data.verify} + + {$data.verify} + + -- + + 查看 - 编辑 - 删除 + + 编辑 + 删除 + @@ -250,6 +268,7 @@ + {$data['relation_game_name']} {$data['relation_game_partner']} {$data['settlement_time']} @@ -271,10 +290,19 @@ {:get_admin_name($data['creater_id'])} + + {$data.verify} + + {$data.verify} + + -- + 查看 - 编辑 - 删除 + + 编辑 + 删除 + @@ -357,6 +385,33 @@ ,range: '~' }); + $(".verify").click(function(){ + + var status = $(this).data("status"); + var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) { + return $(elem).val(); + }).get(); + $.ajax({ + url:"{:U('verify')}", + type:"post", + data:{ + status:status, + id:text + }, + dataType:'json', + success:function(data){ + + layer.msg(""+data.msg+""); + if (data.status == 1) { + setTimeout(function () { + window.location.reload(); + },1000) + } + + } + }) + }); + // var partner_id = {:I('partner_id', 0)}; // function get_company_list() // { diff --git a/Application/Base/Factory/LeavePercentageFactory.class.php b/Application/Base/Factory/LeavePercentageFactory.class.php index ac96ac7d5..1c78c7bc9 100644 --- a/Application/Base/Factory/LeavePercentageFactory.class.php +++ b/Application/Base/Factory/LeavePercentageFactory.class.php @@ -82,6 +82,37 @@ class LeavePercentageFactory } + /** + * 判断是否结算绩效 + * @param string $date + * @param int $admin_id + * @return bool + */ + public function isTimeoutSettlement($date = '',$admin_id= 0) { + + //未离职结算 + if (!isset(self::$arrUnSettlementList[$admin_id])) { + return true; + } + + //判断往后日期都不结算 + if (self::$arrUnSettlementList[$admin_id] + &&date("Y-m",self::$arrUnSettlementList[$admin_id])!=$date + &&strtotime($date)>self::$arrUnSettlementList[$admin_id]) { + return false; + } + + //当月离职时间，在职时间小于30天不结算 + if (self::$arrUnSettlementList[$admin_id] + &&date("Y-m",self::$arrUnSettlementList[$admin_id])==$date + &&(self::$arrUnSettlementList[$admin_id]-self::$arrUnSettlementApplyList[$admin_id])>=86400*30) { + return false; + } + + return true; + + } + /** * 离职定时器方法 */ From f349603e7c95b91e9c28d1b26c238a55615bbb9b Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 15 Apr 2021 16:28:41 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=80=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/ExportController.class.php | 7 ++ .../Controller/SpendController.class.php | 56 +++++++++++++- Application/Admin/Model/SpendModel.class.php | 4 + Application/Admin/View/Spend/lists.html | 77 ++++++++++++++++--- 4 files changed, 132 insertions(+), 12 deletions(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index e6536e183..6929e92b7 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -1146,6 +1146,11 @@ class ExportController extends Controller unset($_REQUEST['is_check']); } + if (isset($_REQUEST['is_refund'])) { + $map['is_refund'] = (int)($_REQUEST['is_refund']); + unset($_REQUEST['is_refund']); + } + if ($_REQUEST['merchant_id']) { $map['merchant_id'] = $_REQUEST['merchant_id']; unset($_REQUEST['merchant_id']); @@ -1236,6 +1241,7 @@ class ExportController extends Controller 'pay_amount' => '实付金额', 'pay_way' => '充值方式', 'pay_status' => L('Order_status'), + 'is_refund' => '退款状态', 'pay_game_status' => '游戏通知状态', 'is_check' => '是否参与结算', 'promote_id' => "消费"."{$total}", @@ -1314,6 +1320,7 @@ class ExportController extends Controller $value['game_id'] = $thisGameInfo['partner_name']; $value['is_check'] = D("Spend")::IsCheckStr[$value['is_check']]; + $value['is_refund'] = D("Spend")::IsRefundStr[$value['is_refund']]; $value['company_name'] = $promoters[$value['promote_id']] == 0 ? '官方渠道' : ($companys[$promoters[$value['promote_id']]] ?? ''); unset($value['promote_id']); diff --git a/Application/Admin/Controller/SpendController.class.php b/Application/Admin/Controller/SpendController.class.php index 90934283f..ec08c8661 100644 --- a/Application/Admin/Controller/SpendController.class.php +++ b/Application/Admin/Controller/SpendController.class.php @@ -29,6 +29,10 @@ class SpendController extends ThinkController $map['is_check'] = (int)($_REQUEST['is_check']); } + if (isset($_REQUEST['is_refund'])) { + $map['is_refund'] = (int)($_REQUEST['is_refund']); + } + if (isset($_REQUEST['user_account'])) { $map['user_account'] = array('like', trim($_REQUEST['user_account'])); unset($_REQUEST['user_account']); @@ -147,6 +151,7 @@ class SpendController extends ThinkController ($value['promote_account']=='官方渠道')?($value['promote_account']=C('OFFICIEL_CHANNEL')):''; $value['market_admin_username'] = $adminUsernameList[$value['market_admin_id']] ?? '无'; $value['is_check_str'] = D(self::model_name)::IsCheckStr[$value['is_check']]; + $value['is_refund_str'] = D(self::model_name)::IsRefundStr[$value['is_refund']]; //拆分游戏名称和设备类型 $game_arr = explode("(", rtrim($value['game_name'], ")")); $value['game_name'] = $game_arr[0]; @@ -178,6 +183,8 @@ class SpendController extends ThinkController $mentBtn = [ "addStatement"=>"参与结算", "removeStatement"=>"移出结算", + "addRefund"=>"登记退款", + "removeRefund"=>"取消退款", ]; $resarr = []; foreach ($mentBtn as $k => $v) { @@ -191,7 +198,7 @@ class SpendController extends ThinkController } return $resarr; } - + //是否结算 public function addStatement() { if(!isset($_REQUEST['ids'])) $this->error("参数错误"); @@ -232,4 +239,51 @@ class SpendController extends ThinkController addOperationLog(['op_type'=>1,'key'=>$key,"op_name"=>$op_name,"content"=>json_encode(["ids"=>$_REQUEST['ids'],"is_check"=>$newval])]); return true; } + //是否退款 + public function addRefund() + { + if(!isset($_REQUEST['ids'])) $this->error("参数错误"); + $ids = $_REQUEST['ids']; + + $this->editOrderIsrefund($ids,0,1); + $this->ajaxReturn(array( + 'status' => 1, + "info"=>"操作成功" + )); + } + public function removeRefund() + { + if(!isset($_REQUEST['ids'])) $this->error("参数错误"); + $ids = $_REQUEST['ids']; + + $this->editOrderIsrefund($ids,1,0); + $this->ajaxReturn(array( + 'status' => 1, + "info"=>"操作成功" + )); + } + protected function editOrderIsrefund($ids,$oldval,$newval){ + $time = time(); + $dbres = D(self::model_name)->field("id as s_id,user_id,user_account,pay_amount as refund_amount,pay_time,{$time} as create_time")->where("id in ({$ids}) and is_refund = '{$oldval}' and pay_status = 1")->select(); + if(empty($dbres)) return false; + + $changeIds = implode(",",array_column($dbres,"s_id")); + //执行操作 + $res = D(self::model_name)->where("id in ({$changeIds}) and is_refund = '{$oldval}'")->save(['is_refund'=>$newval]); + if(empty($res)) return false; + //日志 + if($newval == 1){ + $op_name = "登记退款"; + $key = "addRefund"; + SM('spend_refund',"tab_")->addAll($dbres); + }else{ + $op_name = "取消退款"; + $key = "removeRefund"; + SM('spend_refund',"tab_")->where("s_id in ({$changeIds}) ")->delete(); + } + addOperationLog(['op_type'=>1,'key'=>$key,"op_name"=>$op_name,"content"=>json_encode(["ids"=>$_REQUEST['ids'],"is_refund"=>$newval])]); + return true; + } + + } diff --git a/Application/Admin/Model/SpendModel.class.php b/Application/Admin/Model/SpendModel.class.php index 51fecfd41..05127744e 100644 --- a/Application/Admin/Model/SpendModel.class.php +++ b/Application/Admin/Model/SpendModel.class.php @@ -26,6 +26,10 @@ class SpendModel extends Model "1"=>"是", "2"=>"否" ]; + const IsRefundStr=[ + "0"=>"--", + "1"=>"已退款" + ]; /* 自动完成规则 */ protected $_auto = array( diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html index fb8bf063a..4886c797d 100644 --- a/Application/Admin/View/Spend/lists.html +++ b/Application/Admin/View/Spend/lists.html @@ -199,6 +199,14 @@
+
+ +
+
@@ -254,6 +262,7 @@ 充值方式 订单状态 + 退款状态 游戏通知状态 是否参与结算 操作 @@ -266,7 +275,7 @@ - + {$data.pay_order_number} @@ -339,6 +348,7 @@ {:get_info_status($data['pay_status'],9)} + {$data.is_refund_str} {:get_info_status($data['pay_game_status'],14)} @@ -354,19 +364,15 @@ if (!(substr($data['pay_order_number'], 0, 3) == "PF_" && substr($data['pay_order_number'], -2) == '_1')) { ?> - + 补单 - - - 补单 -
- + 通知到账 @@ -380,7 +386,7 @@ 汇总 - + 当页充值：{:null_to_0(array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount')))} 累计充值：{$total}（此处只汇总充值成功的订单） @@ -770,10 +776,59 @@ } }); }); + }) - - - + $("#addRefund,#removeRefund").on("click",function(){ + var id = $(this).attr("id"); + if(id == "addRefund"){ + var opname = "登记退款"; + var opurl = "{:U('addRefund')}"; + var opst ="[未退款]"; + var status = [0]; + }else if(id=="removeRefund"){ + var opname = "取消退款"; + var opurl = "{:U('removeRefund')}"; + var opst ="[已退款]"; + var status = [1]; + } + var flag = false; + var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) { + const isrefund = $(elem).data("isrefund"); + if($.inArray(isrefund,status) > -1){ + return $(elem).val(); + } + }).get(); + if(text.length < 1){ + layer.msg("" + '无需要'+opname+'的操作,仅'+opst+'状态可以进行'+opname+""); + return; + } + text = text.join(","); + layer.confirm('【提示】'+opname+'退款功能仅用于登记相关数据，未引入结算', { + btn: ['确认','取消'], + title:false + }, function(index){ + layer.close(index); + layer.load(2); + $.ajax({ + type: "POST", + url: opurl, + dataType: 'json', + async: true, + data: {ids:text}, + success:function(data){ + layer.closeAll('loading'); + if(data.status==1){ + layer.msg("" + data.info + ""); + setTimeout(function(){ + window.location.reload(); + },1500); + }else{ + layer.msg("" + data.info + ""); + return false; + } + } + }); + }); }) /** From 06202851c2af638992e5fd574bf98fb1d0345d3f Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 16 Apr 2021 16:40:12 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 16 ++ .../Controller/RefundController.class.php | 138 ++++++++---- Application/Admin/View/Refund/userCount.html | 202 ++++++++++++++++++ 3 files changed, 317 insertions(+), 39 deletions(-) create mode 100644 Application/Admin/View/Refund/userCount.html diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index c885f03f6..5168c00bd 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -1512,6 +1512,22 @@ function getMonth() { return $range; } +function showMonthRange($start, $end) +{ + $end = date('Y-m', strtotime($end)); // 转换为月 + $range = []; + $i = 0; + do { + $month = date('Y-m', strtotime($start . ' + ' . $i . ' month')); + //echo $i . ':' . $month . '
'; + $range[] = $month; + $i++; + } while ($month < $end); + rsort($range); + return $range; +} + + function getPayType($type) { $return = ''; diff --git a/Application/Admin/Controller/RefundController.class.php b/Application/Admin/Controller/RefundController.class.php index e6226e997..fb90d1e54 100644 --- a/Application/Admin/Controller/RefundController.class.php +++ b/Application/Admin/Controller/RefundController.class.php @@ -8,52 +8,112 @@ use User\Api\UserApi as UserApi; * @author 麦当苗儿 */ class RefundController extends ThinkController { - public function lists(){ - if(isset($_REQUEST['user_account'])){ + public function userCount(){ + if(!array_key_exists("count_date",$_REQUEST) && !array_key_exists("user_account",$_REQUEST)){ + $this->redirect(ACTION_NAME, array('count_date' => date('Y-m'))); + } + $page = I('p', 1); + $row = I('row', 10); + + if(isset($_REQUEST['user_account'])){ $map['user_account']=array('like','%'.trim($_REQUEST['user_account']).'%'); - unset($_REQUEST['user_account']); } - - if(isset($_REQUEST['time-start'])&&isset($_REQUEST['time-end'])){ - $map['pay_time'] =array('BETWEEN',array(strtotime($_REQUEST['time-start']),strtotime($_REQUEST['time-end'])+24*60*60-1)); - unset($_REQUEST['time-start']);unset($_REQUEST['time-end']); + if(isset($_REQUEST['count_date'])){ + $map['pay_time'] = ["BETWEEN",$this->getMonthTimeRange($_REQUEST['count_date'])]; } - - if(isset($_REQUEST['game_name'])){ - if($_REQUEST['game_name']=='全部'){ - unset($_REQUEST['game_name']); - }else{ - $map['game_name']=$_REQUEST['game_name']; - unset($_REQUEST['game_name']); - } + + // + $model = SM("spend_refund",'tab_'); + $data = $model + ->where($map) + ->group("month,user_id") + ->order("month desc,refund_amount desc"); + if(isset($_REQUEST['export'])){ + $data = $data->field("CONCAT(' ',FROM_UNIXTIME(`pay_time`,'%Y-%m')) as month,user_id,user_account,sum(refund_amount) refund_amount")->select(); + data2csv($data,'退款统计',array( + "month"=>"月份", + "user_account"=>"玩家账号", + "refund_amount"=>"退款金额" + )); } - if(isset($_REQUEST['pay_order_number'])){ - $map['pay_order_number']=array('like','%'.trim($_REQUEST['pay_order_number']).'%'); - unset($_REQUEST['pay_order_number']); + $data = $data->field("FROM_UNIXTIME(`pay_time`,'%Y-%m') as month,user_id,user_account,sum(refund_amount) refund_amount")->page($page, $row)->select(); + foreach ($data as $k => &$v) { + $between = $this->getMonthTimeRange($v['month'],true); + $v['jump_url'] = U("Spend/lists",['timestart'=>$between[0],'timeend'=>$between[1],'user_account'=>$v['user_account'],'is_refund'=>1]); } - if(isset($_REQUEST['pay_status'])){ - $map['tui_status']=$_REQUEST['pay_status']; - unset($_REQUEST['pay_status']); + $allcount = $model->where($map)->getField("sum(refund_amount) refund_amount"); + + $count_sql = $model->field("FROM_UNIXTIME(`pay_time`,'%Y-%m') as month,user_id")->group("month,user_id")->where($map)->select(false); + $count = SM()->table( '('.$count_sql.') a' )->count(); + + $page = set_pagination($count, $row); + if ($page) { + $this->assign('_page', $page); } - if(isset($_REQUEST['pay_way'])){ - $map['pay_way']=$_REQUEST['pay_way']; - unset($_REQUEST['pay_way']); + $this->assign("allcount",$allcount); + $this->assign("data",$data); + $this->assign("date_count",showMonthRange('2019-09-01',date('Y-m-d',time()))); + $this->display(); + } + + protected function getMonthTimeRange($date,$isdate = false) + { + $start = strtotime( $date . "-1 00:00:00" ); + $mdays = date('t', $start); + if($isdate){ + return [$date."-1",$date.'-'.$mdays]; } - $model = array( - 'm_name' => 'RefundRecord', - 'map' => $map, - 'order' =>'id desc', - 'title' => '退款记录', - 'template_list' =>'lists', - ); - $total=null_to_0(M('RefundRecord','tab_')->where(['tui_status'=>1])->sum('tui_amount')); - $ttotal=null_to_0(M('RefundRecord','tab_')->where('pay_time'.total(1))->where(array('tui_status'=>1))->sum('tui_amount')); - $ytotal=null_to_0(M('RefundRecord','tab_')->where('pay_time'.total(5))->where(array('tui_status'=>1))->sum('tui_amount')); - $this->assign('total',$total); - $this->assign('ttotal',$ttotal); - $this->assign('ytotal',$ytotal); - $user = A('User','Event'); - $user->user_join_($model,$_GET['p']); + $end = strtotime( $date.'-'.$mdays.' 23:59:59'); + return [$start,$end]; } + + // public function lists(){ + // if(isset($_REQUEST['user_account'])){ + // $map['user_account']=array('like','%'.trim($_REQUEST['user_account']).'%'); + // unset($_REQUEST['user_account']); + // } + + // if(isset($_REQUEST['time-start'])&&isset($_REQUEST['time-end'])){ + // $map['pay_time'] =array('BETWEEN',array(strtotime($_REQUEST['time-start']),strtotime($_REQUEST['time-end'])+24*60*60-1)); + // unset($_REQUEST['time-start']);unset($_REQUEST['time-end']); + // } + + // if(isset($_REQUEST['game_name'])){ + // if($_REQUEST['game_name']=='全部'){ + // unset($_REQUEST['game_name']); + // }else{ + // $map['game_name']=$_REQUEST['game_name']; + // unset($_REQUEST['game_name']); + // } + // } + // if(isset($_REQUEST['pay_order_number'])){ + // $map['pay_order_number']=array('like','%'.trim($_REQUEST['pay_order_number']).'%'); + // unset($_REQUEST['pay_order_number']); + // } + // if(isset($_REQUEST['pay_status'])){ + // $map['tui_status']=$_REQUEST['pay_status']; + // unset($_REQUEST['pay_status']); + // } + // if(isset($_REQUEST['pay_way'])){ + // $map['pay_way']=$_REQUEST['pay_way']; + // unset($_REQUEST['pay_way']); + // } + // $model = array( + // 'm_name' => 'RefundRecord', + // 'map' => $map, + // 'order' =>'id desc', + // 'title' => '退款记录', + // 'template_list' =>'lists', + // ); + // $total=null_to_0(M('RefundRecord','tab_')->where(['tui_status'=>1])->sum('tui_amount')); + // $ttotal=null_to_0(M('RefundRecord','tab_')->where('pay_time'.total(1))->where(array('tui_status'=>1))->sum('tui_amount')); + // $ytotal=null_to_0(M('RefundRecord','tab_')->where('pay_time'.total(5))->where(array('tui_status'=>1))->sum('tui_amount')); + // $this->assign('total',$total); + // $this->assign('ttotal',$ttotal); + // $this->assign('ytotal',$ytotal); + // $user = A('User','Event'); + // $user->user_join_($model,$_GET['p']); + // } + } \ No newline at end of file diff --git a/Application/Admin/View/Refund/userCount.html b/Application/Admin/View/Refund/userCount.html new file mode 100644 index 000000000..877526bc4 --- /dev/null +++ b/Application/Admin/View/Refund/userCount.html @@ -0,0 +1,202 @@ + + + + + + + + + +
+ +

退款统计

+

+
+ +
+ + +
+ + +
+ +
+
+   +
+ +
+ 搜索 +
+
+
+ + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
月份玩家账号退款金额操作
aOh! 暂时还没有内容!
{$data.month}{$data.user_account}{$data.refund_amount} + 查看 +
汇总累计退款: {$allcount|default=0}
+
+ +
+
+ 导出 + {$_page|default=''} +
+ + + + + + + + if(C('COLOR_STYLE')=='blue_color') echo ''; + + + + + + From 8fb73e6fede24f2f71205a0edd0ccfead3922eae Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Tue, 20 Apr 2021 10:28:02 +0800 Subject: [PATCH 5/9] =?UTF-8?q?4.22=E5=8F=B7=E5=8A=9F=E8=83=BD=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/CompanyStatementSetController.class.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index 02e956cf5..8b5de7dac 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -376,13 +376,14 @@ class CompanyStatementSetController extends Controller { if($type < 2){ //非补点奖罚 $rrmap = array( - "confirm_time" => ['between', [$begintime,$endtime]], + "d.confirm_time" => ['between', [$begintime,$endtime]], "company_type"=>1, "company_id"=>$add_data['company_id'], "settlement_type"=>2, "is_verify"=>1, ); $rfres = M("RewardDetail","tab_") + ->alias("d") ->field(" IFNULL(SUM(CASE WHEN type = 1 THEN amount ELSE 0 END),0) as reward_count, IFNULL(SUM(CASE WHEN type = 2 THEN amount ELSE 0 END),0) as fine_count @@ -891,13 +892,14 @@ class CompanyStatementSetController extends Controller { if($type < 2){ //非补点计算奖罚 $rrmap = array( - "confirm_time" => ['between', [$begintime,$endtime]], + "d.confirm_time" => ['between', [$begintime,$endtime]], "company_type"=>2, "company_id"=>$add_data['company_id'], "settlement_type"=>2, "is_verify"=>1, ); $rfres = M("RewardDetail","tab_") + ->alias("d") ->field(" IFNULL(SUM(CASE WHEN type = 1 THEN amount ELSE 0 END),0) as reward_count, IFNULL(SUM(CASE WHEN type = 2 THEN amount ELSE 0 END),0) as fine_count From a5aa8ef74490cf92f32f2721603cf053432e65c4 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Tue, 20 Apr 2021 10:52:32 +0800 Subject: [PATCH 6/9] =?UTF-8?q?4.22=E5=8F=B7=E5=8A=9F=E8=83=BD=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/CompanyStatementPool/editCpPool.html | 14 +++++++------- .../View/CompanyStatementPool/editPcPool.html | 2 +- .../View/CompanyStatementPool/editPuPool.html | 2 +- .../CompanyStatementPool/editSpecialPuPool.html | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Application/Admin/View/CompanyStatementPool/editCpPool.html b/Application/Admin/View/CompanyStatementPool/editCpPool.html index 793964a52..9bd6c27da 100644 --- a/Application/Admin/View/CompanyStatementPool/editCpPool.html +++ b/Application/Admin/View/CompanyStatementPool/editCpPool.html @@ -154,7 +154,7 @@ - + 0 @@ -183,8 +183,8 @@ {$com['reward']-0} - - + + 0 @@ -237,7 +237,7 @@ {$it['pay_amount']} - + 0 @@ -266,8 +266,8 @@ {$it['reward']-0} - - + + 0 @@ -393,7 +393,7 @@ $(".refund,.withhold").keyup(function() { var val = $(this).val(); - var reg = /^(\-|\+)?\d+(\.\d+)?$/g; + var reg = /^(\-|\+)?\d+(\.\d*)?$/g; if (val == '-') { return; diff --git a/Application/Admin/View/CompanyStatementPool/editPcPool.html b/Application/Admin/View/CompanyStatementPool/editPcPool.html index 794556f3b..cb3858f34 100644 --- a/Application/Admin/View/CompanyStatementPool/editPcPool.html +++ b/Application/Admin/View/CompanyStatementPool/editPcPool.html @@ -364,7 +364,7 @@ $(".refund,.withhold").keyup(function() { var val = $(this).val(); - var reg = /^(\-|\+)?\d+(\.\d+)?$/g; + var reg = /^(\-|\+)?\d+(\.\d*)?$/g; if (val == '-') { return; diff --git a/Application/Admin/View/CompanyStatementPool/editPuPool.html b/Application/Admin/View/CompanyStatementPool/editPuPool.html index 771c82f24..7b849a44d 100644 --- a/Application/Admin/View/CompanyStatementPool/editPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/editPuPool.html @@ -466,7 +466,7 @@ }); $(".refund,.withhold").keyup(function() { var val = $(this).val(); - var reg = /^(\-|\+)?\d+(\.\d+)?$/g; + var reg = /^(\-|\+)?\d+(\.\d*)?$/g; if (val == '-') { return; diff --git a/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html b/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html index fad0ba3d0..25c01da4a 100644 --- a/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html @@ -377,7 +377,7 @@ $(".refund,.withhold").keyup(function() { var val = $(this).val(); - var reg = /^(\-|\+)?\d+(\.\d+)?$/g; + var reg = /^(\-|\+)?\d+(\.\d*)?$/g; if (val == '-') { return; From d314e6164a955facbee0ebcb19b4367d73ff60be Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 22 Apr 2021 09:20:31 +0800 Subject: [PATCH 7/9] =?UTF-8?q?4.22=E5=8F=B7=E5=8A=9F=E8=83=BD=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RechargeSumOtherController.class.php | 99 ++++++ .../View/RechargeSumOther/summation.html | 307 ++++++++++++++++++ 2 files changed, 406 insertions(+) create mode 100644 Application/Admin/Controller/RechargeSumOtherController.class.php create mode 100644 Application/Admin/View/RechargeSumOther/summation.html diff --git a/Application/Admin/Controller/RechargeSumOtherController.class.php b/Application/Admin/Controller/RechargeSumOtherController.class.php new file mode 100644 index 000000000..e3041cbef --- /dev/null +++ b/Application/Admin/Controller/RechargeSumOtherController.class.php @@ -0,0 +1,99 @@ +redirect(ACTION_NAME, array('timeStart' => date('Y-m-d',strtotime('-7 day')),"timeEnd"=>date('Y-m-d'))); + } + + $total = ['current' => 0, 'sum' => 0]; + $map['date'] = array('BETWEEN', array($startDateTime, $endDateTime)); + + $_REQUEST['game_name'] ? ($map['game_name'] = $_REQUEST['game_name']) :''; + + $data = M("recharge_text","tab_")->where($map)->order("date desc")->select(); + + if (isset($_REQUEST['row'])) { + $row = $_REQUEST['row']; + } else { + $row = 10; + } + foreach ($data as $k => $v) { + $total['sum'] += $v['day_pay']; + } + $count = count($data); + $export_data = $data; + $page = set_pagination($count, $row); + if ($page) { + $this->assign('_page', $page); + } + //用array_slice(array,offset,length) 函数在数组中根据条件取出一段值;array(数组),offset(元素的开始位置),length(组的长度) + $data = array_slice($data, ($p - 1) * $row, $row); + + foreach ($data as $k => $v) { + $total['current'] += $v['day_pay']; + } + + + //判断是否执行导出 + if (I('export') == 1) { + //操作日志 + $GetData = $_GET; + unset($GetData['xlsname']); + unset($GetData['export']); + addOperationLog(['op_type'=>3,'key'=>getNowDate(),'url'=>U('RechargeSum/summation',$GetData),'menu'=>'充值-游戏订单-充值汇总-导出']); + + $this->exportSum($export_data); + } + + $this->assign('showPromote', session('user_auth')['show_promote']); + $this->assign('meta_title', "充值汇总"); + $this->assign('list_data', $data); + $this->assign('total', $total); + $this->assign('startDate', $startDateTime); + $this->assign('endDate', $endDateTime); + $this->assign("is_admin",is_administrator()); + $this->m_title = '充值汇总'; + $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'RechargeSum/summation', 'status' => 1])->find()); + + + $this->display(); + } + + public function exportSum($data) + { + $export = A('Export'); + $exptitle = $_REQUEST['xlsname']; + $expCellName = array( + array('date', '日期'), + array('from_channel', '渠道来源'), + array('game_name', '游戏名称'), + array('new_person', '新增人数'), + array('active_person', '活跃人数'), + array('new_pay_person', "新增玩家付费"), + array('day_pay', '本日累计'), + ); + if (session('user_auth')['show_promote'] == 0) { + foreach ($expCellName as $key => $row) { + if ($row[0] == 'promote_id') { + unset($expCellName[$key]); + break; + } + } + $expCellName = array_values($expCellName); + } + $expTableData = $data; + $export->exportExcel($exptitle, $expCellName, $expTableData); + } +} diff --git a/Application/Admin/View/RechargeSumOther/summation.html b/Application/Admin/View/RechargeSumOther/summation.html new file mode 100644 index 000000000..d58aedb0d --- /dev/null +++ b/Application/Admin/View/RechargeSumOther/summation.html @@ -0,0 +1,307 @@ + + + + + + + + +
+ +

充值查询

+

充值汇总：根据推广员和游戏信息，对游戏充值数据按每日进行数据汇总统计。

+
+ +
+ +
+
+ +
+
+ + - +
+ + +
+
+
+ +
+
+ 搜索 +
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
日期渠道来源游戏名称新增人数活跃人数新增玩家付费本日累计付费
aOh! 暂时还没有内容!
{$data.date}{$data.from_channel}{$data.game_name}{$data.new_person}{$data.active_person}{$data.new_pay_person}{$data.day_pay}
汇总当页付费￥{$total.current|default=0} ， 累计付费￥{$total.sum}
+
+
+
+ + 导出 + + {$_page|default=''} +
+ +
+ +
+ + +
+ 已添加添加至常用设置 +
+ + + + + + + + + + + + + + From 69566e18392d0ba4ab3d7b84fb4c70404c6128ae Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 22 Apr 2021 09:28:11 +0800 Subject: [PATCH 8/9] =?UTF-8?q?4.22=E5=8F=B7=E5=8A=9F=E8=83=BD=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/StatementMangement/rewardExport.html | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Application/Admin/View/StatementMangement/rewardExport.html b/Application/Admin/View/StatementMangement/rewardExport.html index cf1bce9bb..0a4bfe84c 100644 --- a/Application/Admin/View/StatementMangement/rewardExport.html +++ b/Application/Admin/View/StatementMangement/rewardExport.html @@ -55,6 +55,7 @@ 结算方式 添加人 + 审核状态 @@ -91,6 +92,13 @@ 无 {:get_admin_name($data['creater_id'])} + + {$data.verify} + + {$data.verify} + + -- + @@ -118,6 +126,15 @@ {:get_admin_name($data['creater_id'])} + + + {$data.verify} + + {$data.verify} + + -- + + From f2e56125feea4b7f3b1026547bc45643cf2ee1ab Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 22 Apr 2021 09:45:54 +0800 Subject: [PATCH 9/9] =?UTF-8?q?4.22=E5=8F=B7=E5=8A=9F=E8=83=BD=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/View/StatementMangement/rewardManageList.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/View/StatementMangement/rewardManageList.html b/Application/Admin/View/StatementMangement/rewardManageList.html index 8e1e7b1fe..d8505f19f 100644 --- a/Application/Admin/View/StatementMangement/rewardManageList.html +++ b/Application/Admin/View/StatementMangement/rewardManageList.html @@ -325,11 +325,11 @@ - 合计 + 合计 -{:array_sum(array_column($list, 'totalPunish'))} 合计 {:array_sum(array_column($list, 'totalReward'))} - +