Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 19f41868 by 朱继来
Options

temp2

parent d38893df
Inline Side-by-side
Showing with 69 additions and 56 deletions
app/Http/Controllers/OrderController.php
...@@ -381,8 +381,8 @@ Class OrderController extends Controller ...@@ -381,8 +381,8 @@ Class OrderController extends Controller
return view('orderlist', $info); return view('orderlist', $info);
} }
// 获取页面及订单信息 tid为订单类型：1.联营 2. 自营 // 订单搜索参数
public function getOrderInfo($request, $tid) public function _search(Request $request, $tid)
{ {
$info = $this->getPageInfo($request); $info = $this->getPageInfo($request);
...@@ -406,7 +406,6 @@ Class OrderController extends Controller ...@@ -406,7 +406,6 @@ Class OrderController extends Controller
$map['order_source_adtag'] = $request->input('order_source_adtag', ''); $map['order_source_adtag'] = $request->input('order_source_adtag', '');
$map['order_source_ptag'] = $request->input('order_source_ptag', ''); $map['order_source_ptag'] = $request->input('order_source_ptag', '');
$map['erp_order_id'] = $request->input('erp_order_id', ''); $map['erp_order_id'] = $request->input('erp_order_id', '');
$map['order_payment_mode'] = $request->input('order_payment_mode', ''); $map['order_payment_mode'] = $request->input('order_payment_mode', '');
$map['order_invoice_status']= $request->input('order_invoice_status', ''); $map['order_invoice_status']= $request->input('order_invoice_status', '');
$map['is_new'] = $request->input('is_new', ''); $map['is_new'] = $request->input('is_new', '');
...@@ -416,7 +415,7 @@ Class OrderController extends Controller ...@@ -416,7 +415,7 @@ Class OrderController extends Controller
// 订单查看权限---交易员、客服、测试 // 订单查看权限---交易员、客服、测试
if (in_array($info['role'], [3, 4])) { if (in_array($info['role'], [3, 4])) {
// 筛选自己的订单 // 筛选自己的订单
$data['sale_id'] = $request->user->userId; $map['sale_id'] = $request->user->userId;
} }
// 自营客服权限 // 自营客服权限
...@@ -444,15 +443,25 @@ Class OrderController extends Controller ...@@ -444,15 +443,25 @@ Class OrderController extends Controller
$map['order_type_filter'] = [2, 3]; // 2-ERP, 3-JD $map['order_type_filter'] = [2, 3]; // 2-ERP, 3-JD
} }
$info['size'] = $size;
$info['map'] = $map;
return $info;
}
// 获取页面及订单信息 tid为订单类型：1.联营, 2. 自营, 3. ERP
public function getOrderInfo($request, $tid=1)
{
$info = $this->_search($request, $tid);
// 获取所有的业务员 （包括经理、交易员、客服、测试） // 获取所有的业务员 （包括经理、交易员、客服、测试）
$perm = new PermController; $perm = new PermController;
if ($tid == 1 || $tid == 3) { if ($tid == 1 || $tid == 3) {
$manager = $perm->getRoleUsers($request, '经理'); $manager = $perm->getRoleUsers($request, '经理');
$test = $perm->getRoleUsers($request, '测试'); $test = $perm->getRoleUsers($request, '测试');
$sales = $perm->getRoleUsers($request, '交易员'); $sales = $perm->getRoleUsers($request, '交易员');
$kefu = $perm->getRoleUsers($request, '客服'); $kefu = $perm->getRoleUsers($request, '客服');
$sale_list = array_merge($manager, $sales, $test, $kefu); $sale_list = array_merge($manager, $sales, $test, $kefu);
} else { } else {
$sale_list = $perm->getRoleUsers($request, '客服'); $sale_list = $perm->getRoleUsers($request, '客服');
...@@ -461,20 +470,20 @@ Class OrderController extends Controller ...@@ -461,20 +470,20 @@ Class OrderController extends Controller
//获取订单列表 //获取订单列表
$url = Config('website.api_domain').'order/getAllOrder'; $url = Config('website.api_domain').'order/getAllOrder';
$data['k1'] = time(); $data['k1'] = time();
$data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi'); $data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
$data['p'] = $request->input('p', 1); // 当前页码 $data['p'] = $request->input('p', 1); // 当前页码
$data['size'] = $size; // 当前页条数 $data['size'] = $info['size']; // 当前页条数
$data['map'] = $map; $data['map'] = $info['map'];
$response = json_decode(curlApi($url, $data), true); $response = json_decode(curlApi($url, $data), true);
// 分页 // 分页
$page = new Page($response['data']['count'], $size); $page = new Page($response['data']['count'], $info['size']);
$page->setConfig('theme', '%FIRST% %UP_PAGE% %LINK_PAGE% %DOWN_PAGE% %END% %HEADER%'); $page->setConfig('theme', '%FIRST% %UP_PAGE% %LINK_PAGE% %DOWN_PAGE% %END% %HEADER%');
$show = $page->show(); $show = $page->show();
$info['condition'] = $map; $info['condition'] = $info['map'];
$info['sale_list'] = $sale_list; $info['sale_list'] = $sale_list;
$info['list'] = $response['data']['data']; $info['list'] = $response['data']['data'];
$info['pay_count'] = $response['data']['pay_count']; $info['pay_count'] = $response['data']['pay_count'];
...@@ -491,37 +500,19 @@ Class OrderController extends Controller ...@@ -491,37 +500,19 @@ Class OrderController extends Controller
// 订单其他信息 // 订单其他信息
public function orderOtherInfoLoading(Request $request) public function orderOtherInfoLoading(Request $request)
{ {
// 页面参数 // 判断页面
$map['order_type'] = $request->input('order_type', ''); $tid = $request->input('pid', 1);
$map['order_contain'] = $request->input('order_contain', ''); $info = $this->_search($request, $tid);
$map['time_start'] = $request->input('time_start', '');
$map['time_end'] = $request->input('time_end', '');
$map['order_status'] = $request->input('order_status', '');
$map['sale_type'] = $request->input('sale_type', '');
$map['shipping_name'] = $request->input('shipping_name', '');
$map['order_send'] = $request->input('order_send', '');
$map['test_order'] = $request->input('test_order', '');
$map['order_pay_type'] = $request->input('order_pay_type', '');
$map['order_type_a'] = $request->input('order_type_a', '');
$map['order_source'] = $request->input('order_source', '');
$map['order_source_pf'] = $request->input('order_source_pf', '');
$map['order_source_adtag'] = $request->input('order_source_adtag', '');
$map['order_source_ptag'] = $request->input('order_source_ptag', '');
$map['erp_order_id'] = $request->input('erp_order_id', '');
$map['order_payment_mode'] = $request->input('order_payment_mode', '');
$map['order_invoice_status']= $request->input('order_invoice_status', '');
$map['is_new'] = $request->input('is_new', '');
$map['is_new_order'] = $request->input('is_new_order', '');
$url = Config('website.api_domain').'order/getOrderOtherInfo'; $url = Config('website.api_domain').'order/getOrderOtherInfo';
$data['k1'] = time(); $data['k1'] = time();
$data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi'); $data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
$data['map'] = $map; $data['map'] = $info['map'];
echo '<pre>';
print_r(curlApi($url, $data));die;
$response = json_decode(curlApi($url, $data), true); $response = json_decode(curlApi($url, $data), true);
return $response;
} }
// erp订单 // erp订单
......
app/Http/Controllers/OrderCountController.php
...@@ -100,7 +100,7 @@ Class OrderCountController extends Controller ...@@ -100,7 +100,7 @@ Class OrderCountController extends Controller
} }
// 调用API // 调用API
$url = Config('website.api_domain').'order/getAllOrder'; $url = Config('website.api_domain').'order/getOrderAmount';
$data['k1'] = time(); $data['k1'] = time();
$data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi'); $data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
......
public/js/order.js
...@@ -324,14 +324,15 @@ ...@@ -324,14 +324,15 @@
}) })
// 订单其他信息 // 订单其他信息
this.orderOtherInfo(); var page_type = $('#page_type').val();
this.orderOtherInfo(page_type);
// 填写取消原因 // 填写取消原因
this.cancelorder(); this.cancelorder();
}, },
// 订单其他信息：已付款， 下单用户数， 付款用户数， 金额 // 订单其他信息：已付款， 下单用户数， 付款用户数， 金额
orderOtherInfo:function() { orderOtherInfo:function(pid) {
var datax = { var datax = {
order_type : $('#order_type').data('default'), order_type : $('#order_type').data('default'),
order_contain : $('input[name=order_contain]').val(), order_contain : $('input[name=order_contain]').val(),
...@@ -351,18 +352,33 @@ ...@@ -351,18 +352,33 @@
is_new : $('#is_new').val() ? $('#is_new').val() : '', is_new : $('#is_new').val() ? $('#is_new').val() : '',
order_payment_mode : $('#order_payment_mode').val() ? $('#order_payment_mode').val() : '', order_payment_mode : $('#order_payment_mode').val() ? $('#order_payment_mode').val() : '',
is_new_order : $('#is_new_order').val() ? $('#is_new_order').val() : '', is_new_order : $('#is_new_order').val() ? $('#is_new_order').val() : '',
pid : pid,
}; };
console.log(datax)
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: '/ajax/orderOtherInfoLoading', url: '/ajax/orderOtherInfoLoading',
data: datax, data: datax,
dataType: "json", dataType: "json",
success: function(resp){ success: function(resp){
if (resp.errcode != 0) { if (resp.err_code != 0) {
layer.msg(resp.errmsg); layer.msg(resp.err_msg);
return false; return false;
} }
var data = resp.data;
var html = '';
if (pid != 3) {
html += '<span class="paid_order_count">'+data.paid_order_count+'单已付款（包含预付款），</span><span class="user_count">下单用户数为'+data.user_count+'人，</span><span class="paid_user_count">付款用户数为'+data.paid_user_count+'人，</span>';
}
html += '<span class="rmb_count">应付金额 ￥'+data.pay_count.rmb_count+'，</span><span class="usd_count">$'+data.pay_count.usd_count+'，</span><span class="rmb_pay">实收金额 ￥'+data.pay_count.rmb_pay+'，</span><span class="usd_pay">$'+data.pay_count.usd_pay+'，</span>';
if (pid != 3 && data.noreason_count) {
html += '<span class="error">共有'+data.noreason_count+'单已取消订单未填写取消原因</span>';
}
$('.show-other-info').append(html);
}, },
}) })
}, },
......
resources/views/erpOrder/content.blade.php
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
<!-- <ul class="nav nav-tabs"> <!-- <ul class="nav nav-tabs">
<li class="active"><a href="javascript:;">ERP订单</a></li> <li class="active"><a href="javascript:;">ERP订单</a></li>
</ul> --> </ul> -->
<input type="hidden" name="page_type" id="page_type" value="3">
<div class="tabs-box"> <div class="tabs-box">
<div class="row-fluid search-box"> <div class="row-fluid search-box">
<div class="span12"> <div class="span12">
...@@ -289,9 +290,10 @@ ...@@ -289,9 +290,10 @@
@if ($username != 'vpadmin@ichunt.com') @if ($username != 'vpadmin@ichunt.com')
<span class="show-list-info"> <span class="show-list-info">
共{{$count ? $count : 0}}单， 共{{$count ? $count : 0}}单，
应付金额 ￥{{$pay_count['rmb_count'] ? $pay_count['rmb_count'] : 0}}， ${{$pay_count['usd_count'] ? $pay_count['usd_count'] : 0}}， <!-- 应付金额 ￥{{$pay_count['rmb_count'] ? $pay_count['rmb_count'] : 0}}， ${{$pay_count['usd_count'] ? $pay_count['usd_count'] : 0}}，
实收金额 ￥{{$pay_count['rmb_pay'] ? $pay_count['rmb_pay'] : 0}}， 实收金额 ￥{{$pay_count['rmb_pay'] ? $pay_count['rmb_pay'] : 0}}，
${{$pay_count['usd_pay'] ? $pay_count['usd_pay'] : 0}} ${{$pay_count['usd_pay'] ? $pay_count['usd_pay'] : 0}} -->
<span class="show-other-info"></span>
</span> </span>
@endif @endif
......
resources/views/orderlist/content.blade.php
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
<!-- <ul class="nav nav-tabs"> <!-- <ul class="nav nav-tabs">
<li class="active"><a href="javascript:;">平台订单</a></li> <li class="active"><a href="javascript:;">平台订单</a></li>
</ul> --> </ul> -->
<input type="hidden" name="page_type" id="page_type" value="1">
<div class="tabs-box"> <div class="tabs-box">
<div class="row-fluid search-box"> <div class="row-fluid search-box">
<div class="span12"> <div class="span12">
...@@ -458,7 +459,7 @@ ...@@ -458,7 +459,7 @@
@if ($username != 'vpadmin@ichunt.com') @if ($username != 'vpadmin@ichunt.com')
<span class="show-list-info"> <span class="show-list-info">
共{{$count ? $count : 0}}单， 共{{$count ? $count : 0}}单，
{{$paid_order_count}}单已付款（包含预付款）， <!-- {{$paid_order_count}}单已付款（包含预付款），
下单用户数为{{$user_count}}人， 下单用户数为{{$user_count}}人，
付款用户数为{{$paid_user_count}}人， 付款用户数为{{$paid_user_count}}人，
应付金额 ￥{{$pay_count['rmb_count'] ? $pay_count['rmb_count'] : 0}}， ${{$pay_count['usd_count'] ? $pay_count['usd_count'] : 0}}， 应付金额 ￥{{$pay_count['rmb_count'] ? $pay_count['rmb_count'] : 0}}， ${{$pay_count['usd_count'] ? $pay_count['usd_count'] : 0}}，
...@@ -466,9 +467,10 @@ ...@@ -466,9 +467,10 @@
${{$pay_count['usd_pay'] ? $pay_count['usd_pay'] : 0}}， ${{$pay_count['usd_pay'] ? $pay_count['usd_pay'] : 0}}，
@if ($noreason_count) @if ($noreason_count)
<span class="error">共有{{$noreason_count}}单已取消订单未填写取消原因</span> <span class="error">共有{{$noreason_count}}单已取消订单未填写取消原因</span>
@endif @endif -->
<span class="show-other-info"></span>
</span> </span>
<span class="show-other-info"></span>
@endif @endif
<?php echo $page; ?> <?php echo $page; ?>
......
resources/views/selfOrder/content.blade.php
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
<!-- <ul class="nav nav-tabs"> <!-- <ul class="nav nav-tabs">
<li class="active"><a href="javascript:;">自营订单</a></li> <li class="active"><a href="javascript:;">自营订单</a></li>
</ul> --> </ul> -->
<input type="hidden" name="page_type" id="page_type" value="2">
<div class="tabs-box"> <div class="tabs-box">
<div class="row-fluid search-box"> <div class="row-fluid search-box">
<div class="span12"> <div class="span12">
...@@ -338,12 +339,13 @@ ...@@ -338,12 +339,13 @@
@if ($username != 'vpadmin@ichunt.com') @if ($username != 'vpadmin@ichunt.com')
<span class="show-list-info"> <span class="show-list-info">
共{{$count ? $count : 0}}单， 共{{$count ? $count : 0}}单，
{{$paid_order_count}}单已付款（包含预付款）， <!-- {{$paid_order_count}}单已付款（包含预付款），
下单用户数为{{$user_count}}人， 下单用户数为{{$user_count}}人，
付款用户数为{{$paid_user_count}}人， 付款用户数为{{$paid_user_count}}人，
应付金额 ￥{{$pay_count['rmb_count'] ? $pay_count['rmb_count'] : 0}}， ${{$pay_count['usd_count'] ? $pay_count['usd_count'] : 0}}， 应付金额 ￥{{$pay_count['rmb_count'] ? $pay_count['rmb_count'] : 0}}， ${{$pay_count['usd_count'] ? $pay_count['usd_count'] : 0}}，
实收金额 ￥{{$pay_count['rmb_pay'] ? $pay_count['rmb_pay'] : 0}}， 实收金额 ￥{{$pay_count['rmb_pay'] ? $pay_count['rmb_pay'] : 0}}，
${{$pay_count['usd_pay'] ? $pay_count['usd_pay'] : 0}} ${{$pay_count['usd_pay'] ? $pay_count['usd_pay'] : 0}} -->
<span class="show-other-info"></span>
</span> </span>
@endif @endif
......
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