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

web

Browse Source
This commit is contained in:
邓皓元 2019-01-08 11:47:05 +08:00
parent 8f9d67fd7a
commit 2e5f5240af
8 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Domains/Company/Http/Controllers/OrderController.php
View File

@ -9,6 +9,7 @@ use App\Exceptions\NotExistException;
use App\Exceptions\NotAllowedException;
use App\Domains\Virtual\Services\OrderService;
use App\Domains\Virtual\Services\CommonService;
use App\Domains\Virtual\Services\PackageService;
use App\Domains\Virtual\Repositories\OrderRepository;
class OrderController extends Controller
@ -92,7 +93,7 @@ class OrderController extends Controller
$orderStatues = $dicts->get('order_status');
$transactionStatuses = $dicts->get('company_transaction_status');
$order->load(['package:id,name,carrier_operator']);
$order->package = app(PackageService::class)->load($order->package_id);
$order->pay_channel = CommonService::namePayChannel($order->pay_channel);
$order->carrier_operator = $carrierOperators[$order->package->carrier_operator];

4
app/Domains/Virtual/Services/OrderService.php
View File

@ -65,9 +65,9 @@ class OrderService extends Service
$select = [
DB::raw('COUNT(*) as total_count'),
DB::raw('SUM(custom_price) as total_price'),
DB::raw('SUM(custom_price*transaction_status) as transacted_price'),
DB::raw('SUM(CASE WHEN transaction_status=1 THEN custom_price ELSE 0 END) as transacted_price'),
];
$res = $this->orderRepository->select($select)->withConditions($conditions)->applyConditions()->first()->toArray();
$res['total_price'] = $res['total_price'] ?? 0;

2
frontend/src/views/virtual/packages/js/edit.js
View File

@ -65,7 +65,7 @@ export default {
return;
}
if (this.params.sn && !/^[A-Z0-9_]{2,32}$/.test(this.params.sn)) {
if (this.data && this.params.sn && !/^[A-Z0-9_]{2,32}$/.test(this.data && this.params.sn)) {
this.$Message.info('套餐编码为大写字母、数字、下划线的2-32位字符');
return;
}

2
public/js/app.42f1171d.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/js/app.42f1171d.js.map Normal file
View File

File diff suppressed because one or more lines are too long

2
public/js/chunk-5e8cf68c.013a2f19.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/js/chunk-5e8cf68c.013a2f19.js.map 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-5e8cf68c.38d56961.css rel=prefetch><link href=/js/chunk-00ae0766.158e4a52.js rel=prefetch><link href=/js/chunk-5e8cf68c.ee415a4d.js rel=prefetch><link href=/css/app.36043160.css rel=preload as=style><link href=/css/chunk-vendors.3c3b2e85.css rel=preload as=style><link href=/js/app.da6a1e06.js rel=preload as=script><link href=/js/chunk-vendors.02a4e5bc.js rel=preload as=script><link href=/css/chunk-vendors.3c3b2e85.css rel=stylesheet><link href=/css/app.36043160.css rel=stylesheet></head><body><noscript><strong>很抱歉，如果没有启用JavaScript，程序不能正常工作，若要继续使用请启用它。</strong></noscript><div id=app></div><script src=/js/chunk-vendors.02a4e5bc.js></script><script src=/js/app.da6a1e06.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-5e8cf68c.38d56961.css rel=prefetch><link href=/js/chunk-00ae0766.158e4a52.js rel=prefetch><link href=/js/chunk-5e8cf68c.013a2f19.js rel=prefetch><link href=/css/app.36043160.css rel=preload as=style><link href=/css/chunk-vendors.3c3b2e85.css rel=preload as=style><link href=/js/app.42f1171d.js rel=preload as=script><link href=/js/chunk-vendors.02a4e5bc.js rel=preload as=script><link href=/css/chunk-vendors.3c3b2e85.css rel=stylesheet><link href=/css/app.36043160.css rel=stylesheet></head><body><noscript><strong>很抱歉，如果没有启用JavaScript，程序不能正常工作，若要继续使用请启用它。</strong></noscript><div id=app></div><script src=/js/chunk-vendors.02a4e5bc.js></script><script src=/js/app.42f1171d.js></script></body></html>