blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2026-06-12 14:28:09 +08:00
Code Issues Projects Releases Wiki Activity

fix: 统计 WechatService::getConfig 参数

Browse Source
This commit is contained in:
邹景立 2025-03-19 10:56:07 +08:00
parent 58859b98cc
commit d30d0f393b
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/think-plugs-wechat/src/service/PaymentService.php
View File

@ -82,7 +82,7 @@ class PaymentService
if ($oPayed + $pAmount > floatval($oAmount)) { if ($oPayed + $pAmount > floatval($oAmount)) {
return ['code' => 0, 'info' => '支付总额超出！', 'data' => [], 'params' => []]; return ['code' => 0, 'info' => '支付总额超出！', 'data' => [], 'params' => []];
} }
$config = WechatService::getConfig('', true); $config = WechatService::getConfig(true);
do $pCode = CodeExtend::uniqidNumber(16, 'P'); do $pCode = CodeExtend::uniqidNumber(16, 'P');
while (WechatPaymentRecord::mk()->master()->where(['code' => $pCode])->findOrEmpty()->isExists()); while (WechatPaymentRecord::mk()->master()->where(['code' => $pCode])->findOrEmpty()->isExists());
$data = [ $data = [
@ -328,7 +328,7 @@ class PaymentService
*/ */
protected static function withPayment(?array $config = null): Order protected static function withPayment(?array $config = null): Order
{ {
return Order::instance($config ?: WechatService::getConfig('', true)); return Order::instance($config ?: WechatService::getConfig(true));
} }
/** /**

7
plugin/think-plugs-wechat/src/service/WechatService.php
View File

@ -178,15 +178,14 @@ class WechatService extends Service
/** /**
* 获取公众号配置参数 * 获取公众号配置参数
* @param string $appid 指定公众号
* @param boolean $ispay 获取支付参数 * @param boolean $ispay 获取支付参数
* @return array * @return array
* @throws \think\admin\Exception * @throws \think\admin\Exception
*/ */
public static function getConfig(string $appid = '', bool $ispay = false): array public static function getConfig(bool $ispay = false): array
{ {
$config = [ $config = [
'appid' => $appid ?: static::getAppid(), 'appid' => static::getAppid(),
'token' => sysconf('wechat.token'), 'token' => sysconf('wechat.token'),
'appsecret' => sysconf('wechat.appsecret'), 'appsecret' => sysconf('wechat.appsecret'),
'encodingaeskey' => sysconf('wechat.encodingaeskey'), 'encodingaeskey' => sysconf('wechat.encodingaeskey'),
@ -197,7 +196,7 @@ class WechatService extends Service
/** /**
* 获取小程序配置参数 * 获取小程序配置参数
* @param boolean $ispay 支付参数 * @param boolean $ispay 获取支付参数
* @return array * @return array
* @throws \think\admin\Exception * @throws \think\admin\Exception
*/ */