From 559882dd667fd9ae8cea537bd684adc3ea8985be Mon Sep 17 00:00:00 2001
From: tping <tpingzhang11@126.com>
Date: Mon, 28 Dec 2020 16:44:51 +0800
Subject: [PATCH] main_id cz

---
 Application/Sdk/Controller/PayH5Controller.class.php   | 10 +++++++++-
 .../Sdk/Controller/ShortcutController.class.php        |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Application/Sdk/Controller/PayH5Controller.class.php b/Application/Sdk/Controller/PayH5Controller.class.php
index 31dcb6b3..eca64865 100644
--- a/Application/Sdk/Controller/PayH5Controller.class.php
+++ b/Application/Sdk/Controller/PayH5Controller.class.php
@@ -74,10 +74,12 @@ class PayH5Controller extends BaseController{
             exit;
         }
         $pay_conf = json_decode($pay_info['data']['config'], true);
+        $main_id = $pay_info['main_id'];
         $pay_info = $pay_info['data'];
         $pay_conf['id'] = $pay_info['id'];
         $pay_conf['merchant_id'] = $pay_info['id'];
         $pay_conf['merchant_way'] = self::ALI_PAY;
+        $pay_conf['main_id'] = $main_id;
 
         if ($pay_info['channel'] == 1) {  // 支付宝官方
                 
@@ -112,7 +114,7 @@ class PayH5Controller extends BaseController{
             $request['id'] = $pay_info['id'];
             $request['merchant_id'] = $pay_info['id'];
             $request['merchant_way'] = 1;
-            $request['main_id'] = $pay_conf['main_id'];
+            $request['main_id'] = $main_id;
             $this->add_deposit($request, 1);
             
             $sqpay=new Sqpay();
@@ -363,6 +365,7 @@ class PayH5Controller extends BaseController{
         $this->other_price($request);
         
         $pay_info = get_payment_config(self::ALI_PAY, $game, $request['user_id']);
+        $main_id = $pay_info['main_id'];
         if ($pay_info['code'] != 0) {
             echo json_encode(['code'=>1010,'msg'=> $pay_info['msg']]);
             exit;
@@ -372,6 +375,7 @@ class PayH5Controller extends BaseController{
         $pay_conf['id'] = $pay_info['id'];
         $pay_conf['merchant_id'] = $pay_info['id'];
         $pay_conf['merchant_way'] = self::ALI_PAY;
+        $pay_conf['main_id'] = $main_id;
         if ($pay_info['channel'] == 1) {  // 支付宝官方
             //             $game_set_data = get_game_set_info($request['game_id']);
             $request['apitype'] = "alipay";
@@ -741,10 +745,12 @@ class PayH5Controller extends BaseController{
             exit;
         }
         $pay_conf = json_decode($pay_info['data']['config'], true);
+        $main_id = $pay_conf['main_id'];
         $pay_info = $pay_info['data'];
         $pay_conf['id'] = $pay_info['id'];
         $pay_conf['merchant_id'] = $pay_info['id'];
         $pay_conf['merchant_way'] = self::WX_PAY;
+        $pay_conf['main_id'] = $main_id;
 
         //0 官方 1威富通  2俊付通
         //     	if (get_wx_pay_type() == 0) {
@@ -1462,10 +1468,12 @@ class PayH5Controller extends BaseController{
             exit;
         }
         $pay_conf = json_decode($pay_info['data']['config'], true);
+        $main_id = $pay_conf['main_id'];
         $pay_info = $pay_info['data'];
         $pay_conf['id'] = $pay_info['id'];
         $pay_conf['merchant_id'] = $pay_info['id'];
         $pay_conf['merchant_way'] = self::WX_PAY;
+        $pay_conf['main_id'] = $main_id;
 
         //0 官方 1威富通  2俊付通
         //     	if (get_wx_pay_type() == 0) {
diff --git a/Application/Sdk/Controller/ShortcutController.class.php b/Application/Sdk/Controller/ShortcutController.class.php
index 05a1f595..229869cb 100644
--- a/Application/Sdk/Controller/ShortcutController.class.php
+++ b/Application/Sdk/Controller/ShortcutController.class.php
@@ -591,12 +591,12 @@ class ShortcutController extends BaseController{
             exit;
         }
         $pay_conf = json_decode($pay_info['data']['config'], true);
+        $request['main_id'] = $pay_info['main_id'];
         $pay_info = $pay_info['data'];
         $pay_conf['id'] = $pay_info['id'];
         $request['merchant_id'] = $pay_info['id'];
         $request['merchant_way'] = PayH5Controller::EXPRESS_PAY;
-        $request['main_id'] = $pay_info['main_id'];
-        
+
         $yeepay = new Yeepay();
         $data['appKey'] = $pay_conf['key'];//C('yeepay.key');
         $data['privateKey'] = $pay_conf['private_key'];//C('yeepay.private_key');