Commit 9b9e843d by 朱继来

添加操作记录

parent b6df2819
......@@ -152,6 +152,22 @@ function getCompanyName($user_id)
return false;
}
// 获取操作人名称
function getOperatorName($uid, $type)
{
if ($type == 1) {
$user = DB::connection('order')->table('lie_user_main')->where('user_id', $uid)->select('user_name')->first();
$name = !empty($user->user_name) ? $user->user_name : '客户';
} else {
$user = DB::table('user_info')->where('userId', $uid)->select('name')->first();
$name = isset($user->name) ? $user->name : '未知';
}
return $name;
}
Class OrderController extends Controller
{
// 首页
......@@ -698,6 +714,31 @@ Class OrderController extends Controller
return $tmp;
}
// 下载合同
public function ajaxDownloadContract(Request $request)
{
if ($request->isMethod('post')) {
$order_id = $request->input('order_id');
// 操作记录
$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();
$actionLog = DB::connection('order')->table('lie_order_action_log')->insert($log);
if (!$actionLog) return ['errcode'=>-1, 'errmsg'=>'添加操作记录失败'];
$apiUrl = Config('website.api_domain');
$k1 = time();
$k2 = md5(md5($k1).'fh6y5t4rr351d2c3bryi');
$downLoadUrl = $apiUrl.'contract/pdfinfo?id='.$order_id.'&k1='.$k1.'&k2='.$k2;
return ['errcode'=>0, 'errmsg'=>'', 'data'=>$downLoadUrl];
}
}
// 详情页
public function details(Request $request, $id)
{
......@@ -746,6 +787,7 @@ Class OrderController extends Controller
public function ajaxdeletegoods(Request $request)
{
$collert = $request->input();
$operator_id = $request->user->userId;
if(!$request->isMethod('post') OR !$collert['rec_id']){
return array('errcode'=>1,'errmsg'=>'错误操作');
......@@ -763,6 +805,7 @@ Class OrderController extends Controller
$resData = array(
"reason"=>$collert['reason'],
"rec_id"=>$collert['rec_id'],
'operator_id'=>$operator_id,
"pf"=>1,
"k1"=>$check['k1'],
"k2"=>$check['k2']
......@@ -818,6 +861,7 @@ Class OrderController extends Controller
"pay_time_limit" => $pay_time_limit,
"check_failed" => $request->input('check_failed', ''),
"order_id" => $order_id,
'operator_id' => $request->user->userId,
"pf" => 1,
"k1" => $check['k1'],
"k2" => $check['k2'],
......@@ -854,6 +898,7 @@ Class OrderController extends Controller
if ($request->isMethod('post')) {
$order_id = $request->input('order_id', '');
$sale_id = $request->input('sale_id', '');
$operator_id = $request->user->userId;
if (empty($order_id) || empty($sale_id))
return array('errcode'=>10003, 'errmsg'=>'参数不存在');
......@@ -866,6 +911,7 @@ Class OrderController extends Controller
$resData = array(
"order_id"=>$order_id,
"sale_id"=>$sale_id,
'operator_id'=>$operator_id,
"pf"=>1,
"k1"=>$check['k1'],
"k2"=>$check['k2']
......@@ -874,15 +920,6 @@ Class OrderController extends Controller
$temp = json_decode(curlApi($url, $resData, "POST"), true);
return array('errcode'=>$temp['err_code'],'errmsg'=>$temp['err_msg']);
// $update = DB::connection('order')->table('lie_order')->where('order_id', $order_id)->update(['sale_id' => $sale_id]);
// if (!$update) {
// return array('errcode'=>-1, 'errmsg'=>'推送失败');
// }
// return array('errcode'=>0, 'errmsg'=>'推送成功');
}
$info = $this->orderDetail($request, $id);
......@@ -1016,6 +1053,7 @@ Class OrderController extends Controller
if($request->isMethod('post')){
$order_id = $request->input('order_id', ''); //订单号
$sale_id = $request->input('sale_id', null); //对应销售
$operator_id = $request->user->userId;
$order_status = $request->input('order_status', ''); //审核通过 2 审核不通过(即取消订单) -1
$cancel_reason = $request->input('cancel_reason', '');
......@@ -1039,18 +1077,10 @@ Class OrderController extends Controller
$check['k1'] = time();
$check['k2'] = md5(md5($check['k1']).'fh6y5t4rr351d2c3bryi');
$resData = array("cancel_reason"=>$cancel_reason, "order_id"=>$order_id, 'sale_id'=>$sale_id, 'status'=>$order_status, "pf"=>1, "k1"=>$check['k1'], "k2"=>$check['k2']);
$resData = array("cancel_reason"=>$cancel_reason, "order_id"=>$order_id, 'sale_id'=>$sale_id, 'status'=>$order_status, "pf"=>1, "k1"=>$check['k1'], "k2"=>$check['k2'], 'operator_id'=>$operator_id);
$temp = json_decode(curlApi($url, $resData, "POST"), true);
if ($temp['err_code'] == 0) { // 成功
// 3.短信发送
// $user_mobile = $request->input('user_mobile', '');
// $content = '尊敬的客户,您好!您在猎芯网提交的订单('.$order_sn.')已经通过审核,请您及时登陆查看,留意最新的订单动态,祝您交易愉快,有任何疑问请联系官方客服:0755-88914841';
// $this->webpower_send_sms($user_mobile, $content);
}
return array('errcode'=>$temp['err_code'],'errmsg'=>$temp['err_msg']);
}
}
......@@ -1102,6 +1132,7 @@ Class OrderController extends Controller
if($request->isMethod('post')){
$order_id = $request->input('order_id');
$cancel_reason = $request->input('cancel_reason');
$operator_id = $request->user->userId;
if (!$order_id) {
return array('errcode'=>-1,'errmsg'=>'订单不存在~');
......@@ -1116,7 +1147,7 @@ Class OrderController extends Controller
$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);
$resData = array("pf"=>1, "k1"=>$check['k1'], "k2"=>$check['k2'], "order_id"=>$order_id, "cancel_reason"=>$cancel_reason, 'operator_id'=>$operator_id);
$temp = json_decode(curlApi($url,$resData,"POST"), true);
......@@ -1137,6 +1168,7 @@ Class OrderController extends Controller
$order_id = $request->input('order_id', '');
$cid = $request->input('cid', '');
$serial_number = $request->input('serial_number', '');
$operator_id = $request->user->userId;
// last_check 尾款确认
if (!$request->input('last_check', '')) {
......@@ -1145,6 +1177,7 @@ Class OrderController extends Controller
$data['order_id'] = $order_id;
$data['cid'] = $cid;
$data['serial_number'] = $serial_number;
$data['operator_id'] = $operator_id;
$data['k1'] = time();
$data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
......@@ -1190,6 +1223,7 @@ Class OrderController extends Controller
$data['k1'] = time();
$data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
$data['order_id'] = $request->input('order_id','');
$data['operator_id'] = $request->user->userId;
$update_url = Config('website.api_domain').'order/updateOrderAddress';
......@@ -1223,6 +1257,7 @@ Class OrderController extends Controller
$data['k1'] = time();
$data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
$data['id'] = $request->input('order_id','');
$data['operator_id'] = $request->user->userId;
$update_url = Config('website.api_domain').'order/updateOrderInvoice';
......@@ -1358,6 +1393,9 @@ Class OrderController extends Controller
$mobile = isset($temp['data']['order_info']['user_info']['mobile']) ? $temp['data']['order_info']['user_info']['mobile'] : '';
}
// 获取操作记录
$actionLog = DB::connection('order')->table('lie_order_action_log')->where('order_id', $id)->orderBy('create_time', 'DESC')->get();
$response = [
'user_mobile' => $mobile,
'order_info' => $temp['data']['order_info'],
......@@ -1371,6 +1409,7 @@ Class OrderController extends Controller
'order_pay_log' => $temp['data']['order_pay_log'],
'order_price_info' => $temp['data']['order_price_info'],
'order_temp_info' => $temp['data']['order_temp_info'],
'actionLog' => $actionLog,
];
$response = array_merge($response, $info);
......@@ -1391,6 +1430,15 @@ Class OrderController extends Controller
if (!$update) return ['errcode'=>-1, 'errmsg'=>'取消失败'];
// 操作记录
$log['order_id'] = $order_id;
$log['operator_id'] = $request->user->userId;
$log['operator_type'] = 2;
$log['event'] = '取消订单,取消原因:'.$request->input('reason');
$log['ip'] = get_client_ip();
$log['create_time'] = time();
$actionLog = DB::connection('order')->table('lie_order_action_log')->insert($log);
// 解锁库存
// $info = $this->orderDetail($request, $order_id);
// $sku = array();
......@@ -1427,6 +1475,7 @@ Class OrderController extends Controller
'shipping_type' => $shipping_type,
'shipping_no' => $request->input('express_no'),
'shipping_id' => $request->input('shipping_id'),
'operator_id' => $request->user->userId,
);
$temp = json_decode(curlApi($url, $resData, "POST"), true);
......@@ -1620,6 +1669,15 @@ Class OrderController extends Controller
return ['errcode'=>0, 'errmsg'=>'延长失败'];
}
// 操作记录
$log['order_id'] = $order_id;
$log['operator_id'] = $request->user->userId;
$log['operator_type'] = 2;
$log['event'] = '延长付款时间,截止到:'.date('Y-m-d H:i:s', $delay_time);
$log['ip'] = get_client_ip();
$log['create_time'] = time();
$actionLog = DB::connection('order')->table('lie_order_action_log')->insert($log);
return ['errcode'=>0, 'errmsg'=>'延长成功'];
}
......
......@@ -146,3 +146,40 @@
return $token;
}
/**
* 获取客户端IP地址
* @param integer $type 返回类型 0 返回IP地址 1 返回IPV4地址数字
* @param boolean $adv 是否进行高级模式获取(有可能被伪装)
* @return mixed
*/
function get_client_ip($type = 0, $adv = false)
{
$type = $type ? 1 : 0;
static $ip = null;
if (null !== $ip) {
return $ip[$type];
}
if ($adv) {
if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
$arr = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
$pos = array_search('unknown', $arr);
if (false !== $pos) {
unset($arr[$pos]);
}
$ip = trim($arr[0]);
} elseif (isset($_SERVER['HTTP_CLIENT_IP'])) {
$ip = $_SERVER['HTTP_CLIENT_IP'];
} elseif (isset($_SERVER['REMOTE_ADDR'])) {
$ip = $_SERVER['REMOTE_ADDR'];
}
} elseif (isset($_SERVER['REMOTE_ADDR'])) {
$ip = $_SERVER['REMOTE_ADDR'];
}
// IP地址合法验证
$long = sprintf("%u", ip2long($ip));
$ip = $long ? array($ip, $long) : array('0.0.0.0', 0);
return $ip[$type];
}
......@@ -72,6 +72,8 @@ Route::group(['middleware' => 'web'], function () {
Route::match(['get', 'post'], '/express_set', 'OrderController@expressSet');
Route::post('/ajaxDownloadContract', 'OrderController@ajaxDownloadContract');
});
// 不需要登陆态
......
......@@ -145,6 +145,29 @@
}
})
// 下载合同
$('.download-contract').click(function(){
var order_id = $(this).data('id');
$.ajax({
url: '/ajaxDownloadContract',
type: 'post',
data: {order_id:order_id},
dataType: 'json',
success: function(resp) {
if (resp.errcode != 0) {
layer.msg(resp.msg);
return false;
}
location.href = resp.data;
},
error: function(err) {
console.log(err)
}
})
})
// 切换类型时,清空输入框内容
$('.dropdown-menu>li').click(function(){
var val = $(this).data('val'); // 当前值
......
......@@ -558,7 +558,7 @@
@endif
<!-- 二期处理 -->
<!-- <p>操作记录</p>
<p>操作记录</p>
<div class="tabs-box">
<table class="table table-bordered table-hover log">
<thead>
......@@ -569,21 +569,20 @@
</tr>
</thead>
<tbody>
<php>$logs = json_decode($detail['operate_log'], true)</php>
<empty name="logs">
<tr><td colspan="20">没有操作记录</td></tr>
<else/>
<foreach name="logs" item="v">
<tr>
<td><p class="time">{$v.time|date="Y-m-d H:i:s", ###}</p></td>
<td><p class="uname">{$v.user}</p></td>
<td><p class="log">{$v.extra}</p></td>
</tr>
</foreach>
</empty>
@if (!empty($actionLog))
@foreach ($actionLog as $v)
<tr>
<td>{{date('Y-m-d H:i:s', $v->create_time)}}</td>
<td>{{App\Http\Controllers\getOperatorName($v->operator_id, $v->operator_type)}}</td>
<td>{{$v->event}}</td>
</tr>
@endforeach
@else
<tr><td colspan="3">无操作记录</td></tr>
@endif
</tbody>
</table>
</div> -->
</div>
</div>
<script>
......
......@@ -278,14 +278,11 @@
@endif
<?php
$apiUrl = Config('website.api_domain');
$k1 = time();
$k2 = md5(md5($k1).'fh6y5t4rr351d2c3bryi');
$downLoadUrl = $apiUrl.'contract/pdfinfo?id='.$v['order_id'].'&k1='.$k1.'&k2='.$k2;
?>
@if (in_array('download_contract', $userPerms))
<a class="btn btn-info" href="{{$downLoadUrl}}">下载合同</a>
<a class="btn btn-info download-contract" data-id="{{$v['order_id']}}" href="javascript:;">下载合同</a>
@endif
</div>
</td>
......
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