Skip to content

朱继来 / 后台订单管理

Go to a project
Commit c756a464 by 朱继来
Options

添加操作记录

parent 85b42256
Inline Side-by-side
Showing with 31 additions and 10 deletions
app/Http/Controllers/OrderController.php
...@@ -860,6 +860,7 @@ Class OrderController extends Controller ...@@ -860,6 +860,7 @@ Class OrderController extends Controller
"change_info" => $request->input('change_info', ''), "change_info" => $request->input('change_info', ''),
"pay_time_limit" => $pay_time_limit, "pay_time_limit" => $pay_time_limit,
"check_failed" => $request->input('check_failed', ''), "check_failed" => $request->input('check_failed', ''),
"check_failed_info" => $request->input('check_failed_info', ''),
"order_id" => $order_id, "order_id" => $order_id,
'operator_id' => $request->user->userId, 'operator_id' => $request->user->userId,
"pf" => 1, "pf" => 1,
...@@ -882,11 +883,16 @@ Class OrderController extends Controller ...@@ -882,11 +883,16 @@ Class OrderController extends Controller
// 调价失败临时表状态更改 // 调价失败临时表状态更改
$order_temp = DB::connection('order')->table('lie_order_extend')->where(['order_id' => $order_id])->update(['status' => -1]); $order_temp = DB::connection('order')->table('lie_order_extend')->where(['order_id' => $order_id])->update(['status' => -1]);
if (!$order_temp) { if (!$order_temp) return array('errcode'=>-1, 'errmsg'=>'驳回失败');
return array('errcode'=>-1, 'errmsg'=>'驳回失败');
}
// 操作记录
$log['order_id'] = $order_id;
$log['operator_id'] = $request->user->userId;
$log['operator_type'] = 2;
$log['event'] = '审核驳回';
$log['ip'] = get_client_ip();
$log['create_time'] = time();
DB::connection('order')->table('lie_order_action_log')->insert($log);
return array('errcode'=>0,'errmsg'=>'驳回成功'); return array('errcode'=>0,'errmsg'=>'驳回成功');
} }
...@@ -1322,6 +1328,7 @@ Class OrderController extends Controller ...@@ -1322,6 +1328,7 @@ Class OrderController extends Controller
{ {
if($request->isMethod('post')){ if($request->isMethod('post')){
$data = $request->input(); $data = $request->input();
$operator_id = $request->user->userId;
if (!$data['inv_shipping_no']) { if (!$data['inv_shipping_no']) {
return redirect('/prompt')->with(['message'=>'发票物流单号不可为空~','url' =>$_SERVER['HTTP_REFERER'], 'jumpTime'=>3,'status'=>false]); return redirect('/prompt')->with(['message'=>'发票物流单号不可为空~','url' =>$_SERVER['HTTP_REFERER'], 'jumpTime'=>3,'status'=>false]);
...@@ -1332,7 +1339,7 @@ Class OrderController extends Controller ...@@ -1332,7 +1339,7 @@ Class OrderController extends Controller
$url = Config('website.api_domain').'order/invShipping'; $url = Config('website.api_domain').'order/invShipping';
$resData = array("pf"=>1, "k1"=>$check['k1'], "k2"=>$check['k2'], "order_id"=>$data['order_id'], "inv_shipping_no"=>$data['inv_shipping_no'], "inv_shipping_id"=>$data['inv_shipping_id']); $resData = array("pf"=>1, "k1"=>$check['k1'], "k2"=>$check['k2'], "order_id"=>$data['order_id'], "inv_shipping_no"=>$data['inv_shipping_no'], "inv_shipping_id"=>$data['inv_shipping_id'], 'operator_id'=>$operator_id);
$temp = json_decode(curlApi($url, $resData, "POST"), true); $temp = json_decode(curlApi($url, $resData, "POST"), true);
...@@ -1643,6 +1650,15 @@ Class OrderController extends Controller ...@@ -1643,6 +1650,15 @@ Class OrderController extends Controller
->update(['status' => -1, 'pay_time' => 0, 'cancel_time' => time()]); ->update(['status' => -1, 'pay_time' => 0, 'cancel_time' => time()]);
if ($update) { if ($update) {
// 记录
$log['order_id'] = $order_id;
$log['operator_id'] = 0;
$log['operator_type'] = 3;
$log['event'] = '取消订单，取消原因：超时未付款';
$log['ip'] = 0;
$log['create_time'] = time();
DB::connection('order')->table('lie_order_action_log')->insert($log);
continue; continue;
} }
} }
......
public/js/order.js
...@@ -1068,16 +1068,20 @@ ...@@ -1068,16 +1068,20 @@
// 设置默认值false // 设置默认值false
$('input[name=check_failed]').val(0); $('input[name=check_failed]').val(0);
var check_failed_info = '';
// 检查商品单价 // 检查商品单价
$('.order-change-table').find('tbody tr').each(function(){ $('.order-change-table').find('tbody tr').each(function(){
var origin_price = parseFloat($(this).find('.price').data('origin')); var origin_price = parseFloat($(this).find('.price').data('origin'));
var price = parseFloat($(this).find('.price').val()) || 0; var price = parseFloat($(this).find('.price').val()) || 0;
var goods_name = $(this).children('td').eq(0).children('p').html();
origin_price = (origin_price * 0.8).toFixed(4);
limit_price = (origin_price * 0.8).toFixed(4);
// 若商品单价降价幅度小于或等于20%则赋值 // 若商品单价降价幅度小于或等于20%则赋值
if (price <= origin_price) { if (price <= limit_price) {
check_failed_info += '型号：'+goods_name+'，单价：'+origin_price+' -> '+price+' | ';
$('input[name=check_failed]').val(1); $('input[name=check_failed]').val(1);
$('input[name=check_failed_info]').val(check_failed_info);
} }
}); });
} }
......
resources/views/detail/changeOrder.blade.php
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<input type="hidden" name="cancel_reason" value="{{isset($order_info['cancle_reason']) ? $order_info['cancle_reason'] : ''}}"> <input type="hidden" name="cancel_reason" value="{{isset($order_info['cancle_reason']) ? $order_info['cancle_reason'] : ''}}">
<input type="hidden" name="user_mobile" value="{{$user_mobile}}"> <input type="hidden" name="user_mobile" value="{{$user_mobile}}">
<input type="hidden" name="check_failed" value=""> <input type="hidden" name="check_failed" value="">
<input type="hidden" name="check_failed_info" value="">
<!-- 审核 --> <!-- 审核 -->
<p>审核</p> <p>审核</p>
......
resources/views/detail/content.blade.php
...@@ -503,7 +503,7 @@ ...@@ -503,7 +503,7 @@
<p style="padding-left: 5px;">操作</p> <p style="padding-left: 5px;">操作</p>
<div class="tabs-box"> <div class="tabs-box">
<!-- 判断操作权限 --> <!-- 判断操作权限 -->
@if (($role == 1 || $role ==2) && $order_info['status'] == 1 && in_array('check_order', $userPerms)) @if ($order_info['status'] == 1 && in_array('check_order', $userPerms))
<a class="btn btn-success" href="{{URL('change', ['order_id'=>$order_info['order_id']])}}" class="btn btn-default">人工审单</a> <a class="btn btn-success" href="{{URL('change', ['order_id'=>$order_info['order_id']])}}" class="btn btn-default">人工审单</a>
@endif @endif
...@@ -524,7 +524,7 @@ ...@@ -524,7 +524,7 @@
<!-- <a href="{{URL('send', ['order_id'=>$order_info['order_id']])}}" class="btn btn-default">订单发货</a> --> <!-- <a href="{{URL('send', ['order_id'=>$order_info['order_id']])}}" class="btn btn-default">订单发货</a> -->
@endif @endif
@if ($order_info['status'] == 10 && in_array('send_invoice', $userPerms)) @if ($order_info['status'] == 10)
<a href="{{URL('invShipping', ['order_id'=>$order_info['order_id']])}}" class="btn btn-default">寄送发票</a> <a href="{{URL('invShipping', ['order_id'=>$order_info['order_id']])}}" class="btn btn-default">寄送发票</a>
@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