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) {