From 66a94c8f4ea9d7f633b981364b753dd673622c80 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 30 Dec 2020 14:07:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/service/PaymentService.php               | 4 ++--
 app/data/service/payment/AlipayPaymentService.php | 8 ++++----
 app/data/service/payment/JoinPaymentService.php   | 4 ++--
 app/data/service/payment/WechatPaymentService.php | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/data/service/PaymentService.php b/app/data/service/PaymentService.php
index 95c7d0b16..3796ba6eb 100644
--- a/app/data/service/PaymentService.php
+++ b/app/data/service/PaymentService.php
@@ -261,8 +261,8 @@ abstract class PaymentService extends Service
      * @param string $paymentAmount 交易订单金额（元）
      * @param string $paymentTitle 交易订单名称
      * @param string $paymentRemark 交易订单描述
-     * @param string $returnLocation 支付回跳地址
+     * @param string $paymentReturn 支付回跳地址
      * @return array
      */
-    abstract public function create(string $openid, string $orderNo, string $paymentAmount, string $paymentTitle, string $paymentRemark, string $returnLocation = ''): array;
+    abstract public function create(string $openid, string $orderNo, string $paymentAmount, string $paymentTitle, string $paymentRemark, string $paymentReturn = ''): array;
 }
\ No newline at end of file
diff --git a/app/data/service/payment/AlipayPaymentService.php b/app/data/service/payment/AlipayPaymentService.php
index 24ea5476d..1556bf654 100644
--- a/app/data/service/payment/AlipayPaymentService.php
+++ b/app/data/service/payment/AlipayPaymentService.php
@@ -99,11 +99,11 @@ class AlipayPaymentService extends PaymentService
      * @param string $paymentAmount 交易订单金额（元）
      * @param string $paymentTitle 交易订单名称
      * @param string $paymentRemark 订单订单描述
-     * @param string $returnLocation 完成回跳地址
+     * @param string $paymentReturn 完成回跳地址
      * @return array
      * @throws \think\Exception
      */
-    public function create(string $openid, string $orderNo, string $paymentAmount, string $paymentTitle, string $paymentRemark, string $returnLocation = ''): array
+    public function create(string $openid, string $orderNo, string $paymentAmount, string $paymentTitle, string $paymentRemark, string $paymentReturn = ''): array
     {
         try {
             if (isset(static::TYPES[static::$type])) {
@@ -114,10 +114,10 @@ class AlipayPaymentService extends PaymentService
             }
             $this->params['notify_url'] = sysuri("@data/api.notify/alipay/scene/order/param/{$tradeParam}", [], false, true);
             if (in_array($tradeType, [static::PAYMENT_ALIPAY_WAP, static::PAYMENT_ALIPAY_WEB])) {
-                if (empty($returnLocation)) {
+                if (empty($paymentReturn)) {
                     throw new \think\Exception('支付回跳地址不能为空！');
                 } else {
-                    $this->params['return_url'] = $returnLocation;
+                    $this->params['return_url'] = $paymentReturn;
                 }
             }
             if ($tradeType === static::PAYMENT_WECHAT_APP) {
diff --git a/app/data/service/payment/JoinPaymentService.php b/app/data/service/payment/JoinPaymentService.php
index 5a7c66bf4..772d87e8d 100644
--- a/app/data/service/payment/JoinPaymentService.php
+++ b/app/data/service/payment/JoinPaymentService.php
@@ -62,11 +62,11 @@ class JoinPaymentService extends PaymentService
      * @param string $paymentAmount 交易订单金额（元）
      * @param string $paymentTitle 交易订单名称
      * @param string $paymentRemark 订单订单描述
-     * @param string $returnLocation 支付回跳地址
+     * @param string $paymentReturn 支付回跳地址
      * @return array
      * @throws \think\Exception
      */
-    public function create(string $openid, string $orderNo, string $paymentAmount, string $paymentTitle, string $paymentRemark, string $returnLocation = ''): array
+    public function create(string $openid, string $orderNo, string $paymentAmount, string $paymentTitle, string $paymentRemark, string $paymentReturn = ''): array
     {
         try {
             if (isset(static::TYPES[static::$type])) {
diff --git a/app/data/service/payment/WechatPaymentService.php b/app/data/service/payment/WechatPaymentService.php
index bb6edaee5..a7de045ee 100644
--- a/app/data/service/payment/WechatPaymentService.php
+++ b/app/data/service/payment/WechatPaymentService.php
@@ -40,11 +40,11 @@ class WechatPaymentService extends PaymentService
      * @param string $paymentAmount 交易订单金额（元）
      * @param string $paymentTitle 交易订单名称
      * @param string $paymentRemark 订单订单描述
-     * @param string $returnLocation 支付回跳地址
+     * @param string $paymentReturn 支付回跳地址
      * @return array
      * @throws \think\Exception
      */
-    public function create(string $openid, string $orderNo, string $paymentAmount, string $paymentTitle, string $paymentRemark, string $returnLocation = ''): array
+    public function create(string $openid, string $orderNo, string $paymentAmount, string $paymentTitle, string $paymentRemark, string $paymentReturn = ''): array
     {
         try {
             if (isset(static::TYPES[static::$type])) {