From 162f160dab9326d88e2840f75fefe4f916de17b8 Mon Sep 17 00:00:00 2001
From: elf <360197197@qq.com>
Date: Fri, 16 Jun 2023 22:46:29 +0800
Subject: [PATCH] yh

---
 app/Controller/Recharge/RechargeController.php | 10 ++++------
 public/payment.html                            |  8 ++++----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/Controller/Recharge/RechargeController.php b/app/Controller/Recharge/RechargeController.php
index ebcb6c9..d8847ec 100644
--- a/app/Controller/Recharge/RechargeController.php
+++ b/app/Controller/Recharge/RechargeController.php
@@ -102,32 +102,30 @@ class RechargeController extends AbstractController
         }
         return $this->success([
             'nextStep' => $nextStep,
-            'outMemberId' => $memberId,
+            'outMemberId' => $prePayLog->out_member_id,
             'bizData' => $bizData
         ]);
     }
 
     public function confirmBindCard(RequestInterface $request) {
         [$app, $prePayLog] = $this->checkToken($request->input('stoken', ''));
-        $outMemberId = $request->input('outMemberId');
         $smsNo = $request->input('smsNo');
         $smsCode = $request->input('smsCode');
-        $bizData = $this->paymentService->bindCardConfirm($this->buildComfirmBindCardParams($outMemberId, $smsNo, $smsCode, $app));
+        $bizData = $this->paymentService->bindCardConfirm($this->buildComfirmBindCardParams($prePayLog->out_member_id, $smsNo, $smsCode, $app));
         return $this->success([
-            'outMemberId' => $outMemberId,
+            'outMemberId' => $prePayLog->out_member_id,
             'bizData' => $bizData
         ]);
     }
 
     public function confirmPay(RequestInterface $request) {
         [$app, $prePayLog] = $this->checkToken($request->input('stoken', ''));
-        $outMemberId = $request->input('outMemberId');
         $token = $request->input('token');
         $protocol = $request->input('protocol');
         $smsCode = $request->input('smsCode');
         $bizData = $this->paymentService->protocolPayConfirm($this->buildConfirmPayParams($token, $protocol, $smsCode, $app));
         return $this->success([
-            'outMemberId' => $outMemberId,
+            'outMemberId' => $prePayLog->out_member_id,
             'bizData' => ['outTradeNo' => $bizData['outTradeNo']]
         ]);
     }
diff --git a/public/payment.html b/public/payment.html
index 94301dc..6aca0f3 100644
--- a/public/payment.html
+++ b/public/payment.html
@@ -80,13 +80,13 @@
                     stoken: '',
                     smsCode: '',
                     smsNo: '',
-                    memberId: ''
+                    outMemberId: ''
                 },
                 payConfirmVisible: false,
                 payConfirmForm: {
                     stoken: '',
                     smsCode: '',
-                    memberId: '',
+                    outMemberId: '',
                     token: '',
                     protocol: ''
                 },
@@ -123,12 +123,12 @@
                     }
                     if (result.data.nextStep == 'confirm-bind') {
                         this.bindConfirmVisible = true;
-                        this.bindConfirmForm.memberId = result.data.memberId;
+                        this.bindConfirmForm.outMemberId = result.data.outMemberId;
                         this.bindConfirmForm.smsNo = result.data.bizData.smsNo;
                         console.log(this.bindConfirmForm)
                     } else if (result.data.nextStep == 'confirm-pay') {
                         this.payConfirmVisible = true;
-                        this.payConfirmForm.memberId = result.data.memberId;
+                        this.payConfirmForm.outMemberId = result.data.outMemberId;
                         this.payConfirmForm.protocol = result.data.bizData.protocol;
                         this.payConfirmForm.token = result.data.bizData.token;
                         console.log(this.payConfirmForm)