mkm/shop-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整订单核销码生成

Browse Source
This commit is contained in:
luofei 2024-03-16 10:29:53 +08:00
parent 3b4ffa9eeb
commit 3feb3e71db
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/common/repositories/store/order/StoreOrderRepository.php
View File

@ -2042,7 +2042,7 @@ class StoreOrderRepository extends BaseRepository
$imageInfo = null;
}
if (!$imageInfo) {
$codeUrl = set_http_type(rtrim($siteUrl, '/') . '/pages/admin/cancellate_result/index?cal_code=' . $verify_code . '&mer_id=' . $mer_id . '&is_jump=1', request()->isSsl() ? 0 : 1);//二维码链接
$codeUrl = set_http_type(rtrim($siteUrl, '/') . '/pages/admin/cancellate_result/index?code=' . $verify_code . '&mer_id=' . $mer_id . '&is_jump=1', request()->isSsl() ? 0 : 1);//二维码链接
$imageInfo = app()->make(QrcodeService::class)->getQRCodePath($codeUrl, $name);
if (is_string($imageInfo)) throw new ValidateException('二维码生成失败');

2
app/controller/merchant/Common.php
View File

@ -251,7 +251,7 @@ class Common extends BaseController
'fileExt' => 'jpg,jpeg,png,bmp',
'fileMime' => 'image/jpeg,image/png',
]])->check(['file' => $file]);
$upload = UploadService::create(1);
$upload = UploadService::create();
$data = $upload->to('attach')->move('file');
if ($data === false) {
return app('json')->fail($upload->getError());