Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0

5 years ago · f640531c0b
parent dc57a5e5f4 f8b570c20e
commit f640531c0b
1 changed files with 2 additions and 0 deletions
--- a/Application/Admin/Controller/PayChannelController.class.php
+++ b/Application/Admin/Controller/PayChannelController.class.php
@ -46,6 +46,7 @@ class PayChannelController extends ThinkController
        if (!empty($_REQUEST['game_id'])) {
            $map['game_id'] = $_REQUEST['game_id'];
            $bindMap['game_id'] = $_REQUEST['game_id'];
+            $coinMap['game_id'] = $_REQUEST['game_id'];
        }

        $map['pay_status'] = $coinMap['pay_status'] = 1;
@ -73,6 +74,7 @@ class PayChannelController extends ThinkController
            ->group("game_id")
            ->select();

+        unset($coinMap['game_id']);
        //平台币充值
        $coinSum = M('deposit','tab_')
            ->where($coinMap)