From 7f867587da4eb9f09ebc0ac52b3372a95fc39e94 Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Tue, 19 Nov 2024 22:34:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A5=BD=E7=89=A9=E4=BC=98=E9=80=89=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E5=95=86=E5=93=81=E8=BF=94=E6=AF=94=E6=96=87?=
 =?UTF-8?q?=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/GoodsLogic.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/api/logic/GoodsLogic.php b/app/api/logic/GoodsLogic.php
index 85409e43..9b0ec2ef 100755
--- a/app/api/logic/GoodsLogic.php
+++ b/app/api/logic/GoodsLogic.php
@@ -641,7 +641,7 @@ class GoodsLogic extends Logic
                 $where[] = ['purchase_price|issuing_price|wholesale_price', '>', 0];
             }
         }
-        $list = Goods::field('id,name,image,market_price,min_price,wholesale_price,purchase_price,issuing_price,sales_actual,column_ids,sort_weight,sales_virtual,(sales_actual + sales_virtual) as sales_total')
+        $list = Goods::field('id,name,image,market_price,min_price,wholesale_price,purchase_price,issuing_price,sales_actual,column_ids,sort_weight,sales_virtual,(sales_actual + sales_virtual) as sales_total, subsidy_id')
             ->where($onSaleWhere)
             ->where($where)
             ->whereFindInSet('column_ids', $columnId)
@@ -689,6 +689,13 @@ class GoodsLogic extends Logic
                 }
             }
         }
+
+        foreach ($list as $k => $v) {
+            // 获取返补比例, subsidy_id为0的就传递一个ID为4的固定ID
+            $list[$k]['subsidy'] = (new GoodsSubsidy())->getSubsidyById($v['subsidy_id'] > 0 ? $v['subsidy_id'] : 4);
+            $list[$k]['subsidy_txt'] = '最高返' . $list[$k]['subsidy']['subsidy'];
+        }
+
         $count = Goods::where($onSaleWhere)
             ->where($where)
             ->whereFindInSet('column_ids', $columnId)