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

order_at

Browse Source
This commit is contained in:
邓皓元 2018-12-26 09:54:50 +08:00
parent be29c3f1cd
commit 7b97dfaeee
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,7 @@ class OrderController extends Controller
'order_status_name' => $orderStatues[$item->order_status],
'transaction_status' => $item->transaction_status,
'transaction_status_name' => $transactionStatuses[$item->transaction_status],
'order_at' => $item->order_at,
'order_at' => (string)$item->order_at,
];
});

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

@ -82,10 +82,6 @@ class OrderService extends Service
'product_id' => [],
'counts' => [],
'pay_channel' => [Rule::in(array_collapse(app(Dicts::class)->get('pay_channel')))],
'contacts' => ['display_length:2,32'],
'mobile' => ['cn_phone'],
'area' => ['max:255'],
'address' => ['max:255'],
'order_status' => ['in:0,1,2,3,4'],
'transaction_status' => ['in:0,1,2'],
'extends' => ['array'],
@ -98,12 +94,9 @@ class OrderService extends Service
'counts.required' => '请输入订购数量',
'pay_channel.required' => '请选择支付方式',
'pay_channel.in' => '支付方式不合法',
'contacts.required' => '联系人不能为空',
'contacts.display_length' => '联系人名称长度不合法',
'mobile.required' => '手机号不能为空',
'mobile.cn_phone' => '手机号不合法',
'area.required' => '请选择区域',
'address.required' => '请输入详细地址',
'contacts.required' => '请选择收货地址',
'mobile.required' => '请选择收货地址',
'address.required' => '请选择收货地址',
];
if (!$attributes['id']) {
@ -113,7 +106,6 @@ class OrderService extends Service
$rule['pay_channel'][] = 'required';
$rule['contacts'][] = 'required';
$rule['mobile'][] = 'required';
$rule['area'][] = 'required';
$rule['address'][] = 'required';
}

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

@ -86,9 +86,9 @@ class PackageService extends Service
'sn.required' => '请输入套餐编号',
'sn.between' => '套餐编号长度不合法',
'sn.unique' => '套餐编号已经被其他用户所使用',
'name.required' => '请输入套餐编号',
'name.between' => '套餐编号长度不合法',
'name.unique' => '套餐编号已经被其他用户所使用',
'name.required' => '请输入套餐名称',
'name.between' => '套餐名称长度不合法',
'name.unique' => '套餐名称已经被其他用户所使用',
'type.required' => '请选择套餐类型',
'type.in' => '套餐类型不合法',
'carrier_operator.required' => '请选择运营商',