hydrz/vd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加卡属性匹配查找

Browse Source
This commit is contained in:
邓皓元 2019-09-23 14:58:56 +08:00
parent 6b19455da5
commit 33049a2433
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/Domains/Virtual/Exports/CardExport.php
View File

@ -31,18 +31,15 @@ class CardExport extends AbstractExport implements FromQuery, WithHeadings, With
// 添加卡属性匹配查找
$properties = app(PropertyRepository::class)->select(['company_id', 'package_id', 'product', 'package'])->get();
if (isset($this->conditions['prop_product']) && isset($this->conditions['prop_package'])) {
$props = $properties->where('product', $this->conditions['prop_product'])->where($this->conditions['prop_package'])->get();
$this->conditions['company_id'] = $props->pluck('company_id')->toArray();
$this->conditions['package_id'] = $props->pluck('package_id')->toArray();
} elseif (isset($this->conditions['prop_product'])) {
$props = $properties->where('product', $this->conditions['prop_product'])->get();
$this->conditions['company_id'] = $props->pluck('company_id')->toArray();
$this->conditions['package_id'] = $props->pluck('package_id')->toArray();
} elseif (isset($this->conditions['prop_package'])) {
$props = $properties->where('package', $this->conditions['prop_package'])->get();
$this->conditions['company_id'] = $props->pluck('company_id')->toArray();
$this->conditions['package_id'] = $props->pluck('package_id')->toArray();
if (isset($conditions['prop_product']) && isset($conditions['prop_package'])) {
$conditions['company_id'] = $properties->where('product', $conditions['prop_product'])->where('package', $conditions['prop_package'])->pluck('company_id')->toArray();
$conditions['package_id'] = $properties->where('product', $conditions['prop_product'])->where('package', $conditions['prop_package'])->pluck('package_id')->toArray();
} elseif (isset($conditions['prop_product'])) {
$conditions['company_id'] = $properties->where('product', $conditions['prop_product'])->pluck('company_id')->toArray();
$conditions['package_id'] = $properties->where('product', $conditions['prop_product'])->pluck('package_id')->toArray();
} elseif (isset($conditions['prop_package'])) {
$conditions['company_id'] = $properties->where('package', $conditions['prop_package'])->pluck('company_id')->toArray();
$conditions['package_id'] = $properties->where('package', $conditions['prop_package'])->pluck('package_id')->toArray();
}
$builder = app(OrderCardPartitionRepository::class)->forceNoReset()->withConditions($this->conditions)->orderBy('sim')->applyConditions();

15
app/Domains/Virtual/Services/CardService.php
View File

@ -45,17 +45,14 @@ class CardService extends Service
// 添加卡属性匹配查找
$properties = app(PropertyRepository::class)->select(['company_id', 'package_id', 'product', 'package'])->get();
if (isset($conditions['prop_product']) && isset($conditions['prop_package'])) {
$props = $properties->where('product', $conditions['prop_product'])->where($conditions['prop_package'])->get();
$conditions['company_id'] = $props->pluck('company_id')->toArray();
$conditions['package_id'] = $props->pluck('package_id')->toArray();
$conditions['company_id'] = $properties->where('product', $conditions['prop_product'])->where('package', $conditions['prop_package'])->pluck('company_id')->toArray();
$conditions['package_id'] = $properties->where('product', $conditions['prop_product'])->where('package', $conditions['prop_package'])->pluck('package_id')->toArray();
} elseif (isset($conditions['prop_product'])) {
$props = $properties->where('product', $conditions['prop_product'])->get();
$conditions['company_id'] = $props->pluck('company_id')->toArray();
$conditions['package_id'] = $props->pluck('package_id')->toArray();
$conditions['company_id'] = $properties->where('product', $conditions['prop_product'])->pluck('company_id')->toArray();
$conditions['package_id'] = $properties->where('product', $conditions['prop_product'])->pluck('package_id')->toArray();
} elseif (isset($conditions['prop_package'])) {
$props = $properties->where('package', $conditions['prop_package'])->get();
$conditions['company_id'] = $props->pluck('company_id')->toArray();
$conditions['package_id'] = $props->pluck('package_id')->toArray();
$conditions['company_id'] = $properties->where('package', $conditions['prop_package'])->pluck('company_id')->toArray();
$conditions['package_id'] = $properties->where('package', $conditions['prop_package'])->pluck('package_id')->toArray();
}