From a2d68647957872c086f4206fc47ef86e3611c793 Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Fri, 22 Nov 2024 15:11:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E7=94=9F=E6=B4=BB=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=E8=A1=97=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96=E8=BF=94?=
 =?UTF-8?q?=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/api/logic/LocalStoreLogic.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/api/logic/LocalStoreLogic.php b/app/api/logic/LocalStoreLogic.php
index c2064775..28529bb9 100644
--- a/app/api/logic/LocalStoreLogic.php
+++ b/app/api/logic/LocalStoreLogic.php
@@ -232,7 +232,7 @@ class LocalStoreLogic extends Logic
             ->where($where)
             ->where(['ls.is_delete' => 0, 'ls.store_state' => 1])
             ->whereNotNull('ls.shopLogo')
-            ->field('ls.lstore_id as ls_id, ls.shopLogo, ls.shopName, ls.longitude, ls.latitude, ls.latitude, ls.address, ' . $distance_sql . ', lsg.id, lsg.lstore_id')
+            ->field('ls.lstore_id as ls_id, ls.shopLogo, ls.shopName, ls.longitude, ls.latitude, ls.latitude, ls.address, ' . $distance_sql . ', lsg.id, lsg.lstore_id, lsg.subsidy_id')
             ->order($order)
             ->page($data['page_no'], $data['page_size'])
             ->group('ls.lstore_id')
@@ -264,6 +264,10 @@ class LocalStoreLogic extends Logic
             } else {
                 $lists[$key]['distance'] = number_format($value['distance'], 2, '.', '') . "km";
             }
+
+            // 获取返补比例, subsidy_id为0的就传递一个ID为4的固定ID
+            $lists[$key]['subsidy'] = (new GoodsSubsidy())->getSubsidyById($value['subsidy_id'] > 0 ? $value['subsidy_id'] : 4);
+            $lists[$key]['subsidy_txt'] = '最高返' . $lists[$key]['subsidy']['subsidy'];
         }
 
         $data = [