Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

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']]);
     }
 }

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 ?? ''];
     }
 }

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;
 
 /**
  *
@@ -86,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()) {
@@ -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)];
     }
 
 }