From 77304504c90138b5e356bc7bb7e4b157c58016fb Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Tue, 19 Nov 2024 22:47:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=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 | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/api/logic/GoodsLogic.php b/app/api/logic/GoodsLogic.php
index 9b0ec2ef..9c16057f 100755
--- a/app/api/logic/GoodsLogic.php
+++ b/app/api/logic/GoodsLogic.php
@@ -935,10 +935,14 @@ class GoodsLogic extends Logic
                 ->field('hl.id as hl_id, g.id as id, g.name, g.image, g.issuing_price, g.market_price, g.min_price, g.purchase_price, g.wholesale_price')
                 ->select()
                 ->toArray();
-            foreach ($hot_list as &$v) {
+            foreach ($hot_list as $k => &$v) {
                 if (isset($v['image'])) {
                     $v['image'] = UrlServer::getFileUrl($v['image']);
                 }
+
+                // 获取返补比例, subsidy_id为0的就传递一个ID为4的固定ID
+                $hot_list[$k]['subsidy'] = (new GoodsSubsidy())->getSubsidyById($v['subsidy_id'] > 0 ? $v['subsidy_id'] : 4);
+                $hot_list[$k]['subsidy_txt'] = '最高返' . $hot_list[$k]['subsidy']['subsidy'];
             }
         }
 
@@ -974,10 +978,14 @@ class GoodsLogic extends Logic
             ->group('og.goods_id')
             ->count();
 
-        foreach ($order_goods as &$v) {
+        foreach ($order_goods as $k => &$v) {
             if (isset($v['image'])) {
                 $v['image'] = UrlServer::getFileUrl($v['image']);
             }
+
+            // 获取返补比例, subsidy_id为0的就传递一个ID为4的固定ID
+            $order_goods[$k]['subsidy'] = (new GoodsSubsidy())->getSubsidyById($v['subsidy_id'] > 0 ? $v['subsidy_id'] : 4);
+            $order_goods[$k]['subsidy_txt'] = '最高返' . $order_goods[$k]['subsidy']['subsidy'];
         }
 
         $more = is_more($count, $page, $size);  //是否有下一页
@@ -1021,7 +1029,7 @@ class GoodsLogic extends Logic
                 ->where($onSaleWhere)
                 ->where($shopWhere)
                 ->where('delete_time', 0)
-                ->field('ng.id as ng_id, g.id as id, g.name, g.image, g.issuing_price, g.market_price, g.min_price, g.purchase_price, g.wholesale_price')
+                ->field('ng.id as ng_id, g.id as id, g.name, g.image, g.issuing_price, g.market_price, g.min_price, g.purchase_price, g.wholesale_price, g.subsidy_id')
                 ->limit(4)
                 ->select()
                 ->toArray();
@@ -1039,10 +1047,14 @@ class GoodsLogic extends Logic
             }
 
             $result = array_merge($list, $goods);
-            foreach ($result as &$v) {
+            foreach ($result as $k => &$v) {
                 if (isset($v['image'])) {
                     $v['image'] = UrlServer::getFileUrl($v['image']);
                 }
+
+                // 获取返补比例, subsidy_id为0的就传递一个ID为4的固定ID
+                $result[$k]['subsidy'] = (new GoodsSubsidy())->getSubsidyById($v['subsidy_id'] > 0 ? $v['subsidy_id'] : 4);
+                $result[$k]['subsidy_txt'] = '最高返' . $result[$k]['subsidy']['subsidy'];
             }
             return $result;
         } else if ($type == 'all') {
@@ -1070,10 +1082,14 @@ class GoodsLogic extends Logic
 
             $result = array_merge($list, $goods);
 
-            foreach ($result as &$v) {
+            foreach ($result as $k => &$v) {
                 if (isset($v['image'])) {
                     $v['image'] = UrlServer::getFileUrl($v['image']);
                 }
+
+                // 获取返补比例, subsidy_id为0的就传递一个ID为4的固定ID
+                $result[$k]['subsidy'] = (new GoodsSubsidy())->getSubsidyById($v['subsidy_id'] > 0 ? $v['subsidy_id'] : 4);
+                $result[$k]['subsidy_txt'] = '最高返' . $result[$k]['subsidy']['subsidy'];
             }
 
             $more = is_more($count, $page, $size);  //是否有下一页