weixin

Application/Sdk/Controller/PayH5Controller.class.php

@@ -1447,9 +1447,17 @@ class PayH5Controller extends BaseController{
         // 绑币平台币优先处理
         $this->other_price($request);
         $pay_amount = $request['price'];
-        
-        $pay_info = get_payment_config(2, $game, $user_id);
-        $pay_conf = json_decode($pay_info['config'], true);
+
+        $pay_info = get_payment_config(2, $game, $request['user_id']);
+        if ($pay_info['code'] != 0) {
+            echo json_encode(['code'=>1010,'msg'=> $pay_info['msg']]);
+            exit;
+        }
+        $pay_conf = json_decode($pay_info['data']['config'], true);
+        $pay_info = $pay_info['data'];
+        $pay_conf['id'] = $pay_info['id'];
+        $pay_conf['merchant_id'] = $pay_info['id'];
+
         //0 官方 1威富通  2俊付通
         //     	if (get_wx_pay_type() == 0) {
         if ($pay_info['channel'] == 2) {