From bf68dc8ea8486f799b66ee92f8221b0b3ced000d Mon Sep 17 00:00:00 2001
From: sunday <153788231@qq.com>
Date: Sun, 26 Nov 2023 13:01:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BF=BD=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/frontend/modules/order/controllers/MergePayController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/frontend/modules/order/controllers/MergePayController.php b/app/frontend/modules/order/controllers/MergePayController.php
index c7af0bed..49eb3b7d 100644
--- a/app/frontend/modules/order/controllers/MergePayController.php
+++ b/app/frontend/modules/order/controllers/MergePayController.php
@@ -2124,7 +2124,7 @@ class MergePayController extends ApiController
         }
 //        $data=json_decode('{"result":1,"msg":"","data":{"bank_code":"SUCCESS","bank_message":"\u6210\u529f","hf_seq_id":"002900TOP1B231126112253P388ac139c9400000","huifu_id":"6666000143581181","party_order_id":"03222311264097357609631","pay_info":"{\"appId\":\"wx4af8f6640561083a\",\"timeStamp\":\"1700968973\",\"nonceStr\":\"fe0c3eb218fb4d208c4cba21bc2532c8\",\"package\":\"prepay_id=wx261122537937133992755630def6960000\",\"signType\":\"RSA\",\"paySign\":\"GuxETrBhemlOFmPAVz6dw7\/eJuqYmwKWLdfxgHztr6biqiG\/uUm5Mv9kP+1MqPM0T4egvnGMgSAq7EkQadKF9gXAFgf9F3AbkkIqO8o\/+hO7hRn5HOb5y1L6QxeU4Lc+frhhXsnJF\/PLQLAljSHG2qw\/bJGJs31okFdCkuLL7dIz5SLPqcGsOMxg\/4+54jls0vftNuua3iADT+7BQ34UIzO3W5H9sQadEzMhozzDXvIdSqSAL5C+ckuBVP57azmm0mkNzXdw1q\/yD9x2FZyVKSqcdLn\/b6R37S6BeD1jfQRctOrZ9cKoYArkS1IbsiG3y0FQENKamJnJD9faoStx5g==\"}","remark":"2","req_date":"20231126","req_seq_id":"PN2311261122881DC9","resp_code":"00000100","resp_desc":"\u4e0b\u5355\u6210\u529f","trade_type":"T_JSAPI","trans_amt":"498.00","trans_stat":"P","mode":1,"url":null},"validate_page":{"is_bind_mobile":0,"invite_page":0,"is_invite":0,"is_login":1,"invite_mobile":0,"bind_address":{"is_bind_address":1,"bind_address_type":0,"bind_address_page":[]},"need_video":0,"bind_mobile_page":[],"is_level_compel":0}}',true);
 //        $data['data']['mode']='200';
-        return $this->successJson('下单成功!', $data['data']);
+        return $this->successJson('下单成功!', $data);
     }