From 6ebc4c7496251b5179c05648cd654e5b55f41185 Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Mon, 18 Nov 2024 15:08:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E7=94=9F=E6=B4=BB=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E8=AF=A6=E6=83=85=E6=98=BE=E7=A4=BA=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E7=9A=84=E8=BF=94=E8=A1=A5=E6=AF=94=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/logic/shop/LocalStoreGoodsLogic.php | 1 -
 app/api/logic/LocalStoreGoodsLogic.php        | 7 ++-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/admin/logic/shop/LocalStoreGoodsLogic.php b/app/admin/logic/shop/LocalStoreGoodsLogic.php
index 8c21362b..069ce46f 100755
--- a/app/admin/logic/shop/LocalStoreGoodsLogic.php
+++ b/app/admin/logic/shop/LocalStoreGoodsLogic.php
@@ -81,7 +81,6 @@ class LocalStoreGoodsLogic extends Logic
     {
         $data = LocalStoreGoods::with('pic')->where(['id' => $id])->find()->toArray();
 
-        $data['subsidy'] = [];
         $model = new GoodsSubsidy();
         $data['subsidy'] = $model->getSubsidyById($data['subsidy_id'] > 0 ? $data['subsidy_id'] : 4);
 
diff --git a/app/api/logic/LocalStoreGoodsLogic.php b/app/api/logic/LocalStoreGoodsLogic.php
index 6aff5673..7f11a800 100644
--- a/app/api/logic/LocalStoreGoodsLogic.php
+++ b/app/api/logic/LocalStoreGoodsLogic.php
@@ -220,11 +220,8 @@ class LocalStoreGoodsLogic extends Logic
                 'audit_status' => $get['audit_status']
             ])->find()->toArray();
 
-        $data['subsidy'] = [];
-        if ($data['subsidy_id'] > 0) {
-            $model = new GoodsSubsidy();
-            $data['subsidy'] = $model->getSubsidyById($data['subsidy_id']);
-        }
+        $model = new GoodsSubsidy();
+        $data['subsidy'] = $model->getSubsidyById($data['subsidy_id'] > 0 ? $data['subsidy_id'] : 4);
 
         // 查找多规格
         if ($data['is_multiple_spec'] == 1) {