Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev

crmeb/app/adminapi/controller/v1/file/SystemAttachment.php

@@ -151,6 +151,19 @@ class SystemAttachment extends AuthController
         return app('json')->success(['url' => $url]);
     }
 
+    /**
+     * 删除二维码
+     * @return \think\Response
+     * @author 等风来
+     * @email 136327134@qq.com
+     * @date 2023/6/26
+     */
+    public function removeUploadQrcode()
+    {
+        $this->service->cacheDriver()->delete('scan_upload');
+        return app('json')->success();
+    }
+
     /**
      * 获取扫码上传的图片数据
      * @param $scan_token

crmeb/app/adminapi/route/file.php

@@ -36,7 +36,7 @@ Route::group('file', function () {
             'update' => '修改附件分类管理',
             'delete' => '删除附件分类管理'
         ],
-        
+
     ]);
     //获取上传类型
     Route::get('upload_type', 'v1.file.SystemAttachment/uploadType')->option(['real_name' => '上传类型']);
@@ -45,6 +45,8 @@ Route::group('file', function () {
 
     //获取扫码上传页面链接以及参数
     Route::get('scan_upload/qrcode', 'v1.file.SystemAttachment/scanUploadQrcode')->option(['real_name' => '扫码上传页面链接']);
+    //删除扫码上传token
+    Route::delete('scan_upload/qrcode', 'v1.file.SystemAttachment/removeUploadQrcode')->option(['real_name' => '删除扫码上传页面链接']);
     //获取扫码上传的图片数据
     Route::get('scan_upload/image/:scan_token', 'v1.file.SystemAttachment/scanUploadImage')->option(['real_name' => '获取扫码上传的图片数据']);
     //网络图片上传

crmeb/app/services/order/StoreOrderServices.php

@@ -2692,10 +2692,6 @@ HTML;
             'cancel_msg' => $msg,
         ]);
 
-        if ($res['status'] != 200) {
-            throw new ValidateException($res['msg'] ?? '一号通：取消失败');
-        }
-
         //订单返回原状态
         $this->transaction(function () use ($id, $msg, $orderInfo) {
             app()->make(StoreOrderStatusServices::class)->save([