From 3feb3e71db032d22f786663e43e5fec320a26bde Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Sat, 16 Mar 2024 10:29:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95=E6=A0=B8?=
 =?UTF-8?q?=E9=94=80=E7=A0=81=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/repositories/store/order/StoreOrderRepository.php | 2 +-
 app/controller/merchant/Common.php                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 48f8d9d1..1b66df7d 100644
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -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('二维码生成失败');
 
diff --git a/app/controller/merchant/Common.php b/app/controller/merchant/Common.php
index 4eabe1fd..2649048c 100644
--- a/app/controller/merchant/Common.php
+++ b/app/controller/merchant/Common.php
@@ -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());