diff --git a/Application/Admin/Controller/DepositController.class.php b/Application/Admin/Controller/DepositController.class.php
index 181ef0ba5..49dfcea2f 100644
--- a/Application/Admin/Controller/DepositController.class.php
+++ b/Application/Admin/Controller/DepositController.class.php
@@ -89,45 +89,45 @@ class DepositController extends ThinkController {
$map1=$map;
$map1['pay_status']=1;
- if($_REQUEST['promote_id']||$_REQUEST['promote_id']=='0') {
- $page = intval($p);
- $page = $page ? $page : 1; //默认显示第一页数据
- if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 10;}
- $map1['order_status'] = 1;
- unset($map1['pay_status']);
- if ($map['pay_status']) {
- $map['order_status']=$map['pay_status'];
- }
-
- $total=null_to_0(D('coin_pay_order')->where($map1)->sum('pay_amount'));
- $ttotal=null_to_0(D('coin_pay_order')->where('create_time'.total(1))->where(array('pay_status'=>1))->sum('pay_amount'));
- $ytotal=null_to_0(D('coin_pay_order')->where('create_time'.total(5))->where(array('pay_status'=>1))->sum('pay_amount'));
- $this->assign('total',$total);
- $this->assign('ttotal',$ttotal);
- $this->assign('ytotal',$ytotal);
-
- $data = D('coin_pay_order')
- /* 查询指定字段，不指定则查询所有字段 */
- ->field('*,order_status as pay_status')
- // 查询条件
- ->where($map)
- /* 默认通过id逆序排列 */
- ->order("id desc")
- /* 数据分页 */
- ->page($page, $row)
- /* 执行查询 */
- ->select();
-
- /* 查询记录总数 */
- $count = D('coin_pay_order')->where($map)->count();
-
- $page = set_pagination($count,$row);
- if($page) {$this->assign('_page', $page);}
-
- $this->assign('list_data', $data);
- $this->meta_title = '平台币充值列表';
- $this->display('lists');die();
- }
+// if($_REQUEST['promote_id']||$_REQUEST['promote_id']=='0') {
+// $page = intval($p);
+// $page = $page ? $page : 1; //默认显示第一页数据
+// if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 10;}
+// $map1['order_status'] = 1;
+// unset($map1['pay_status']);
+// if ($map['pay_status']) {
+// $map['order_status']=$map['pay_status'];
+// }
+//
+// $total=null_to_0(D('coin_pay_order')->where($map1)->sum('pay_amount'));
+// $ttotal=null_to_0(D('coin_pay_order')->where('create_time'.total(1))->where(array('pay_status'=>1))->sum('pay_amount'));
+// $ytotal=null_to_0(D('coin_pay_order')->where('create_time'.total(5))->where(array('pay_status'=>1))->sum('pay_amount'));
+// $this->assign('total',$total);
+// $this->assign('ttotal',$ttotal);
+// $this->assign('ytotal',$ytotal);
+//
+// $data = D('coin_pay_order')
+// /* 查询指定字段，不指定则查询所有字段 */
+// ->field('*,order_status as pay_status')
+// // 查询条件
+// ->where($map)
+// /* 默认通过id逆序排列 */
+// ->order("id desc")
+// /* 数据分页 */
+// ->page($page, $row)
+// /* 执行查询 */
+// ->select();
+//
+// /* 查询记录总数 */
+// $count = D('coin_pay_order')->where($map)->count();
+//
+// $page = set_pagination($count,$row);
+// if($page) {$this->assign('_page', $page);}
+//
+// $this->assign('list_data', $data);
+// $this->meta_title = '平台币充值列表';
+// $this->display('lists');die();
+// }
$total=null_to_0(D(self::model_name)->where($map1)->sum('pay_amount'));
$ttotal=null_to_0(D(self::model_name)->where('create_time'.total(1))->where(array('pay_status'=>1))->sum('pay_amount'));
@@ -144,6 +144,117 @@ class DepositController extends ThinkController {
parent::lists(self::model_name,$_GET["p"],$map);
}
+ public function lists_secord() {
+
+ if(isset($_REQUEST['user_account'])){
+ $map['user_account']=array('like','%'.trim($_REQUEST['user_account']).'%');
+ unset($_REQUEST['user_account']);
+ }
+ if(isset($_REQUEST['order_number'])){
+ $map['order_number']=array('like','%'.trim($_REQUEST['order_number']).'%');
+ unset($_REQUEST['order_number']);
+ }
+ if(isset($_REQUEST['pay_ip'])){
+ $map['pay_ip']=array('like','%'.trim($_REQUEST['pay_ip']).'%');
+ unset($_REQUEST['pay_ip']);
+ }
+
+ setPowerPromoteIds($map,'promote_id');
+
+ if(!isset($_REQUEST['promote_id'])){
+
+ }else if(isset($_REQUEST['promote_id']) && $_REQUEST['promote_id']==0){
+ $map['promote_id']=array('elt',0);
+ }elseif(isset($_REQUEST['promote_name'])&&$_REQUEST['promote_id']==-1){
+ $map['promote_id']=get_promote_id($_REQUEST['promote_name']);
+ }else{
+ $map['promote_id']=$_REQUEST['promote_id'];
+ }
+ if(isset($_REQUEST['time-start'])&&isset($_REQUEST['time-end'])){
+ $map['create_time'] =array('BETWEEN',array(strtotime($_REQUEST['time-start']),strtotime($_REQUEST['time-end'])+24*60*60-1));
+ unset($_REQUEST['time-start']);unset($_REQUEST['time-end']);
+ }elseif(isset($_REQUEST['time-start'])){
+ $map['create_time'] = ['GT',strtotime(I('time-start'))];
+ unset($_REQUEST['time-start']);
+ }elseif(isset($_REQUEST['time-end'])){
+ $map['create_time'] = ['LT',strtotime(I('time-end'))+86399];
+ unset($_REQUEST['time-end']);
+ }
+ if(isset($_REQUEST['start'])&&isset($_REQUEST['end'])){
+ $map['create_time'] =array('BETWEEN',array(strtotime($_REQUEST['start']),strtotime($_REQUEST['end'])+24*60*60-1));
+ unset($_REQUEST['start']);unset($_REQUEST['end']);
+ }elseif(isset($_REQUEST['start'])){
+ $map['create_time'] = ['GT',strtotime(I('start'))];
+ unset($_REQUEST['start']);
+ }elseif(isset($_REQUEST['end'])){
+ $map['create_time'] = ['LT',strtotime(I('end'))+86399];
+ unset($_REQUEST['end']);
+ }
+ if(isset($_REQUEST['pay_way'])) {
+ if ($_REQUEST['pay_way'] == "2") {
+ $map['pay_way'] = ['in', '2,3,4'];
+ } else {
+ $map['pay_way'] = $_REQUEST['pay_way'];
+ }
+ unset($_REQUEST['pay_way']);
+ }
+
+
+ if(isset($_REQUEST['pay_status'])){
+ $map['pay_status']=$_REQUEST['pay_status'];
+ unset($_REQUEST['pay_status']);
+ }
+ if($_REQUEST['data_order']!=''){
+ $data_order=reset(explode(',',$_REQUEST['data_order']));
+ $data_order_type=end(explode(',',$_REQUEST['data_order']));
+ $this->assign('userarpu_order',$data_order);
+ $this->assign('userarpu_order_type',$data_order_type);
+ $sort = $data_order==3?'desc':'asc';
+ $map['order'] = $data_order_type.' '.$sort;
+ }
+
+ $map1=$map;
+ $map1['pay_status']=1;
+
+ $page = intval($p);
+ $page = $page ? $page : 1; //默认显示第一页数据
+ if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 10;}
+ $map1['order_status'] = 1;
+ unset($map1['pay_status']);
+ if ($map['pay_status']) {
+ $map['order_status']=$map['pay_status'];
+ }
+
+ $total=null_to_0(D('coin_pay_order')->where($map1)->sum('pay_amount'));
+ $ttotal=null_to_0(D('coin_pay_order')->where('create_time'.total(1))->where(array('pay_status'=>1))->sum('pay_amount'));
+ $ytotal=null_to_0(D('coin_pay_order')->where('create_time'.total(5))->where(array('pay_status'=>1))->sum('pay_amount'));
+ $this->assign('total',$total);
+ $this->assign('ttotal',$ttotal);
+ $this->assign('ytotal',$ytotal);
+
+ $data = D('coin_pay_order')
+ /* 查询指定字段，不指定则查询所有字段 */
+ ->field('*,order_status as pay_status,order_number as pay_order_number')
+ // 查询条件
+ ->where($map)
+ /* 默认通过id逆序排列 */
+ ->order("id desc")
+ /* 数据分页 */
+ ->page($page, $row)
+ /* 执行查询 */
+ ->select();
+
+ /* 查询记录总数 */
+ $count = D('coin_pay_order')->where($map)->count();
+
+ $page = set_pagination($count,$row);
+ if($page) {$this->assign('_page', $page);}
+
+ $this->assign('list_data', $data);
+ $this->meta_title = '平台币充值列表';
+ $this->display();die();
+ }
+
public function send_lists(){
diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index cb51513f8..d7c753ab6 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -1261,44 +1261,6 @@ class ExportController extends Controller
$map1 = $map;
$map1['pay_status'] = 1;
- if($_REQUEST['promote_id']||$_REQUEST['promote_id']=='0') {
-
- $map1['order_status'] = 1;
- unset($map1['pay_status']);
- if ($map['pay_status']) {
- $map['order_status']=$map['pay_status'];
- }
-
- $total=null_to_0(D('coin_pay_order')->where($map1)->sum('pay_amount'));
-
- if (isset($map['pay_status']) && $map['pay_status'] == 0) {
- $total = sprintf("%.2f", 0);
- } else {
- $total = sprintf("%.2f", $total);
- }
- $xlsCell = array(
- array('pay_order_number', "订单号"),
- array('promote_account', L('Subordinate_channel')),
- array('pay_amount', "充值平台币"),
- array('pay_way', "充值方式", 'get_pay_way', '*'),
- array('create_time', "充值时间"),
- array('pay_status', L('Order_status'), 'get_info_status', '*', '9'),
- array('', "共计充值{$total}"),
- );
- $xlsData = D('coin_pay_order')
- /* 查询指定字段，不指定则查询所有字段 */
- ->field('*,order_status as pay_status')
- // 查询条件
- ->where($map)
- /* 默认通过id逆序排列 */
- ->order("id desc")
- /* 执行查询 */
- ->select();
-// var_dump($xlsData);die();
- foreach ($xlsData as $key => $value) {
- $xlsData[$key]['create_time'] = date('Y-m-d H:i:s', $value['create_time']);
- }
- } else {
$total = D('Deposit')->where($map1)->sum('pay_amount');
if (isset($map['pay_status']) && $map['pay_status'] == 0) {
$total = sprintf("%.2f", 0);
@@ -1324,7 +1286,6 @@ class ExportController extends Controller
foreach ($xlsData as $key => $value) {
$xlsData[$key]['create_time'] = date('Y-m-d H:i:s', $value['create_time']);
}
- }
// dd($xlsData);
break;
case 9:
@@ -2245,6 +2206,99 @@ class ExportController extends Controller
$xlsData[] = $re_data;
}
break;
+ case 26:
+ $xlsName = $xlsName?$xlsName:L('Platform_currency_recharge');
+ if (isset($_REQUEST['user_account'])) {
+ $map['user_account'] = array('like', '%' . trim($_REQUEST['user_account']) . '%');
+ unset($_REQUEST['user_account']);
+ }
+ if (isset($_REQUEST['order_number'])) {
+ $map['order_number'] = array('like', '%' . trim($_REQUEST['order_number']) . '%');
+ unset($_REQUEST['order_number']);
+ }
+ if (isset($_REQUEST['pay_ip'])) {
+ $map['pay_ip'] = array('like', '%' . trim($_REQUEST['pay_ip']) . '%');
+ unset($_REQUEST['pay_ip']);
+ }
+
+ // $promoteRoot = getPowerPromoteIds();
+ // $data_empower_type = session('user_auth')['data_empower_type'];
+ //
+ // if ($promoteRoot) {
+ // $map['promote_id'] =array('in',$promoteRoot);
+ // } else if(!$promoteRoot&&$data_empower_type!=1){
+ // $map['id'] = array('lt',1);
+ // }
+ setPowerPromoteIds($map,'promote_id');
+
+ if (!isset($_REQUEST['promote_id'])) {
+
+ } else if (isset($_REQUEST['promote_id']) && $_REQUEST['promote_id'] == 0) {
+ $map['promote_id'] = array('elt', 0);
+ } elseif (isset($_REQUEST['promote_name']) && $_REQUEST['promote_id'] == -1) {
+ $map['promote_id'] = get_promote_id($_REQUEST['promote_name']);
+ } else {
+ $map['promote_id'] = $_REQUEST['promote_id'];
+ }
+ if (isset($_REQUEST['time-start']) && isset($_REQUEST['time-end'])) {
+ $map['create_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['start']) && isset($_REQUEST['end'])) {
+ $map['create_time'] = array('BETWEEN', array(strtotime($_REQUEST['start']), strtotime($_REQUEST['end']) + 24 * 60 * 60 - 1));
+ unset($_REQUEST['start']);
+ unset($_REQUEST['end']);
+ }
+ if (isset($_REQUEST['pay_way'])) {
+ $map['pay_way'] = $_REQUEST['pay_way'];
+ unset($_REQUEST['pay_way']);
+ }
+ if (isset($_REQUEST['pay_status'])) {
+ $map['pay_status'] = $_REQUEST['pay_status'];
+ unset($_REQUEST['pay_status']);
+ }
+ $map1 = $map;
+ $map1['pay_status'] = 1;
+
+ $map1['order_status'] = 1;
+ unset($map1['pay_status']);
+ if ($map['pay_status']) {
+ $map['order_status']=$map['pay_status'];
+ }
+
+ $total=null_to_0(D('coin_pay_order')->where($map1)->sum('pay_amount'));
+
+ if (isset($map['pay_status']) && $map['pay_status'] == 0) {
+ $total = sprintf("%.2f", 0);
+ } else {
+ $total = sprintf("%.2f", $total);
+ }
+ $xlsCell = array(
+ array('pay_order_number', "订单号"),
+ array('promote_account', L('Subordinate_channel')),
+ array('pay_amount', "充值平台币"),
+ array('pay_way', "充值方式", 'get_pay_way', '*'),
+ array('create_time', "充值时间"),
+ array('pay_status', L('Order_status'), 'get_info_status', '*', '9'),
+ array('', "共计充值{$total}"),
+ );
+ $xlsData = D('coin_pay_order')
+ /* 查询指定字段，不指定则查询所有字段 */
+ ->field('*,order_status as pay_status,order_number as pay_order_number')
+ // 查询条件
+ ->where($map)
+ /* 默认通过id逆序排列 */
+ ->order("id desc")
+ /* 执行查询 */
+ ->select();
+// var_dump($xlsData);die();
+ foreach ($xlsData as $key => $value) {
+ $xlsData[$key]['create_time'] = date('Y-m-d H:i:s', $value['create_time']);
+ }
+
+// dd($xlsData);
+ break;
default:
$xlsName = $xlsCell = $xlsData = [];
diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php
index f4ab7e9c2..48ec8ed1a 100644
--- a/Application/Admin/Controller/MemberController.class.php
+++ b/Application/Admin/Controller/MemberController.class.php
@@ -14,9 +14,9 @@ class MemberController extends ThinkController
*/
public function user_info($p=0){
//设定默认时间
- if(!array_key_exists("time_start",$_REQUEST) && I('type') != 2){
- $this->redirect(ACTION_NAME, array('time_start' => date('Y-m-d',strtotime('-30 day')),"time_end"=>date('Y-m-d')));
- }
+// if(!array_key_exists("time_start",$_REQUEST) && I('type') != 2){
+// $this->redirect(ACTION_NAME, array('time_start' => date('Y-m-d',strtotime('-30 day')),"time_end"=>date('Y-m-d')));
+// }
//基础信息
$page = intval($p);
$page = $page ? $page : 1; //默认显示第一页数据
diff --git a/Application/Admin/View/Deposit/lists.html b/Application/Admin/View/Deposit/lists.html
index fa8e433dd..dce79d5a2 100644
--- a/Application/Admin/View/Deposit/lists.html
+++ b/Application/Admin/View/Deposit/lists.html
@@ -28,6 +28,10 @@
</style>
<div class="cf main-place top_nav_list navtab_list">
+ <div class="fr">
+ <a class="tabchose" href="{:U('lists',array('type'=>1))}">平台币充值</a>
+ <a href="{:U('lists_secord',array('type'=>2))}">推广员充值</a>
+ </div>
<h3 class="page_title">平台币充值</h3>
<p class="description_text">说明：玩家充值平台币到账户的记录，不包含消费平台币的记录，如需查询平台币使用，请到游戏充值中查询</p>
</div>
@@ -78,21 +82,21 @@
</select>
</div>
- <div class="input-list search_item input-list-gamenoticestatus">
- <select name="promote_level" style="color:#444" class="select_gallery" id="promote_level">
- <option value="">请选择推广员等级</option>
- <option value="1" <?php if ($_POST['promote_level'] == 1):?>selected<?php endif;?>>会长</option>
- <option value="2" <?php if ($_POST['promote_level'] == 2):?>selected<?php endif;?>>部门长</option>
- <option value="3" <?php if ($_POST['promote_level'] == 3):?>selected<?php endif;?>>组长</option>
- <option value="4" <?php if ($_POST['promote_level'] == 4):?>selected<?php endif;?>>组员</option>
- </select>
- -
- </div>
- <div class="input-list search_item input-list-gamenoticestatus">
- <select name="promote_id" style="color:#444" class="select_gallery" id="promote_id">
- <option value="">请选择推广员</option>
- </select>
- </div>
+<!-- <div class="input-list search_item input-list-gamenoticestatus">-->
+<!-- <select name="promote_level" style="color:#444" class="select_gallery" id="promote_level">-->
+<!-- <option value="">请选择推广员等级</option>-->
+<!-- <option value="1" <?php if ($_POST['promote_level'] == 1):?>selected<?php endif;?>>会长</option>-->
+<!-- <option value="2" <?php if ($_POST['promote_level'] == 2):?>selected<?php endif;?>>部门长</option>-->
+<!-- <option value="3" <?php if ($_POST['promote_level'] == 3):?>selected<?php endif;?>>组长</option>-->
+<!-- <option value="4" <?php if ($_POST['promote_level'] == 4):?>selected<?php endif;?>>组员</option>-->
+<!-- </select>-->
+<!-- - -->
+<!-- </div>-->
+<!-- <div class="input-list search_item input-list-gamenoticestatus">-->
+<!-- <select name="promote_id" style="color:#444" class="select_gallery" id="promote_id">-->
+<!-- <option value="">请选择推广员</option>-->
+<!-- </select>-->
+<!-- </div>-->
<input type="hidden" name="" value="" class="sortBy">
<div class="input-list">
@@ -112,7 +116,7 @@
<thead>
<tr>
<th>订单号</th>
- <if condition="$_REQUEST['promote_id'] eq ''"><th>玩家账号</th></if>
+ <th>玩家账号</th>
<th>所属推广员</th>
<th>
<a class="paixu" data-order='pay_amount'>
@@ -120,14 +124,14 @@
</a>
</th>
<th>充值方式</th>
- <if condition="$_REQUEST['promote_id'] eq ''"><th>充值ip</th></if>
+ <th>充值ip</th>
<th>
<a class="paixu" data-order='create_time'>
充值时间
</a>
</th>
<th>订单状态</th>
- <if condition="$_REQUEST['promote_id'] eq ''"><th>操作</th></if>
+ <th>操作</th>
</tr>
</thead>
@@ -138,14 +142,14 @@
<else />
<volist name="list_data" id="data">
<tr>
- <td><if condition="$data['pay_order_number'] neq ''">{:$data['pay_order_number']}<else/>无</if></td>
- <if condition="$_REQUEST['promote_id'] eq ''"><td>
+ <td>{:$data['pay_order_number']}</td>
+ <td>
<if condition="$is_admin eq true ">
{$data.user_account}
<else />
{$data.user_account|encryptStr}
</if>
- </td></if>
+ </td>
<td>
<if condition="$data['promote_account'] eq '自然注册'">
官方渠道
@@ -160,7 +164,7 @@
</td>
<td><span>{$data.pay_amount}</span></td>
<td><if condition="$data['pay_way'] neq ''">{:get_pay_way($data['pay_way'])}<else/>无</if></td>
- <if condition="$_REQUEST['promote_id'] eq ''"><td>{$data.pay_ip}</td></if>
+ <td>{$data.pay_ip}</td>
<td>{:set_show_time($data['create_time'],'','pay')}</td>
<td>
<if condition="$data['pay_status'] eq 1">
@@ -170,14 +174,14 @@
</if>
</td>
- <if condition="$_REQUEST['promote_id'] eq ''"><td style="text-indent:0;">
+ <td style="text-indent:0;">
<br />
<if condition="$data['pay_status'] eq 0">
<a class="pay_repair" href="javascript:void(0);"
href-data="{$data.pay_order_number}" href-hhh="{:U('Repair/noticePayed')}" style="width:100%;">通知到账</a>
</if>
- </td></if>
+ </td>
</tr>
</volist>