Skip to content

朱继来 / 后台订单管理

Go to a project
Commit f32a0d67 by 朱继来
Options

调整订单列表

parent c84cbf2e
Inline Side-by-side
Showing with 65 additions and 43 deletions
app/Http/Controllers/OrderController.php
......@@ -31,6 +31,17 @@ function getCoupon($order_id)
return null;
}
// 获取会员账号
function getAccountName($user_id)
{
$userMainModel = new UserMainModel();
$user = $userMainModel->where('user_id', $user_id)->select('mobile', 'email')->first();
if (!$user) return false;
return $user->mobile ? $user->mobile : $user->email;
}
function getPayName($order_id)
{
$payLog = DB::connection('order')
......@@ -400,7 +411,7 @@ Class OrderController extends Controller
}
// 订单查看权限---交易员、客服、测试
if (in_array($info['role'], [3, 4, 5])) {
if (in_array($info['role'], [3, 4])) {
// 筛选自己的订单
$data['sale_id'] = $request->user->userId;
}
......
config/params.php
<?php
return [
// 订单状态
'order_status' => [
-1 => '已取消',
1 => '待审核',
2 => '待付款',
3 => '待付尾款',
4 => '待发货',
7 => '部分发货',
8 => '待收货',
10 => '交易成功',
],
// 支付方式
'order_paid_name' => [
1 => '微信支付',
2 => '支付宝',
3 => '银联支付(B2B)',
4 => '银联支付(B2C)',
5 => '账期支付',
6 => '京东支付',
7 => '交通银行',
8 => '恒生银行',
9 => '钱包支付',
],
'liexin_info'=>[
'company_name'=>'猎芯科技', //收货人
'contact'=>'待定', //联系方式
......@@ -12,6 +37,7 @@
'bank_name'=>'中国工商银行深圳华联支行',//开户银行
'bank_account'=>'4000021609200128449',//银行卡号
],
'joint_addr' => '深圳市龙岗区坂田五和大道南2号万科星火online六栋三楼猎芯科技', // 联营自提地址
'self_addr' => '深圳市光明新区新湖街道楼村社区荔都路32号A栋三楼', // 自营自提地址
......
resources/views/erpOrder/content.blade.php
......@@ -38,14 +38,11 @@
<dt>订单状态：</dt>
<dd>
<select id="order_status" name="order_status" class="form-control order_status selectpicker" title="全部" multiple>
<option value="-1">已取消</option>
<option value="1">待审核</option>
<option value="2">待付款</option>
<option value="3">待付尾款</option>
<option value="4">待发货</option>
<option value="7">部分发货</option>
<option value="8">待收货</option>
<option value="10">交易成功</option>
@if (Config('params.order_status'))
@foreach (Config('params.order_status') as $k=>$v)
<option value="{{$k}}">{{$v}}</option>
@endforeach
@endif
</select>
</dd>
</dl>
......
resources/views/orderlist/content.blade.php
......@@ -41,14 +41,11 @@
<dt>订单状态：</dt>
<dd>
<select id="order_status" name="order_status" class="form-control order_status selectpicker" title="全部" multiple>
<option value="-1">已取消</option>
<option value="1">待审核</option>
<option value="2">待付款</option>
<option value="3">待付尾款</option>
<option value="4">待发货</option>
<option value="7">部分发货</option>
<option value="8">待收货</option>
<option value="10">交易成功</option>
@if (Config('params.order_status'))
@foreach (Config('params.order_status') as $k=>$v)
<option value="{{$k}}">{{$v}}</option>
@endforeach
@endif
</select>
</dd>
</dl>
......@@ -99,14 +96,11 @@
<dt>支付方式：</dt>
<dd>
<select id="order_payment_mode" name="order_payment_mode" class="form-control order_payment_mode selectpicker" title="全部" multiple>
<option value="1">微信支付</option>
<option value="2">支付宝</option>
<option value="3">银联支付(B2B)</option>
<option value="4">银联支付(B2C)</option>
<option value="5">账期支付</option>
<option value="6">京东支付</option>
<option value="7">交通银行</option>
<option value="8">恒生银行</option>
@if (Config('params.order_paid_name'))
@foreach (Config('params.order_paid_name') as $k=>$v)
<option value="{{$k}}">{{$v}}</option>
@endforeach
@endif
</select>
</dd>
</dl>
......@@ -251,7 +245,7 @@
<tbody>
@foreach ($list as $v)
<tr>
<td class="show-list">{{$v['mobile'] ? $v['mobile'] : $v['email']}}</td>
<td class="show-list"><?php print_r(App\Http\Controllers\getAccountName($v['user_id'])); ?></td>
<td class="show-list">{{$v['order_sn']}}</td>
<td class="show-list">
<?php
......
resources/views/selfOrder/content.blade.php
......@@ -39,14 +39,11 @@
<dt>订单状态：</dt>
<dd>
<select id="order_status" name="order_status" class="form-control order_status selectpicker" title="全部" multiple>
<option value="-1">已取消</option>
<option value="1">待审核</option>
<option value="2">待付款</option>
<option value="3">待付尾款</option>
<option value="4">待发货</option>
<option value="7">部分发货</option>
<option value="8">待收货</option>
<option value="10">交易成功</option>
@if (Config('params.order_status'))
@foreach (Config('params.order_status') as $k=>$v)
<option value="{{$k}}">{{$v}}</option>
@endforeach
@endif
</select>
</dd>
</dl>
......@@ -66,14 +63,11 @@
<dt>支付方式：</dt>
<dd>
<select id="order_payment_mode" name="order_payment_mode" class="form-control order_payment_mode selectpicker" title="全部" multiple>
<option value="1">微信支付</option>
<option value="2">支付宝</option>
<option value="3">银联支付(B2B)</option>
<option value="4">银联支付(B2C)</option>
<option value="5">账期支付</option>
<option value="6">京东支付</option>
<option value="7">交通银行</option>
<option value="8">恒生银行</option>
@if (Config('params.order_paid_name'))
@foreach (Config('params.order_paid_name') as $k=>$v)
<option value="{{$k}}">{{$v}}</option>
@endforeach
@endif
</select>
</dd>
</dl>
......@@ -193,7 +187,7 @@
<tbody>
@foreach ($list as $v)
<tr>
<td class="show-list">{{$v['mobile'] ? $v['mobile'] : $v['email']}}</td>
<td class="show-list"><?php print_r(App\Http\Controllers\getAccountName($v['user_id'])); ?></td>
<td class="show-list">{{$v['order_sn']}}</td>
<td class="show-list">
<?php
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment