更新卡项取消门店

app/controller/api/v1/user/UserBillController.php

@@ -50,7 +50,7 @@ class UserBillController
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function getRoutineCode(Request $request)
+    public function getRoutineCode(Request $request, $type = 0)
     {
         $user = $request->user();
         /** @var SystemAttachmentServices $systemAttachment */
@@ -92,12 +92,22 @@ class UserBillController
             } else {
                 $res = false;
             }
-            if (!$res) return app('json')->fail('二维码生成失败');
+            if (!$res) {
+                if ($type == 1) {
+                    return ['二维码生成失败'];
+                } else {
+                    return app('json')->fail('二维码生成失败');
+                }
+            }
             $uploadType = (int)sys_config('upload_type', 1);
             $upload = UploadService::init($uploadType);
             $uploadRes = $upload->to('routine/spread/code')->validate()->setAuthThumb(false)->stream((string)$res['res'], $name);
             if ($uploadRes === false) {
-                return app('json')->fail($upload->getError());
+                if ($type == 1) {
+                    return [$upload->getError()];
+                } else {
+                    return app('json')->fail($upload->getError());
+                }
             }
             $imageInfo = $upload->getUploadInfo();
             $imageInfo['image_type'] = $uploadType;
@@ -106,6 +116,9 @@ class UserBillController
             $urlCode = $imageInfo['dir'];
         } else $urlCode = $imageInfo['att_dir'];
         if ($imageInfo['image_type'] == 1) $urlCode = $siteUrl . $urlCode;
+        if ($type == 1) {
+            return $urlCode;
+        }
         return app('json')->success(['url' => $urlCode]);
     }
 
@@ -122,22 +135,26 @@ class UserBillController
         $routineSpreadBanner = [];
         if ($bannerCount) {
             foreach ($spreadBanner as $item) {
-                $item=mb_substr($item,25,100,'utf8');
-                $item='https://storepro.vtor.xyz/'.$item;
+                $item = mb_substr($item, 25, 100, 'utf8');
+                $item = 'https://storepro.vtor.xyz/' . $item;
                 $routineSpreadBanner[] = ['pic' => $item];
             }
         }
-        if (sys_config('share_qrcode', 0)) {// && request()->isWechat()
-            /** @var QrcodeServices $qrcodeService */
-            $qrcodeService = app()->make(QrcodeServices::class);
-            if (sys_config('spread_share_forever', 0)) {
-                $qrcode = $qrcodeService->getForeverQrcode('spread', $request->uid())->url;
-            } else {
-                $qrcode = $qrcodeService->getTemporaryQrcode('spread', $request->uid())->url;
-            }
-        } else {
-            $qrcode = '';
+        $qrcode = $this->getRoutineCode($request, 1);
+        if (is_array($qrcode)) {
+            return app('json')->fail($qrcode[0]);
         }
+//        if (sys_config('share_qrcode', 0)) {// && request()->isWechat()
+//            /** @var QrcodeServices $qrcodeService */
+//            $qrcodeService = app()->make(QrcodeServices::class);
+//            if (sys_config('spread_share_forever', 0)) {
+//                $qrcode = $qrcodeService->getForeverQrcode('spread', $request->uid())->url;
+//            } else {
+//                $qrcode = $qrcodeService->getTemporaryQrcode('spread', $request->uid())->url;
+//            }
+//        } else {
+//            $qrcode = '';
+//        }
         return app('json')->success([
             'spread' => $routineSpreadBanner,
             'qrcode' => $qrcode,