mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#416) from dev into main

Browse Source 
Reviewed-on: #416
This commit is contained in:
mkm 2024-12-27 11:32:35 +08:00
commit 456059d242
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/logic/ActivityZoneFormLogic.php
View File

@ -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();

4
app/api/lists/purchase_product_offer/PurchaseProductOfferLists.php
View File

@ -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;

2
app/common/model/purchase_product_offer/PurchaseProductOffer.php
View File

@ -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');
}
}