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 @@
-
- -
@@ -87,17 +81,16 @@ - - - + 订单号 充值账号 + 游戏名称 提交时间 - 平台币数量 + 充值绑币数量 + 优惠值 付款金额 - 汇入银行 - 支付凭证 + 订单号 备注 审核状态 @@ -112,12 +105,19 @@ - + {$data.order_number} {$data.promote_account} + + + 通用 + + {:get_gamename($data['game_id'])} + + {:set_show_time($data['create_time'])} {$data.coin_num} - {$data.real_amount} - — — + {$data.discount}% + {$data.pay_amount} {$data.pay_order_number} {$data.remark} diff --git a/Application/Admin/View/PromoteCoin/offlineOrderInfo.html b/Application/Admin/View/PromoteCoin/offlineOrderInfo.html index 30f8c2aed..d7b313fda 100644 --- a/Application/Admin/View/PromoteCoin/offlineOrderInfo.html +++ b/Application/Admin/View/PromoteCoin/offlineOrderInfo.html @@ -42,6 +42,18 @@ {$data['promote_account']} + + 游戏名称: + + + 通用 + + {:get_gamename($data['game_id'])} + + + + + 平台币数量: @@ -49,19 +61,19 @@ - 购买金额: + 优惠值: - {$data['real_amount']} + {$data['discount']}% - 汇入银行: + 实付金额: - -- + {$data['pay_amount']} - 支付凭证: + 订单号: {$data['pay_order_number']} @@ -112,7 +124,7 @@ charset="UTF-8">