Skip to content

朱继来 / 后台订单管理

Go to a project
Commit d3d47b3f by 朱继来
Options

fix

parents 6b70cbe7 4d30f0fc
Expand all
Inline Side-by-side
Showing with 87 additions and 107 deletions
app/Http/Controllers/OrderController.php
......@@ -260,12 +260,18 @@ function isChangeInvoice($order_sn)
}
}
// 自营线下订单
function getOrderExtend($order_id)
// 订单扩展表
function getOrderExtend($order_id, $field="*", $where=array())
{
$extend = DB::connection('order')->table('lie_order_extend')->where(['order_id' => $order_id, 'order_type' => 3])->select('temp_id')->first();
$map['order_id'] = $order_id;
return $extend ? true : false;
if (!empty($where)) {
$map = array_merge($map, $where);
}
$extend = DB::connection('order')->table('lie_order_extend')->where($map)->select($field)->first();
return $extend;
}
Class OrderController extends Controller
......@@ -680,8 +686,8 @@ Class OrderController extends Controller
"user_id" => $request->input('user_id', ''),
"cancel_reason" => $request->input('cancel_reason', ''),
"sale_id" => $request->input('sale_id', ''),
"order_pay_type" => $request->input('order_pay_type', ''),
"status" => $request->input('order_status', ''),
"order_pay_type" => $request->input('order_pay_type', '') ? $request->input('order_pay_type') : 1,
"status" => $request->input('order_status', '') ? $request->input('order_status') : 2,
"deposit_amount" => $request->input('deposit_amount', ''),
"goods_amount" => $request->input('goods_amount', ''),
"order_amount" => $request->input('order_amount', ''),
......@@ -840,30 +846,6 @@ Class OrderController extends Controller
}
}
// 填写订单取消原因
public function ajaxInputCancelReason(Request $request)
{
if ($request->isMethod('post')) {
$order_id = $request->input('order_id');
$cancel_reason = $request->input('cancel_reason');
$update = DB::connection('order')->table('lie_order')->where('order_id', $order_id)->update(['cancel_reason' => $cancel_reason]);
if (!$update) return ['errcode' => -1, 'errmsg' => '填写订单取消原因失败'];
// 操作记录
$log['order_id'] = $order_id;
$log['operator_id'] = $request->user->userId;
$log['operator_type'] = 2;
$log['event'] = '填写订单取消原因：'.$cancel_reason;
$log['ip'] = get_client_ip();
$log['create_time'] = time();
DB::connection('order')->table('lie_order_action_log')->insert($log);
return ['errcode' => 0, 'errmsg' => '填写订单取消原因成功'];
}
}
// 申请再次调价
public function applyAdjust(Request $request, $id)
{
......@@ -974,42 +956,6 @@ Class OrderController extends Controller
}
}
// 联营取消订单
public function cancelPay(Request $request, $id)
{
if($request->isMethod('post')){
$order_id = $request->input('order_id');
$cancel_reason = $request->input('cancel_reason');
$operator_id = $request->user->userId;
if (!$order_id) {
errorLog(Error::E_NOT_EXISTS, '订单不存在');
return array('errcode'=>Error::E_NOT_EXISTS,'errmsg'=>'订单不存在~');
}
if (!$cancel_reason) {
errorLog(Error::E_NOT_EXISTS, '取消订单的原因不可为空');
return array('errcode'=>Error::E_NOT_EXISTS,'errmsg'=>'取消订单的原因不可为空~');
}
$url = Config('website.api_domain').'order/cancel';
$check['k1'] = time();
$check['k2'] = md5(md5($check['k1']).'fh6y5t4rr351d2c3bryi');
$resData = array("pf"=>1, "k1"=>$check['k1'], "k2"=>$check['k2'], "order_id"=>$order_id, "cancel_reason"=>$cancel_reason, 'operator_id'=>$operator_id, 'type' => 2);
$temp = json_decode(curlApi($url,$resData,"POST"), true);
return array('errcode'=>$temp['err_code'],'errmsg'=>$temp['err_msg']);
}
$info = $this->orderDetail($request, $id);
$this->pageHeader($request, $info, '取消订单', ["title" => '取消订单', "href" => '#']);
return view('detail', $info);
}
// 对账
public function checkPay(Request $request, $id)
{
......@@ -1307,24 +1253,23 @@ Class OrderController extends Controller
return $response;
}
// 自营取消订单
public function ajaxSelfCancel(Request $request)
// 取消订单
public function ajaxCancel(Request $request)
{
if ($request->isMethod('post')) {
$order_id = $request->input('order_id');
$cancel_reason = $request->input('reason');
$operator_id = $request->user->userId;
$data['order_id'] = $request->input('order_id', 0);
$data['cancel_reason'] = $request->input('cancel_reason', '');
$data['type'] = $request->input('type', 2); // 2.取消订单，3.审核不通过，4-填写取消原因
$data['operator_id'] = $request->user->userId;
$url = Config('website.api_domain').'order/cancel';
$check['k1'] = time();
$check['k2'] = md5(md5($check['k1']).'fh6y5t4rr351d2c3bryi');
$resData = array("pf"=>1, "k1"=>$check['k1'], "k2"=>$check['k2'], "order_id"=>$order_id, "cancel_reason"=>$cancel_reason, 'operator_id'=>$operator_id, 'type' => 2);
$data['k1'] = time();
$data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
$temp = json_decode(curlApi($url, $resData, "POST"), true);
$temp = json_decode(curlApi($url, $data, "POST"), true);
return array('errcode'=>$temp['err_code'],'errmsg'=>$temp['err_msg']);
return array('errcode'=>$temp['err_code'], 'errmsg'=>$temp['err_msg']);
}
}
......
app/Http/routes.php
......@@ -47,7 +47,7 @@ Route::group(['middleware' => 'web'], function () {
Route::match(['get', 'post'], '/send/{id}', 'OrderController@send');
Route::post('/ajaxCheck', 'OrderController@ajaxCheck');
Route::match(['get', 'post'], '/adjustPrice/{id}', 'OrderController@adjustPrice');
Route::match(['get', 'post'], '/cancelPay/{id}', 'OrderController@cancelPay');
// Route::match(['get', 'post'], '/cancelPay/{id}', 'OrderController@cancelPay');
Route::match(['get', 'post'], '/checkPay/{id}', 'OrderController@checkPay');
Route::match(['get', 'post'], '/invShipping/{id}', 'OrderController@invShipping');
......@@ -68,7 +68,7 @@ Route::group(['middleware' => 'web'], function () {
Route::match('post', '/ajaxRejected', 'OrderController@ajaxRejected');
Route::get('/self_order', 'OrderController@selfOrder');
Route::post('/ajaxSelfCancel', 'OrderController@ajaxSelfCancel');
Route::post('/ajaxCancel', 'OrderController@ajaxCancel');
Route::post('/ajaxSelfExpress', 'OrderController@ajaxSelfExpress');
Route::match(['get', 'post'], '/self_check_pay/{id}', 'OrderController@selfCheckPay');
......@@ -76,7 +76,8 @@ Route::group(['middleware' => 'web'], function () {
Route::match(['get', 'post'], '/tempcount', 'OrderController@tempCount');
Route::post('/ajaxDownloadContract', 'OrderController@ajaxDownloadContract');
Route::post('/ajaxInputCancelReason', 'OrderController@ajaxInputCancelReason');
// Route::post('/ajaxInputCancelReason', 'OrderController@ajaxInputCancelReason');
Route::post('/ajax/shipping', 'OrderController@shipping');
Route::get('/add_order', 'AddOrderController@addOrder');
......
public/css/detail.css
......@@ -98,7 +98,7 @@ li {
.search-user, .search-sku {
width: 240px !important;
}
.label-prompt {
.create-order .label-prompt {
padding: 6px 6px;
}
.get-user, .get-sku {
......
public/js/add_order.js
......@@ -407,6 +407,7 @@
var cart_id = self.parents('tr').data('cid');
var type = self.parents('tr').data('type');
var user_id = 0;
var delivery_place = 1; // 1.大陆，2.香港 自营默认是大陆
if (is_online) {
user_id = $('.user_id').val();
......@@ -414,6 +415,10 @@
user_id = internal_uid ? internal_uid : user_id;
if (goods_type == 1) { // 联营需要选择交货地
delivery_place = $('input[name=delivery_place]:checked').val();
}
$.ajax({
type: "POST",
url: '/ajax/changeNum',
......@@ -421,7 +426,7 @@
dataType: "json",
success: function(resp){
if (resp.errcode == 0) {
loading.lists(user_id, goods_type, is_online); // 加载购物车列表
loading.lists(user_id, goods_type, is_online, delivery_place); // 加载购物车列表
}
layer.msg(resp.errmsg);
......@@ -434,6 +439,7 @@
var self = $(this);
var cart_id = self.parents('tr').data('cid');
var user_id = 0;
var delivery_place = 1; // 1.大陆，2.香港 自营默认是大陆
if (is_online) {
user_id = $('.user_id').val();
......@@ -441,6 +447,10 @@
user_id = internal_uid ? internal_uid : user_id;
if (goods_type == 1) { // 联营需要选择交货地
delivery_place = $('input[name=delivery_place]:checked').val();
}
layer.open({
title: '删除提示',
content: '确定删除该商品吗？',
......@@ -454,7 +464,7 @@
success: function(resp){
layer.msg(resp.errmsg);
// self.parents('tr').remove();
loading.lists(user_id, goods_type, is_online); // 加载购物车列表
loading.lists(user_id, goods_type, is_online, delivery_place); // 加载购物车列表
return false;
},
})
......@@ -559,7 +569,7 @@
success: function(resp){
if (resp.errcode == 0) {
layer.msg(resp.errmsg);
loading.lists(user_id, goods_type, is_online); // 加载购物车列表
loading.lists(user_id, goods_type, is_online, delivery_place); // 加载购物车列表
return false;
}
......
resources/views/addOffline/content.blade.php
......@@ -3,7 +3,7 @@
<h3>客户信息</h3>
</div>
<div class="ibox-content">
<div class="ibox-content create-order">
<div class="account-info">
<h4>账户信息 <span class="title-tips"><i class="fa fa-info-circle"></i> 此账号为内部下单账号，前台不可登录。</span></h4>
......
resources/views/addOnline/content.blade.php
......@@ -3,7 +3,7 @@
<h3>客户信息</h3>
</div>
<div class="ibox-content">
<div class="ibox-content create-order">
<div class="row" style="margin-bottom: 30px;">
<div class="col-sm-12">
<input type="text" class="search-user" name="user-mobile" value="" placeholder="请输入会员账号">
......
resources/views/addOrder/content.blade.php
......@@ -3,7 +3,7 @@
<h3>客户信息</h3>
</div>
<div class="ibox-content">
<div class="ibox-content create-order">
<div class="row" style="margin-bottom: 30px;">
<div class="col-sm-12">
<input type="text" class="search-user" name="user-mobile" value="" placeholder="请输入会员账号">
......
resources/views/detail/changeOrder.blade.php
......@@ -43,6 +43,7 @@
@endif
<!-- 审核 -->
@if ($order_info['order_goods_type'] == 1)
<p>审核</p>
<table class="table table-bordered table-hover check-table">
<tr>
......@@ -60,12 +61,22 @@
<td class="check-table-title" width="20%">调价审核：</td>
<td class="check-select">
<label><input type="radio" name="order_status" value="2" checked>审核通过</label>
<label><input type="radio" name="order_status" value="-1" id="faild">审核不通过</label>
<label><input type="radio" name="order_status" class="input-cancel-reason" value="-1" data-oid="{{$order_info['order_id']}}" data-type="3">审核不通过</label>
</td>
</tr>
<tr class="cancle_reason" style="display: none;">
<!-- <tr class="cancle_reason" style="display: none;">
<td class="check-table-title">审核不通过原因：</td>
<td>
<div class="form-group">
<label>常见原因：</label>
<div class="input-radio">
<label class="radio-inline"><input type="radio" name="cancel_reason" value="测试订单">测试订单</label>
<label class="radio-inline"><input type="radio" name="cancel_reason" value="客户没需求">客户没需求</label>
<label class="radio-inline"><input type="radio" name="cancel_reason" value="审核太久">审核太久</label>
<label class="radio-inline"><input type="radio" name="cancel_reason" value="订单信息填错">订单信息填错</label>
<label class="radio-inline"><input type="radio" name="cancel_reason" value="需用优惠券">需用优惠券</label>
</div>
</div>
<div class="multi-reason">
<label><input type="radio" name="reason" value="客户不接受调价">客户不接受调价</label>
<label><input type="radio" name="reason" value="无现货">无现货</label>
......@@ -78,10 +89,12 @@
<textarea name="reason" id="input-reason" placeholder="请填写其他原因"></textarea>
</div>
</td>
</tr>
</tr> -->
</table>
<hr/>
@endif
<!-- 调价 -->
<p>调价</p>
<table class="table table-bordered table-hover order-change-table">
......
resources/views/detail/content.blade.php
......@@ -410,7 +410,7 @@
<th>供应商</th>
<?php
if ($action_name == 'changeOrder' && count($order_items_info) > 1 && $order_info['status'] == 1) {
if ($action_name == 'changeOrder' && count($order_items_info) > 1 && in_array($order_info['status'], [1, 2])) {
echo '<th>操作</th>';
}
?>
......@@ -575,15 +575,16 @@
@if (!isset($_REQUEST['tags']) && $action_name != 'changeOrder' && $action_name != 'sendSales')
<p style="padding-left: 5px;">操作</p>
<div class="tabs-box">
@if (in_array($order_info['status'], [1, 2]) && in_array('cancel_order', $userPerms))
<!-- <a href="{{URL('cancelPay', ['order_id'=>$order_info['order_id']])}}" class="btn btn-danger">取消订单</a> -->
<a class="btn btn-danger input-cancel-reason" href="javascript:;" data-oid="{{$order_info['order_id']}}" data-type="2">取消订单</a>
@endif
<!-- 判断操作权限 -->
@if (in_array($order_info['status'], [1, 2]) && in_array('check_order', $userPerms))
<a class="btn btn-info" href="{{URL('change', ['order_id'=>$order_info['order_id']])}}">人工审单</a>
@endif
@if ($order_info['status'] == 2 && in_array('cancel_order', $userPerms))
<a href="{{URL('cancelPay', ['order_id'=>$order_info['order_id']])}}" class="btn btn-danger">取消订单</a>
@endif
<!-- 预付款 管理员完成首款对账后改变'对账'按钮 -->
@if (in_array($order_info['status'], [2, 3]) && in_array('check_account', $userPerms))
@if ($order_info['status'] == 3 && (!empty($order_pay_log) && $order_pay_log[0]['pay_type'] != ''))
......@@ -606,20 +607,21 @@
@elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self' && $action_name != 'changeOrder')
<p style="padding-left: 5px;">操作</p>
<div class="tabs-box">
@if (in_array($order_info['status'], [1, 2, 3, 4]) && in_array('self_order_cancel', $userPerms))
<!-- <a class="btn btn-danger self_cancel" href="javascript:;" data-id="{{$order_info['order_id']}}">取消订单</a> -->
<a class="btn btn-danger input-cancel-reason" href="javascript:;" data-oid="{{$order_info['order_id']}}" data-type="2">取消订单</a>
@endif
<!-- 判断状态和权限 $extend-自营线下订单 -->
@if ($order_info['status'] == 1 && in_array('add_offline_audit', $userPerms) && $extend)
<a class="btn btn-success self-check" data-id="{{$order_info['order_id']}}">内部订单审核</a>
<!-- <a class="btn btn-success self-check" data-id="{{$order_info['order_id']}}">内部订单审核</a> -->
@endif
<!-- 订单审单 -->
@if (in_array($order_info['status'], [1, 2]) && in_array('self_check_order', $userPerms) && !$extend)
@if (in_array($order_info['status'], [1, 2]) && in_array('self_check_order', $userPerms))
<a class="btn btn-info" href="/change/{{$order_info['order_id']}}?tags=self">人工审单</a>
@endif
@if (in_array($order_info['status'], [1, 2, 3, 4]) && !$extend && in_array('self_order_cancel', $userPerms))
<a class="btn btn-danger self_cancel" href="javascript:;" data-id="{{$order_info['order_id']}}">取消订单</a>
@endif
@if ($order_info['status'] == 2 && in_array('self_check_pay', $userPerms))
<a href="/self_check_pay/{{$order_info['order_id']}}?tags=self" class="btn btn-success">对账</a>
@endif
......
resources/views/orderlist/content.blade.php
......@@ -325,7 +325,7 @@
@endif
@if ($v['status'] == -1 && !$v['cancel_reason'])
<a class="btn btn-danger input-cancel-reason" href="javascript:;" data-oid="{{$v['order_id']}}">填写取消原因</a>
<a class="btn btn-danger input-cancel-reason" href="javascript:;" data-oid="{{$v['order_id']}}" data-type="4">填写取消原因</a>
@endif
</div>
</td>
......@@ -340,9 +340,13 @@
<td class="table-list-content">
<p class="show-title" title="{{App\Http\Controllers\getCompanyName($v['user_id'])}}">{{App\Http\Controllers\getCompanyName($v['user_id'])}}</p>
</td>
<td class="table-list-title">Adtag或其它</td>
<td class="table-list-content" colspan="3">
<p class="show-title" title="<?php echo App\Http\Controllers\handleOrderSource($v['order_source']); ?>"><?php echo App\Http\Controllers\handleOrderSource($v['order_source']); ?></p>
<td class="table-list-title">是否新订单</td>
<td class="table-list-content">
<?php
$is_new_order = App\Http\Controllers\getOrderExtend($v['order_id'], 'is_new');
echo $is_new_order && $is_new_order->is_new ? '是' : '否';
?>
</td>
</tr>
@if ($v['order_pay_type'] == 2)
......@@ -433,6 +437,12 @@
<td class="table-list-title">发货状态</td>
<td class="table-list-content">{{$shippingStatus}}</td>
</tr>
<tr>
<td class="table-list-title">Adtag或其它</td>
<td class="table-list-content" colspan="3">
<p class="show-title" title="<?php echo App\Http\Controllers\handleOrderSource($v['order_source']); ?>"><?php echo App\Http\Controllers\handleOrderSource($v['order_source']); ?></p>
</td>
</tr>
</table>
</td>
</tr>
......
resources/views/selfOrder/content.blade.php
......@@ -276,8 +276,7 @@
<div class="btn-group btn-group-xs">
<a class="btn btn-primary" href="/details/{{$v['order_id']}}?tags=self" target="_blank">详情</a>
<?php $extend = App\Http\Controllers\getOrderExtend($v['order_id']); ?>
@if (in_array('self_check_order', $userPerms) && in_array($v['status'], [1, 2]) && !$extend)
@if (in_array('self_check_order', $userPerms) && in_array($v['status'], [1, 2]))
<a class="btn btn-success" href="/change/{{$v['order_id']}}?tags=self" target="_blank">人工审单</a>
@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