bingyi/shopxo
1
0
Fork 0
mirror of https://gitee.com/zongzhige/shopxo.git synced 2026-06-06 03:56:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

小程序用户注销错误修复、其他细节优化

Browse Source
This commit is contained in:
gongfuxiang
2023-04-20 18:30:53 +08:00
parent 4a66fd49b0
commit c44acbe6b9
22 changed files with 173 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extend/base/Excel.php
View File

@ -228,7 +228,7 @@ class Excel
$temp_letter = $letter_data[$temp_cum];
$height = isset($tv['height']) ? intval($tv['height']) : 0;
$width = isset($tv['width']) ? intval($tv['width']) : $height;
if($tv['type'] == 'images')
if($tv['type'] == 'images' && !empty($v[$tk]))
{
$drawing = new \PhpOffice\PhpSpreadsheet\Worksheet\Drawing();
$drawing->setPath($v[$tk]);

11
extend/payment/Alipay.php
View File

@ -470,15 +470,16 @@ class Alipay
$result = $this->HttpRequest('https://openapi.alipay.com/gateway.do', $parameter);
$key = str_replace('.', '_', $parameter['method']).'_response';
// 验证签名
if(!$this->SyncRsaVerify($result, $key))
{
return DataReturn('签名验证错误', -1);
}
// 状态
if(isset($result[$key]['code']) && $result[$key]['code'] == 10000)
{
// 验证签名
if(!$this->SyncRsaVerify($result, $key))
{
return DataReturn('签名验证错误', -1);
}
// 统一返回格式
$data = [
'out_trade_no' => isset($result[$key]['out_trade_no']) ? $result[$key]['out_trade_no'] : '',

11
extend/payment/AlipayCert.php
View File

@ -495,15 +495,16 @@ class AlipayCert
// 执行请求
$result = $this->HttpRequest('https://openapi.alipay.com/gateway.do', $parameter);
$key = str_replace('.', '_', $parameter['method']).'_response';
// 验证签名
if(!$this->SyncRsaVerify($result, $key))
{
return DataReturn('签名验证错误', -1);
}
// 状态
if(isset($result[$key]['code']) && $result[$key]['code'] == 10000)
{
// 验证签名
if(!$this->SyncRsaVerify($result, $key))
{
return DataReturn('签名验证错误', -1);
}
// 统一返回格式
$data = [
'out_trade_no' => isset($result[$key]['out_trade_no']) ? $result[$key]['out_trade_no'] : '',

73
extend/payment/AlipayFace.php
View File

@ -116,6 +116,12 @@ class AlipayFace
*/
public function Pay($params = [])
{
// 参数
if(empty($params['check_url']))
{
return DataReturn('支付状态校验地址不能为空', -50);
}
// openssl
if(!function_exists('openssl_sign'))
{
@ -162,40 +168,39 @@ class AlipayFace
$result = $this->HttpRequest('https://openapi.alipay.com/gateway.do', $parameter);
$key = str_replace('.', '_', $parameter['method']).'_response';
// 验证签名
if(!$this->SyncRsaVerify($result, $key))
{
return DataReturn('签名验证错误', -1);
}
// 状态
if(isset($result[$key]['code']) && $result[$key]['code'] == 10000 && !empty($result[$key]['qr_code']))
if(isset($result[$key]['code']) && $result[$key]['code'] == 10000)
{
if(empty($params['check_url']))
// 验证签名
if(!$this->SyncRsaVerify($result, $key))
{
return DataReturn('支付状态校验地址不能为空', -50);
return DataReturn('签名验证错误', -1);
}
if(APPLICATION == 'app')
// 存在二维码
if(!empty($result[$key]['qr_code']))
{
$data = [
'pay_url' => $result[$key]['qr_code'],
'qrcode_url' => MyUrl('index/qrcode/index', ['content'=>urlencode(base64_encode($result[$key]['qr_code']))]),
'order_no' => $params['order_no'],
'name' => '支付宝支付',
'msg' => '打开支付宝APP扫一扫进行支付',
'check_url' => $params['check_url'],
];
} else {
$pay_params = [
'url' => urlencode(base64_encode($result[$key]['qr_code'])),
'order_no' => $params['order_no'],
'name' => urlencode('支付宝支付'),
'msg' => urlencode('打开支付宝APP扫一扫进行支付'),
'check_url' => urlencode(base64_encode($params['check_url'])),
];
$data = MyUrl('index/pay/qrcode', $pay_params);
if(APPLICATION == 'app')
{
$data = [
'pay_url' => $result[$key]['qr_code'],
'qrcode_url' => MyUrl('index/qrcode/index', ['content'=>urlencode(base64_encode($result[$key]['qr_code']))]),
'order_no' => $params['order_no'],
'name' => '支付宝支付',
'msg' => '打开支付宝APP扫一扫进行支付',
'check_url' => $params['check_url'],
];
} else {
$pay_params = [
'url' => urlencode(base64_encode($result[$key]['qr_code'])),
'order_no' => $params['order_no'],
'name' => urlencode('支付宝支付'),
'msg' => urlencode('打开支付宝APP扫一扫进行支付'),
'check_url' => urlencode(base64_encode($params['check_url'])),
];
$data = MyUrl('index/pay/qrcode', $pay_params);
}
return DataReturn('success', 0, $data);
}
return DataReturn('success', 0, $data);
}
// 直接返回支付信息
@ -348,15 +353,15 @@ class AlipayFace
$result = $this->HttpRequest('https://openapi.alipay.com/gateway.do', $parameter);
$key = str_replace('.', '_', $parameter['method']).'_response';
// 验证签名
if(!$this->SyncRsaVerify($result, $key))
{
return DataReturn('签名验证错误', -1);
}
// 状态
if(isset($result[$key]['code']) && $result[$key]['code'] == 10000)
{
// 验证签名
if(!$this->SyncRsaVerify($result, $key))
{
return DataReturn('签名验证错误', -1);
}
// 统一返回格式
$data = [
'out_trade_no' => isset($result[$key]['out_trade_no']) ? $result[$key]['out_trade_no'] : '',

25
extend/payment/AlipayMini.php
View File

@ -184,15 +184,16 @@ class AlipayMini
$result = $this->HttpRequest('https://openapi.alipay.com/gateway.do', $parameter);
$key = str_replace('.', '_', $parameter['method']).'_response';
// 验证签名
if(!$this->SyncRsaVerify($result, $key))
{
return DataReturn('签名验证错误', -1);
}
// 状态
if(isset($result[$key]['code']) && $result[$key]['code'] == 10000)
{
// 验证签名
if(!$this->SyncRsaVerify($result, $key))
{
return DataReturn('签名验证错误', -1);
}
// 成功
return DataReturn('处理成功', 0, $result[$key]['trade_no']);
}
@ -346,15 +347,15 @@ class AlipayMini
$result = $this->HttpRequest('https://openapi.alipay.com/gateway.do', $parameter);
$key = str_replace('.', '_', $parameter['method']).'_response';
// 验证签名
if(!$this->SyncRsaVerify($result, $key))
{
return DataReturn('签名验证错误', -1);
}
// 状态
if(isset($result[$key]['code']) && $result[$key]['code'] == 10000)
{
// 验证签名
if(!$this->SyncRsaVerify($result, $key))
{
return DataReturn('签名验证错误', -1);
}
// 统一返回格式
$data = [
'out_trade_no' => isset($result[$key]['out_trade_no']) ? $result[$key]['out_trade_no'] : '',

25
extend/payment/AlipayScanQrcode.php
View File

@ -171,15 +171,16 @@ class AlipayScanQrcode
$key = str_replace('.', '_', $parameter['method']).'_response';
$result = $res['data'][$key];
// 验证签名
if(!$this->SyncRsaVerify($result, $res['data']['sign']))
{
return DataReturn('签名验证错误', -1);
}
// 状态
if(isset($result['code']) && $result['code'] == 10000)
{
// 验证签名
if(!$this->SyncRsaVerify($result, $res['data']['sign']))
{
return DataReturn('签名验证错误', -1);
}
// 成功
return DataReturn('支付成功', 0, $this->ReturnData($result));
}
@ -341,15 +342,15 @@ class AlipayScanQrcode
$key = str_replace('.', '_', $parameter['method']).'_response';
$result = $res['data'][$key];
// 验证签名
if(!$this->SyncRsaVerify($result, $res['data']['sign']))
{
return DataReturn('签名验证错误', -1);
}
// 状态
if(isset($result['code']) && $result['code'] == 10000)
{
// 验证签名
if(!$this->SyncRsaVerify($result, $res['data']['sign']))
{
return DataReturn('签名验证错误', -1);
}
// 统一返回格式
$data = [
'out_trade_no' => isset($result['out_trade_no']) ? $result['out_trade_no'] : '',