From 74cfbba527e9fd93e11f3858e303fd3aabd740e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Thu, 23 Feb 2023 09:47:07 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=9A=E8=81=94?=
 =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/pay/OrderPayServices.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crmeb/app/services/pay/OrderPayServices.php b/crmeb/app/services/pay/OrderPayServices.php
index 7a02c93fe..4e36f12f9 100644
--- a/crmeb/app/services/pay/OrderPayServices.php
+++ b/crmeb/app/services/pay/OrderPayServices.php
@@ -198,7 +198,7 @@ class OrderPayServices
                 break;
             case PayServices::ALLIN_PAY:
                 if (request()->isWechat()) {
-                    $jsConfig['pay_url'] = AllinPay::UNITODER_H5UNIONPAY;
+                    $payUrl = AllinPay::UNITODER_H5UNIONPAY;
                 }
                 break;
             case PayServices::WEIXIN_PAY:
@@ -207,6 +207,6 @@ class OrderPayServices
                 }
         }
 
-        return ['jsConfig' => $jsConfig, 'order_id' => $order['order_id'], 'pay_key' => $payKey];
+        return ['jsConfig' => $jsConfig, 'order_id' => $order['order_id'], 'pay_key' => $payKey, 'pay_url' => $payUrl ?? ''];
     }
 }

From 9679153e0ea349882e1671cf0ee851eb66f8c3a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Thu, 23 Feb 2023 09:48:48 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/api/controller/v1/store/CategoryController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crmeb/app/api/controller/v1/store/CategoryController.php b/crmeb/app/api/controller/v1/store/CategoryController.php
index 7554d08b5..110c89b30 100644
--- a/crmeb/app/api/controller/v1/store/CategoryController.php
+++ b/crmeb/app/api/controller/v1/store/CategoryController.php
@@ -48,6 +48,6 @@ class CategoryController
     public function getCategoryVersion()
     {
         $data = $this->services->getCategoryVersion();
-        return app('json')->success(['version' => $data['version'], 'is_diy' => $data['diy']]);
+        return app('json')->success(['version' => $data['version'], 'is_diy' => $data['is_diy']]);
     }
 }

From b3fb36c5f9c60835160e939f306f02da3f717a6c Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Thu, 23 Feb 2023 09:52:16 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=85=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/pay/RechargeServices.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/crmeb/app/services/pay/RechargeServices.php b/crmeb/app/services/pay/RechargeServices.php
index 7285f8534..4716a51ab 100644
--- a/crmeb/app/services/pay/RechargeServices.php
+++ b/crmeb/app/services/pay/RechargeServices.php
@@ -14,10 +14,9 @@ namespace app\services\pay;
 
 
 use app\model\user\UserRecharge;
-use app\services\user\UserRechargeServices;
 use app\services\wechat\WechatUserServices;
 use crmeb\exceptions\ApiException;
-use Darabonba\GatewaySpi\Models\InterceptorContext\request;
+use crmeb\services\pay\extend\allinpay\AllinPay;
 
 /**
  *
@@ -100,7 +99,7 @@ class RechargeServices
             $payStstus = 'allinpay_pay';
         }
 
-        return ['jsConfig' => $res, 'pay_key' => md5($recharge['order_id']), 'order_id' => $recharge['order_id'], 'pay_type' => strtoupper($payStstus)];
+        return ['pay_url' => AllinPay::UNITODER_H5UNIONPAY, 'jsConfig' => $res, 'pay_key' => md5($recharge['order_id']), 'order_id' => $recharge['order_id'], 'pay_type' => strtoupper($payStstus)];
     }
 
 }

From 3a26a476dd2abf766449765af1438dd166ca55ef Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Thu, 23 Feb 2023 10:00:57 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=85=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/pay/RechargeServices.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crmeb/app/services/pay/RechargeServices.php b/crmeb/app/services/pay/RechargeServices.php
index 4716a51ab..8398e2602 100644
--- a/crmeb/app/services/pay/RechargeServices.php
+++ b/crmeb/app/services/pay/RechargeServices.php
@@ -85,7 +85,7 @@ class RechargeServices
             $openid = '';
         }
 
-        $res = $this->pay->pay($recharge['recharge_type'], $recharge['order_id'], $recharge['price'], 'user_recharge', '用户充值', ['openid' => $openid]);
+        $res = $this->pay->pay($payType, $recharge['order_id'], $recharge['price'], 'user_recharge', '用户充值', ['openid' => $openid]);
 
         if ($payType == PayServices::WEIXIN_PAY) {
             if (request()->isH5()) {