From bf66d7c2506ce2e731e9ffb112110a1c410bfe1e Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Thu, 22 Aug 2024 17:20:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AC=E5=9C=B0=E7=94=9F?=
 =?UTF-8?q?=E6=B4=BB=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/File.php            | 12 ++++--------
 app/api/logic/LocalStoreGoodsLogic.php |  6 ++++++
 app/common/enum/LocalStoreFileEnum.php | 10 ++++++++++
 3 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 app/common/enum/LocalStoreFileEnum.php

diff --git a/app/api/controller/File.php b/app/api/controller/File.php
index 8eb803b4..79c67ab4 100755
--- a/app/api/controller/File.php
+++ b/app/api/controller/File.php
@@ -24,16 +24,12 @@ use app\common\server\FileServer;
 use app\common\basics\Api;
 use app\common\server\JsonServer;
 use app\common\utils\UploadAliOSS;
+use app\common\enum\LocalStoreFileEnum;
 
 class File extends Api
 {
     public $like_not_need_login = [];
 
-    // 移动端上传图片路径匹配参数
-    private static $APP_UPLOAD_PATH = [
-        'local_shop_add' => 'local_life_shop_goods'
-    ];
-
     /**
      * showdoc
      * @catalog 接口/上传文件
@@ -63,11 +59,11 @@ class File extends Api
         try{
             $post = $this->request->post();
 
-            if (isset(self::$APP_UPLOAD_PATH[$post['type']])) {
-                $path = self::$APP_UPLOAD_PATH[$post['type']];
+            if (isset(LocalStoreFileEnum::$APP_UPLOAD_PATH[$post['type']])) {
+                $path = LocalStoreFileEnum::$APP_UPLOAD_PATH[$post['type']];
                 // 本地生活商家上传商品
                 if ($post['type'] === 'local_shop_add' && $post['lstore_id'] > 0) {
-                    $path .= '/' . $this->user_id . '_' .$post['lstore_id'];
+                    $path .= '/' . $this->user_id . '_' . $post['lstore_id'];
                 } else {
                     return JsonServer::error('缺少参数');
                 }
diff --git a/app/api/logic/LocalStoreGoodsLogic.php b/app/api/logic/LocalStoreGoodsLogic.php
index 5520320f..beabc117 100644
--- a/app/api/logic/LocalStoreGoodsLogic.php
+++ b/app/api/logic/LocalStoreGoodsLogic.php
@@ -5,6 +5,8 @@ namespace app\api\logic;
 use app\common\basics\Logic;
 use app\common\model\localstore\LocalStoreGoods;
 use app\common\model\localstore\LocalStoreGoodsPic;
+use app\common\enum\LocalStoreFileEnum;
+use think\facade\Config;
 
 class LocalStoreGoodsLogic extends Logic
 {
@@ -29,6 +31,10 @@ class LocalStoreGoodsLogic extends Logic
             'delete_time' => 0,
         ])->count();
 
+        foreach ($list['pic'] as &$v) {
+            $v['url'] = Config::get('aliyunoss.domain') . LocalStoreFileEnum::$APP_UPLOAD_PATH['local_shop_add'] . '/' . $get['user_id'] . '_' . $get['lstore_id'] . '/' . $v['url'];
+        }
+
         $result = [
             'count' => $count,
             'lists' => $list,
diff --git a/app/common/enum/LocalStoreFileEnum.php b/app/common/enum/LocalStoreFileEnum.php
new file mode 100644
index 00000000..68d003c0
--- /dev/null
+++ b/app/common/enum/LocalStoreFileEnum.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace app\common\enum;
+
+class LocalStoreFileEnum
+{
+    public static $APP_UPLOAD_PATH = [
+        'local_shop_add' => 'local_life_shop_goods'
+    ];
+}
\ No newline at end of file