diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index 88e78320a..fe12aeb59 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -759,7 +759,7 @@ class FinanceController extends ThinkController } public function gameStatisticsDetail($p = 1) { - set_time_limit(0); + if (isset($_REQUEST['pay_way'])) { $map['pay_way'] = $_REQUEST['pay_way']; @@ -831,6 +831,7 @@ class FinanceController extends ThinkController $order = "pay_time DESC"; $data = D('spend')->getSpendData($map,$field,$group,$order,$page,$row); + foreach($data as $key => $value) { $data[$key]['pay_way'] = getPayType($value['pay_way']); } @@ -847,16 +848,15 @@ class FinanceController extends ThinkController $this->assign('sumInside', $sumInside); $this->assign('sumAll', null_to_0($sumAll)); - $count = D("spend")->getSpendData($map,$field,$group,$order); + $count = D("spend")->getSpendData($map,'count(*) as count',$group,$order); - $count = count($count); + $count = $count[0]['count']; $page = set_pagination($count,$row); if($page) {$this->assign('_page', $page);} $this->meta_title = '游戏订单查看'; $this->assign('data',$data); - $from = I('from', ''); - $this->display($from); + $this->display(); } public function coinDetail($p = 1) { diff --git a/Application/Admin/Controller/RepairController.class.php b/Application/Admin/Controller/RepairController.class.php index 02f23d354..05de1242c 100644 --- a/Application/Admin/Controller/RepairController.class.php +++ b/Application/Admin/Controller/RepairController.class.php @@ -166,6 +166,17 @@ class RepairController extends ThinkController { M($tab, 'tab_')->commit(); } } else { // deposit + $user = M("user","tab_"); + $r = $user->where("id=".$order['user_id'])->setInc("balance", $order['pay_amount']); + if ($r === false) { + M($tab, 'tab_')->rollback(); + $this->ajaxReturn(array('status'=>1,'msg'=>'数据有误.')); + } + $r = $user->where("id=".$order['user_id'])->setInc("cumulative", $order['pay_amount']); + if ($r === false) { + M($tab, 'tab_')->rollback(); + $this->ajaxReturn(array('status'=>1,'msg'=>'数据有误..')); + } M('spend', 'tab_')->commit(); } diff --git a/Application/Admin/View/Finance/coinDetail.html b/Application/Admin/View/Finance/coinDetail.html index ce9338edc..1f4c58998 100644 --- a/Application/Admin/View/Finance/coinDetail.html +++ b/Application/Admin/View/Finance/coinDetail.html @@ -15,6 +15,7 @@ @@ -91,9 +93,10 @@
@@ -253,9 +256,11 @@ Think.setValue('{$key}',"{$vo}"); + $(".select_gallery").select2(); diff --git a/Application/Admin/View/Finance/gameStatisticsDetail.html b/Application/Admin/View/Finance/gameStatisticsDetail.html index 400e00d37..dedd6862e 100644 --- a/Application/Admin/View/Finance/gameStatisticsDetail.html +++ b/Application/Admin/View/Finance/gameStatisticsDetail.html @@ -41,7 +41,7 @@
- 返回 + 返回
diff --git a/Data/update.sql b/Data/update.sql index ab62accb3..67f2f4060 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -894,3 +894,16 @@ ADD COLUMN `event_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '事件是否通 -- 菜单添加补单记录 INSERT INTO `sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`) VALUES ('补单记录管理', 137, 0, 'BehaviorLog/singleSupplement', 0, '', '游戏订单', 0, 1); + +-- 增加通知到账 tping +CREATE TABLE `tab_repair_pay` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `admin_id` int(11) NOT NULL DEFAULT '0', + `admin_name` varchar(255) NOT NULL DEFAULT '', + `pay_order_number` varchar(255) NOT NULL DEFAULT '', + `ip` varchar(255) NOT NULL DEFAULT '', + `tab` varchar(255) NOT NULL DEFAULT '' COMMENT '订单表:spend,deposit', + `create_time` int(11) NOT NULL DEFAULT '0', + `type` int(11) DEFAULT '0' COMMENT '0通知到账 1补单记录', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8 COMMENT='通知到账补单'; \ No newline at end of file diff --git a/README.md b/README.md index c13f064c2..f8f969a8c 100644 --- a/README.md +++ b/README.md @@ -1 +1,5 @@ -# cq_new_sy4.0_sdk_cha +

+ +## 天下游戏平台 + +天下游戏平台,万盟天下版权所有。 \ No newline at end of file