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

客户列表调整

Browse Source
This commit is contained in:
邓皓元 2020-02-28 16:45:33 +08:00
parent 886664332f
commit 068bbac28e
6 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Domains/Virtual/Repositories/Concerns/OrderCardConcern.php
View File

@ -185,7 +185,7 @@ trait OrderCardConcern
switch ($conditions['card_status']) {
case 0:
$hasRaw = sprintf("exists (SELECT sim FROM cards WHERE %s.sim = cards.sim AND (cancelled_at IS NULL or cancelled_at < '%s'))", $orgModel->getTable(), $date);
$hasRaw = sprintf("exists (SELECT sim FROM cards WHERE %s.sim = cards.sim )", $orgModel->getTable(), $date);
$this->model = $this->model->whereNull('service_start_at')
->whereRaw($hasRaw)
@ -193,7 +193,7 @@ trait OrderCardConcern
break;
case 1:
$hasRaw = sprintf("exists (SELECT sim FROM cards WHERE %s.sim = cards.sim AND (cancelled_at IS NULL or cancelled_at < '%s'))", $orgModel->getTable(), $date);
$hasRaw = sprintf("exists (SELECT sim FROM cards WHERE %s.sim = cards.sim )", $orgModel->getTable(), $date);
$this->model = $this->model->whereNull('service_start_at')
->whereRaw($hasRaw)
@ -202,7 +202,7 @@ trait OrderCardConcern
case 2:
$havingRaw = sprintf("exists (SELECT sim FROM virtual_order_cards_partition AS p WHERE %s.sim = p.sim GROUP BY sim HAVING MAX(service_end_at) >= '%s')", $orgModel->getTable(), $date);
$hasRaw = sprintf("exists (SELECT sim FROM cards WHERE %s.sim = cards.sim AND (cancelled_at IS NULL or cancelled_at <= '%s'))", $orgModel->getTable(), $date);
$hasRaw = sprintf("exists (SELECT sim FROM cards WHERE %s.sim = cards.sim)", $orgModel->getTable(), $date);
$this->model = $this->model->whereNotNull('service_start_at')
->whereRaw($havingRaw)
->whereRaw($hasRaw);
@ -210,7 +210,7 @@ trait OrderCardConcern
case 3:
$havingRaw = sprintf("exists (SELECT sim FROM virtual_order_cards_partition AS p WHERE %s.sim = p.sim GROUP BY sim HAVING MAX(service_end_at) < '%s')", $orgModel->getTable(), $date);
$hasRaw = sprintf("exists (SELECT sim FROM cards WHERE %s.sim = cards.sim AND (cancelled_at IS NULL or cancelled_at <= '%s'))", $orgModel->getTable(), $date);
$hasRaw = sprintf("exists (SELECT sim FROM cards WHERE %s.sim = cards.sim)", $orgModel->getTable(), $date);
$this->model = $this->model->whereNotNull('service_start_at')
->whereRaw($havingRaw)
->whereRaw($hasRaw);

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

@ -147,9 +147,9 @@ class CardService extends Service
*/
public static function getStatus($card)
{
if ($card['cancelled_at']) {
return 4;
}
// if ($card['cancelled_at']) {
// return 4;
// }
if ($card['service_end_at'] && $card['service_end_at'] < date('Y-m')) {
return 3;

2
frontend/src/views/virtual/cards/index.vue
View File

@ -127,7 +127,7 @@
<Option :value="1">沉默期</Option>
<Option :value="2">服务期</Option>
<Option :value="3">服务到期</Option>
<Option :value="4">已注销</Option>
<!-- <Option :value="4">已注销</Option> -->
</Select>
</li>

1
public/js/app.a8a0c226.js Normal file
View File

File diff suppressed because one or more lines are too long

8
public/js/chunk-651598b5.f5970a95.js Normal file
View File

File diff suppressed because one or more lines are too long

2
resources/views/index.blade.php
View File

@ -1 +1 @@
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=\favicon.ico><script src=\config.js></script><title></title><link href=/css/chunk-4f69bb43.6166dab5.css rel=prefetch><link href=/css/chunk-651598b5.c6538c67.css rel=prefetch><link href=/js/chunk-29ecfeab.2fbfdf81.js rel=prefetch><link href=/js/chunk-4f69bb43.d3443aef.js rel=prefetch><link href=/js/chunk-651598b5.0db4c0fe.js rel=prefetch><link href=/js/chunk-6c007037.1f00a06a.js rel=prefetch><link href=/css/app.42353d5a.css rel=preload as=style><link href=/css/chunk-vendors.a38c182d.css rel=preload as=style><link href=/js/app.65bb06e7.js rel=preload as=script><link href=/js/chunk-vendors.a5156fe1.js rel=preload as=script><link href=/css/chunk-vendors.a38c182d.css rel=stylesheet><link href=/css/app.42353d5a.css rel=stylesheet></head><body><noscript><strong>很抱歉，如果没有启用JavaScript，程序不能正常工作，若要继续使用请启用它。</strong></noscript><div id=app></div><script src=/js/chunk-vendors.a5156fe1.js></script><script src=/js/app.65bb06e7.js></script></body></html>
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=\favicon.ico><script src=\config.js></script><title></title><link href=/css/chunk-4f69bb43.6166dab5.css rel=prefetch><link href=/css/chunk-651598b5.c6538c67.css rel=prefetch><link href=/js/chunk-29ecfeab.2fbfdf81.js rel=prefetch><link href=/js/chunk-4f69bb43.d3443aef.js rel=prefetch><link href=/js/chunk-651598b5.f5970a95.js rel=prefetch><link href=/js/chunk-6c007037.1f00a06a.js rel=prefetch><link href=/css/app.42353d5a.css rel=preload as=style><link href=/css/chunk-vendors.a38c182d.css rel=preload as=style><link href=/js/app.a8a0c226.js rel=preload as=script><link href=/js/chunk-vendors.a5156fe1.js rel=preload as=script><link href=/css/chunk-vendors.a38c182d.css rel=stylesheet><link href=/css/app.42353d5a.css rel=stylesheet></head><body><noscript><strong>很抱歉，如果没有启用JavaScript，程序不能正常工作，若要继续使用请启用它。</strong></noscript><div id=app></div><script src=/js/chunk-vendors.a5156fe1.js></script><script src=/js/app.a8a0c226.js></script></body></html>