payrment_rule

Application/Sdk/Controller/PayH5Controller.class.php

@@ -378,6 +378,8 @@ class PayH5Controller extends BaseController{
         }
         $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']
         if ($pay_info['channel'] == 1) {  // 支付宝官方
             //             $game_set_data = get_game_set_info($request['game_id']);
             $request['apitype'] = "alipay";
@@ -419,9 +421,9 @@ class PayH5Controller extends BaseController{
                     echo json_encode(['code'=>0,'msg'=>'订单已经存在，请刷新充值页面重新下单！','wap'=>1]);
                     exit;
                 }
-                $this->add_spend($request,1);
+                $this->add_spend($request,1, $pay_conf);
             }else{
-                $this->add_deposit($request, 1);
+                $this->add_deposit($request, 1, $pay_conf);
             }
             $sqpay=new Sqpay();
             $returl = C('PAY_DOMAIN'). "/sdk.php/Spend/pay_success/orderno/".$request['pay_order_number'].'/game_id/'.$request['game_id'];

ThinkPHP/Library/Think/Pay.class.php

@@ -76,13 +76,12 @@ class Pay
          $promoteId = $param['promote_id'];
          }
          $isKBCPartner = $this->isKBCPartner($promoteId); */
-        
         $this->payer->check();
         $result = false;
         if ($uc == 0) {
             switch ($vo->getTable()) {
                 case 'spend':
-                    $result = $this->add_spend($vo, $param);
+                    $result = $this->add_spend($vo, $param, $payConf);
                     break;
                 case 'deposit':
                     $result = $this->add_deposit($vo, $param);