From bebbd7083d99a09a9a7022f22f7365c9c7381e61 Mon Sep 17 00:00:00 2001
From: lewis <604446095@qq.com>
Date: Fri, 27 Dec 2024 11:08:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchase_product_offer/PurchaseProductOfferLists.php      | 4 ++++
 .../model/purchase_product_offer/PurchaseProductOffer.php     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/api/lists/purchase_product_offer/PurchaseProductOfferLists.php b/app/api/lists/purchase_product_offer/PurchaseProductOfferLists.php
index 88a0faadb..02b6416c8 100644
--- a/app/api/lists/purchase_product_offer/PurchaseProductOfferLists.php
+++ b/app/api/lists/purchase_product_offer/PurchaseProductOfferLists.php
@@ -57,6 +57,10 @@ class PurchaseProductOfferLists extends BaseApiDataLists implements ListsSearchI
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function($item) use(&$cateIds, &$supplierIds, &$unitIds) {
+                $item->store_info = empty($item['store_info']) ? ($item['product']['store_info'] ?? '') : $item['store_info'];
+                $item->after_sales = empty($item['after_sales']) ? ($item['product']['after_sales'] ?? '') : $item['after_sales'];
+                $item->marques = empty($item['marques']) ? ($item['product']['marques'] ?? '') : $item['marques'];
+                $item->package = empty($item['package']) ? ($item['product']['package'] ?? '') : $item['package'];
                 $item->store_name=$item->product->store_name ?? '';
                 $item->image=$item->product->image ?? '';
                 $cateIds[] = $item->product->top_cate_id ?? 0;
diff --git a/app/common/model/purchase_product_offer/PurchaseProductOffer.php b/app/common/model/purchase_product_offer/PurchaseProductOffer.php
index ba02ef4cb..54b111504 100644
--- a/app/common/model/purchase_product_offer/PurchaseProductOffer.php
+++ b/app/common/model/purchase_product_offer/PurchaseProductOffer.php
@@ -24,7 +24,7 @@ class PurchaseProductOffer extends BaseModel
 
     public function product()
     {
-        return $this->hasOne(StoreProduct::class, 'id', 'product_id')->field('id,store_name,top_cate_id,image');
+        return $this->hasOne(StoreProduct::class, 'id', 'product_id')->field('id,store_name,top_cate_id,image,store_info,package,marques,after_sales');
     }
     
 }
\ No newline at end of file

From 69030f1fbc05931ebc4795af28a427a218a4121a Mon Sep 17 00:00:00 2001
From: lewis <604446095@qq.com>
Date: Fri, 27 Dec 2024 11:31:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E4=B8=93=E5=8C=BA=E5=95=86=E5=93=81=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/logic/ActivityZoneFormLogic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/admin/logic/ActivityZoneFormLogic.php b/app/admin/logic/ActivityZoneFormLogic.php
index c8854679b..f24cb03ff 100644
--- a/app/admin/logic/ActivityZoneFormLogic.php
+++ b/app/admin/logic/ActivityZoneFormLogic.php
@@ -126,7 +126,7 @@ class ActivityZoneFormLogic extends BaseLogic
         $service = new ActivityZoneService();
         $activityZoneForm = ActivityZoneForm::findOrEmpty($params['id'])->toArray();
         $productIds = ActivityZone::where('form_id', $params['id'])->column('product_id');
-        $products = StoreProduct::field('id,unit,store_name,two_cate_id')->whereIn('id', $productIds)->order('two_cate_id')->select()->toArray();
+        $products = StoreProduct::field('id,unit,store_name,two_cate_id')->whereIn('id', $productIds)->order('two_cate_id asc,cate_id asc')->select()->toArray();
         $unitIds = array_unique(array_column($products, 'unit'));
         $cateIds = array_unique(array_column($products, 'two_cate_id'));
         $unit = StoreProductUnit::whereIn('id', $unitIds)->field('id,name')->withTrashed()->select()->toArray();