From fbc2ea2901a96113051ed2ddfb65d5190ffb2b08 Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Sun, 17 Nov 2024 17:37:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E7=94=9F=E6=B4=BB=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E6=98=BE=E7=A4=BA=E5=95=86=E5=93=81=E8=BF=94=E8=A1=A5?=
 =?UTF-8?q?=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 |  7 +++++++
 app/admin/view/goods/goods/add.html           |  2 --
 .../view/shop/local_store_goods/detail.html   | 20 +++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/app/admin/logic/shop/LocalStoreGoodsLogic.php b/app/admin/logic/shop/LocalStoreGoodsLogic.php
index a1e2b652..5b0b634b 100755
--- a/app/admin/logic/shop/LocalStoreGoodsLogic.php
+++ b/app/admin/logic/shop/LocalStoreGoodsLogic.php
@@ -4,6 +4,7 @@ namespace app\admin\logic\shop;
 
 use app\common\basics\Logic;
 use app\common\enum\LocalStoreGoodsEnum;
+use app\common\model\goods\GoodsSubsidy;
 use app\common\model\localstore\LocalStoreGoods;
 use app\common\model\localstore\LocalStoreGoodsItem;
 use think\facade\Config;
@@ -80,6 +81,12 @@ class LocalStoreGoodsLogic extends Logic
     {
         $data = LocalStoreGoods::with('pic')->where(['id' => $id])->find()->toArray();
 
+        $data['subsidy'] = [];
+        if ($data['subsidy_id'] > 0) {
+            $model = new GoodsSubsidy();
+            $data['subsidy'] = $model->getSubsidyById($data['subsidy_id']);
+        }
+
         // 查找多规格
         if ($data['is_multiple_spec'] == 1) {
             $data['item'] = LocalStoreGoodsItem::where([
diff --git a/app/admin/view/goods/goods/add.html b/app/admin/view/goods/goods/add.html
index 51b1ec68..0e6615c3 100755
--- a/app/admin/view/goods/goods/add.html
+++ b/app/admin/view/goods/goods/add.html
@@ -213,14 +213,12 @@
                     <thead>
                         <tr>
                             <th>商家利润比例</th>
-                            <th>商品让利比例</th>
                             <th>商品全返比例</th>
                         </tr>
                     </thead>
                     <tbody>
                         <tr>
                           <td>${subsidy.profit}</td>
-                          <td>${subsidy.discount}</td>
                           <td>${subsidy.subsidy}</td>
                         </tr>
                     </tbody>
diff --git a/app/admin/view/shop/local_store_goods/detail.html b/app/admin/view/shop/local_store_goods/detail.html
index 711d2fe0..965c2a35 100755
--- a/app/admin/view/shop/local_store_goods/detail.html
+++ b/app/admin/view/shop/local_store_goods/detail.html
@@ -57,6 +57,26 @@
             </div>
         </div>
 
+        <div class="layui-form-item">
+            <label class="layui-form-label">商品返补比例：</label>
+            <div class="layui-input-inline">
+                <table class="layui-table">
+                    <thead>
+                        <tr>
+                            <th>商家折扣比例</th>
+                            <th>商品最高返补比例</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td>{$data.subsidy.profit}</td>
+                            <td>{$data.subsidy.subsidy}</td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+
         <div class="layui-form-item">
             <label class="layui-form-label">商品概述：</label>
             <div class="layui-input-inline">