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

This commit is contained in:
From-wh 2023-02-21 11:42:28 +08:00
commit 8ef7d6e86f

View File

@ -80,7 +80,7 @@ class WechatService
];
if (isset($wechat['wechat_encode']) && (int)$wechat['wechat_encode'] > 0 && isset($wechat['wechat_encodingaeskey']) && !empty($wechat['wechat_encodingaeskey']))
$config['aes_key'] = $wechat['wechat_encodingaeskey'];
if (isset($payment['pay_weixin_open']) && $payment['pay_weixin_open'] == 1) {
if (isset($payment['pay_weixin_open']) && $payment['pay_weixin_open'] == 'weixin') {
$config['payment'] = [
'app_id' => $appId,
'merchant_id' => trim($payment['pay_weixin_mchid']),