github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-29 22:10:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
From-wh 2023-02-23 10:06:52 +08:00
commit a1c1db9f6f
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crmeb/app/api/controller/v1/store/CategoryController.php
View File

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

4
crmeb/app/services/pay/OrderPayServices.php
View File

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

7
crmeb/app/services/pay/RechargeServices.php
View File

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