diff --git a/Application/Admin/Controller/PromoteCoinController.class.php b/Application/Admin/Controller/PromoteCoinController.class.php index ab7d18b05..2db53e3a5 100644 --- a/Application/Admin/Controller/PromoteCoinController.class.php +++ b/Application/Admin/Controller/PromoteCoinController.class.php @@ -345,9 +345,7 @@ class PromoteCoinController extends ThinkController // $map['id'] = array('lt',1); // } setPowerPromoteIds($map,'promote_id'); - - $data = D("CoinPayOrder")->lists($_GET["p"], $map, $order); - // dump($data); + $data = D("CoinPayOrder")->lists($_GET["p"], $map, 'id desc'); //执行查询 // parent::order_lists("CoinPayOrder",$_GET["p"],$extend); $this->meta_title = '线下充值审核列表'; @@ -382,7 +380,7 @@ class PromoteCoinController extends ThinkController for ($i = 0; $i < $count; $i++) { $this->doOfflineAgree($ids[$i]); } - $this->success("批量通过成功"); + $this->success("审核通过成功"); # code... } @@ -398,7 +396,7 @@ class PromoteCoinController extends ThinkController for ($i = 0; $i < $count; $i++) { $this->orderReject($ids[$i]); } - $this->success("批量拒绝成功"); + $this->success("审核拒绝成功"); # code... } @@ -411,7 +409,7 @@ class PromoteCoinController extends ThinkController } // $balance_map['promote_id'] = $order['promote_id']; - $balance_map['game_id'] = 0; + $balance_map['game_id'] = $order['game_id']; $balance = M('promote_balance_coin', 'tab_')->where($balance_map)->find(); $this->balance_coin_update($order, $balance);//更新汇总 $this->coin_record_add($order, $balance); //添加流水 @@ -460,6 +458,8 @@ class PromoteCoinController extends ThinkController $data['balance_coin'] = $balance['num'] + $order['coin_num']; $data['remark'] = $order['remark']; $data['create_time'] = time(); + $data['game_id'] = $order['game_id']; + $data['description'] = '线下充值'; M('promote_coin_record', 'tab_')->data($data)->add(); } @@ -469,11 +469,11 @@ class PromoteCoinController extends ThinkController { if (!empty($balance)) { $map['promote_id'] = $order['promote_id']; - $map['game_id'] = 0; + $map['game_id'] = $order['game_id']; M('promote_balance_coin', 'tab_')->where($map)->setInc('num', $order['coin_num']); } else { $balance['promote_id'] = $order['promote_id']; - $balance['game_id'] = 0; + $balance['game_id'] = $order['game_id']; $balance['num'] = $order['coin_num']; M('promote_balance_coin', 'tab_')->data($balance)->add(); } diff --git a/Application/Admin/View/PromoteCoin/offlineList.html b/Application/Admin/View/PromoteCoin/offlineList.html index ef6e8927a..1edaa2669 100644 --- a/Application/Admin/View/PromoteCoin/offlineList.html +++ b/Application/Admin/View/PromoteCoin/offlineList.html @@ -34,12 +34,6 @@