Merge branch 'stabble'

app/Http/Controllers/Wap/Pay/OrdersController.php

@@ -1773,8 +1773,8 @@ class OrdersController extends Controller
 
     private function payAlert($pay_merchant_id, $trade_no = '', $pay_info = '', $n = 0)
     {
-        $change_pay_id = 40;
-        if ($pay_merchant_id == 40) {
+        $change_pay_id = 96;
+        if ($pay_merchant_id == 96) {
             $change_pay_id = 9;
         }
         try {