najixian / xt_dc_admin · Commits

Go to a project

Commit dcc0c993ac0ae285983212fc1184f3ab23048c8e

Authored by teemitop
1 parent cb524807
build: skipped

日志增加订单记录

Inline Side-by-side
Showing 4 changed files with 164 additions and 32 deletions
@@ -155,7 +155,7 @@ class System extends Common @@ -155,7 +155,7 @@ class System extends Common
155 $log_info[$key]['old'] = '<a href=/admin/system/detail?id='.$value["id"].'&tag=1 target="_blank" style="color:blue;">查看详情</a>'; 155 $log_info[$key]['old'] = '<a href=/admin/system/detail?id='.$value["id"].'&tag=1 target="_blank" style="color:blue;">查看详情</a>';
156 $log_info[$key]['new'] = '<a href=/admin/system/detail?id='.$value["id"].'&tag=1 target="_blank"style="color:blue;">查看详情</a>'; 156 $log_info[$key]['new'] = '<a href=/admin/system/detail?id='.$value["id"].'&tag=1 target="_blank"style="color:blue;">查看详情</a>';
157 }else if($value['comment']){ 157 }else if($value['comment']){
158 - 158 + //
159 }else{ 159 }else{
160 $log_info[$key]['field'] = lang('log')['edi_rid']; 160 $log_info[$key]['field'] = lang('log')['edi_rid'];
161 $log_info[$key]['old'] = '<a href=/admin/system/differ?id='.$value["id"].' target="_blank"style="color:blue;">查看详情</a>'; 161 $log_info[$key]['old'] = '<a href=/admin/system/differ?id='.$value["id"].' target="_blank"style="color:blue;">查看详情</a>';
@@ -245,8 +245,8 @@ class System extends Common @@ -245,8 +245,8 @@ class System extends Common
245 public function detail(){ 245 public function detail(){
246 $data = Request::except('file'); 246 $data = Request::except('file');
247 if($data['id']){ 247 if($data['id']){
248 -  
249 - $where_id = $data['tag']==2 ? ' a.sid = '.$data['id'] : ' a.id = '.$data['id']; 248 + //tag = 1 订单详情 = 2 商家信息
  249 + $where_id = $data['tag']==2 ? ' a.sid = '.$data['id'].' and a.rid = 0' : ' a.id = '.$data['id'];
250 250
251 $log_info = Db::query("SELECT 251 $log_info = Db::query("SELECT
252 a.*, 252 a.*,
@@ -262,7 +262,7 @@ class System extends Common @@ -262,7 +262,7 @@ class System extends Common
262 WHERE 262 WHERE
263 ".$where_id); 263 ".$where_id);
264 $log_info = $log_info[0]; 264 $log_info = $log_info[0];
265 - if($log_info['comment']){ 265 + if($log_info['comment'] && $data['tag']!=2){
266 $log_info['comment'] = json_decode($log_info['comment'],true); 266 $log_info['comment'] = json_decode($log_info['comment'],true);
267 if($log_info['comment']['row']['tableinfo']){ 267 if($log_info['comment']['row']['tableinfo']){
268 $log_info['comment']['row']['tableinfo'] = json_decode($log_info['comment']['row']['tableinfo'],true); 268 $log_info['comment']['row']['tableinfo'] = json_decode($log_info['comment']['row']['tableinfo'],true);
@@ -302,15 +302,82 @@ class System extends Common @@ -302,15 +302,82 @@ class System extends Common
302 $log_info['action'] = lang('log')[$log_info['action']][1]; 302 $log_info['action'] = lang('log')[$log_info['action']][1];
303 } 303 }
304 } 304 }
305 - $log_info['rname'] = $log_info['comment']['row']['rname'] ? $log_info['comment']['row']['rname'] : '';  
306 - $log_info['sex'] = $log_info['comment']['row']['sex']==1 ? '先生' : ($log_info['comment']['row']['sex']==2 ? '女士' : '公司');  
307 - $log_info['phone'] = $log_info['comment']['row']['phone'] ? $log_info['comment']['row']['phone'] : '';  
308 - $log_info['cusman'] = $log_info['comment']['row']['cusman'] ? $log_info['comment']['row']['cusman'] : '';  
309 - $log_info['ddate'] = $log_info['comment']['row']['ddate'] ? date("Y-m-d H:i:s",$log_info['comment']['row']['ddate']) : '';  
310 - $log_info['status'] = lang('log')[$log_info['comment']['row']['status']];  
311 - $log_info['ddate_solt'] = $log_info['comment']['row']['ddate_solt'] ? $log_info['comment']['row']['ddate_solt'] : '';  
312 - $log_info['is_set_ddate'] = $log_info['comment']['row']['is_set_ddate'] ==1 ? '是' : '否'; 305 + if($data['tag']!=2){
  306 + $log_info['rname'] = $log_info['comment']['row']['rname'] ? $log_info['comment']['row']['rname'] : '';
  307 + $log_info['sex'] = $log_info['comment']['row']['sex']==1 ? '先生' : ($log_info['comment']['row']['sex']==2 ? '女士' : '公司');
  308 + $log_info['phone'] = $log_info['comment']['row']['phone'] ? $log_info['comment']['row']['phone'] : '';
  309 + $log_info['cusman'] = $log_info['comment']['row']['cusman'] ? $log_info['comment']['row']['cusman'] : '';
  310 + $log_info['ddate'] = $log_info['comment']['row']['ddate'] ? date("Y-m-d H:i:s",$log_info['comment']['row']['ddate']) : '';
  311 + $log_info['status'] = lang('log')[$log_info['comment']['row']['status']];
  312 + $log_info['ddate_solt'] = $log_info['comment']['row']['ddate_solt'] ? $log_info['comment']['row']['ddate_solt'] : '';
  313 + $log_info['is_set_ddate'] = $log_info['comment']['row']['is_set_ddate'] ==1 ? '是' : '否';
  314 + }
  315 +
313 316
  317 + /**
  318 + * 订单的一生 && 商家管理
  319 + */
  320 + $where_id = $data['tag']==2 ? ' a.sid = '.$log_info['sid'].' and rid = 0' : ' a.rid = '.$log_info['rid'];
  321 + if($where_id){
  322 + $order_detail = Db::query("SELECT
  323 + a.*,
  324 + h.field,
  325 + h.old,
  326 + h.new,
  327 + h.differ
  328 + FROM
  329 + `xt-member-two-LINE`.xt_dc_dz_log_action AS a
  330 + LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_log_history AS h ON a.id = h.aid
  331 + WHERE
  332 + $where_id
  333 + ORDER BY a.id desc");
  334 + foreach ($order_detail as $key => $value) {
  335 + if(array_key_exists($value['action'],lang('log'))){
  336 + $order_detail[$key]['action'] = lang('log')[$value['action']];
  337 + switch ($value['device']) {
  338 + case '1':
  339 + $order_detail[$key]['device'] = '小程序(C端)';
  340 + break;
  341 + case '2':
  342 + $order_detail[$key]['device'] = '小程序(B端)';
  343 + break;
  344 + case '3':
  345 + $order_detail[$key]['device'] = '铱方';
  346 + break;
  347 + case '4':
  348 + $order_detail[$key]['device'] = '极钛';
  349 + break;
  350 + case '5':
  351 + $order_detail[$key]['device'] = '酷比';
  352 + break;
  353 + case '6':
  354 + $order_detail[$key]['device'] = '华为';
  355 + break;
  356 + default:
  357 + # code...
  358 + break;
  359 + }
  360 + if($data['tag']!=2){
  361 + $order_detail[$key]['field'] = lang('log')[$value['field']];
  362 + $order_detail[$key]['old'] = lang('log')[$value['old']];
  363 + $order_detail[$key]['new'] = lang('log')[$value['new']];
  364 + }
  365 +
  366 + }
  367 + if(array_key_exists($value['action'],lang('log'))){
  368 + if($data['tag']==1){
  369 + $order_detail[$key]['action'] = lang('log')[$value['action']][0];
  370 + }else if($data['tag']==2){
  371 + $order_detail[$key]['action'] = lang('log')[$value['action']];
  372 + }else if($data['tag']!=1 && $value['action']==lang('log')[$value['action']]){
  373 + $order_detail[$key]['action'] = lang('log')[$value['action']];
  374 + }else{
  375 + $order_detail[$key]['action'] = lang('log')[$value['action']][1];
  376 + }
  377 + }
  378 + }
  379 + $log_info['order_detail'] = $order_detail;
  380 + }
314 } 381 }
315 $this->assign('html', $log_info); 382 $this->assign('html', $log_info);
316 return $this->fetch(); 383 return $this->fetch();
@@ -8,22 +8,23 @@ return [ @@ -8,22 +8,23 @@ return [
8 'add_rid' => '新增预定', 8 'add_rid' => '新增预定',
9 'edi_rid' => '修改预定', 9 'edi_rid' => '修改预定',
10 'seller' => '商家管理', 10 'seller' => '商家管理',
11 - 'App.Customer.SetReserveInfo' => '录入了一笔订单',  
12 - 'App.Customer.SetReserveInfoById' => '修改了一笔订单', 11 + 'App.Customer.SetReserveInfo' => array('录入了订单'),
  12 + 'App.Customer.SetReserveInfoById' => '修改了订单',
13 'App.Customer.SetDdate' => '设置了到店时间', 13 'App.Customer.SetDdate' => '设置了到店时间',
14 'App.Customer.SetReserveStatus' => '设置了预定状态', 14 'App.Customer.SetReserveStatus' => '设置了预定状态',
15 - 'App.Reserve.NewExportReserve' => '导出了一份预定',  
16 - 'App.Reserve.NewSetReserveInfo' => '录入了一笔订单',  
17 - 'App.Reserve.NewSetReserveInfo' => '修改了一笔订单', 15 + 'App.Reserve.NewExportReserve' => '导出了预定',
  16 + 'App.Reserve.NewSetReserveInfo' => '录入了订单',
  17 + 'App.Reserve.NewSetReserveInfo' => '修改了订单',
18 'App.Reserve.SetReserveCusman' => '设置了客户经理', 18 'App.Reserve.SetReserveCusman' => '设置了客户经理',
19 'App.Reserve.SetReserveStatus' => '设置了预定状态', 19 'App.Reserve.SetReserveStatus' => '设置了预定状态',
20 'App.Reserve.UpdateAction' => '回访了短信', 20 'App.Reserve.UpdateAction' => '回访了短信',
21 - 'App.Seller.AddSeller' => '添加了一个商家',  
22 - 'App.Seller.setSellerById' => '修改了商家信息', 21 + 'App.Seller.AddSeller' => '添加了商家',
  22 + 'App.Seller.SetSellerById' => '修改了商家信息',
23 'App.Seller.InSterAuthUser' => '移交了店铺', 23 'App.Seller.InSterAuthUser' => '移交了店铺',
24 - 'Android.Customer.SetReserveInfo' => '修改了一笔订单', 24 + 'Android.Customer.SetReserveInfo' => '修改了订单',
25 'Android.Customer.SetReserveStatus' => '设置了预定状态', 25 'Android.Customer.SetReserveStatus' => '设置了预定状态',
26 - 'Android.Reserve.SetReserveInfo' => array('录入了一笔订单','修改了一笔订单'), 26 + 'Android.Reserve.SetReserveInfo' => array('录入了订单','修改了订单'),
  27 + 'Android.Reserve.SetReserveCusman' => array('设置了客户经理'),
27 'Android.Reserve.SetReserveStatus' => '设置了预定状态', 28 'Android.Reserve.SetReserveStatus' => '设置了预定状态',
28 'Android.Reserve.UpdateAction' => '回访了短信', 29 'Android.Reserve.UpdateAction' => '回访了短信',
29 '0' => '待确认', 30 '0' => '待确认',
@@ -48,7 +49,28 @@ return [ @@ -48,7 +49,28 @@ return [
48 'ddate_solt' => '用餐时段', 49 'ddate_solt' => '用餐时段',
49 'room_demand'=> '包间ID', 50 'room_demand'=> '包间ID',
50 'openid' => '用户openid', 51 'openid' => '用户openid',
  52 + 'cause' => '取消ID',
  53 +
  54 + 'cause' => '取消ID',
  55 + 'channel' => '取消ID',
  56 + 'id' => '取消ID',
  57 + 'is_set_ddate' => '取消ID',
  58 + 'note_name' => '取消ID',
  59 + 'note_openid' => '取消ID',
  60 + 'openid' => '取消ID',
  61 + 'operator_openid' => '取消ID',
  62 + 'orderid' => '取消ID',
  63 + 'rname' => '取消ID',
  64 + 'room_demand' => '取消ID',
  65 + 'cause' => '取消ID',
  66 +
51 ), 67 ),
  68 + 'order_detail' => '订单详情',
  69 + 'seller_detail' => '商家信息',
  70 + 'after' => '变更后',
  71 + 'befoer' => '变更前',
  72 + 'order_line' =>'订单的一生',
  73 +
52 'edited' => '编辑了', 74 'edited' => '编辑了',
53 'deled' => '删除了', 75 'deled' => '删除了',
54 'added' => '添加了', 76 'added' => '添加了',
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 <div class="admin-main layui-anim layui-anim-upbit"> 2 <div class="admin-main layui-anim layui-anim-upbit">
3 <title>纳极科技 - 变更详情</title> 3 <title>纳极科技 - 变更详情</title>
4 <div class="header"> 4 <div class="header">
5 - <h1>订单详情</h1>  
6 - <h3>{:lang('caozuoren')}:{$html.nickname} {$html.action} | {:lang('caozuotime')}:{$html.cdate}</h3> 5 + <h1> {if $html.rid}{:lang('order_detail')}{else}{:lang('seller_detail')}{/if}</h1>
  6 + <h3></h3>
7 </div> 7 </div>
8 <div class="table-responsive"> 8 <div class="table-responsive">
9 <table class="layui-table" lay-even lay-skin="line"> 9 <table class="layui-table" lay-even lay-skin="line">
@@ -22,8 +22,10 @@ @@ -22,8 +22,10 @@
22 <td>{$html.sid}</td> 22 <td>{$html.sid}</td>
23 </tr> 23 </tr>
24 <tr> 24 <tr>
25 - <td>预定编号</td>  
26 - <td>{$html.rid}</td> 25 + {if $html.rid}
  26 + <td>预定编号</td>
  27 + <td>{$html.rid}</td>
  28 + {/if}
27 </tr> 29 </tr>
28 <tr> 30 <tr>
29 <td>操作人昵称</td> 31 <td>操作人昵称</td>
@@ -37,9 +39,10 @@ @@ -37,9 +39,10 @@
37 <td>操作设备</td> 39 <td>操作设备</td>
38 <td>{$html.device}</td> 40 <td>{$html.device}</td>
39 </tr> 41 </tr>
40 - <tr>  
41 - <td>预定人</td>  
42 - <td>{$html.rname}{$html.sex}</td> 42 + {if $html.rid}
  43 + <td>预定人</td>
  44 + <td>{$html.rname}{$html.sex}</td>
  45 + {/if}
43 </tr> 46 </tr>
44 <tr> 47 <tr>
45 <td>电话</td> 48 <td>电话</td>
@@ -47,8 +50,48 @@ @@ -47,8 +50,48 @@
47 </tr> 50 </tr>
48 </tbody> 51 </tbody>
49 </table> 52 </table>
50 - 订单的一生：  
51 - xxxxx.. 53 + {if $html.rid neq 0}
  54 + <div class="layui-tab">
  55 + <ul class="layui-tab-title">
  56 + <li class="layui-this">{:lang('order_line')}</li>
  57 + </ul>
  58 + </div>
  59 + <div class="layui-tab-content">
  60 + {volist name="html.order_detail" id="vo" key="i"}
  61 + <div class="layui-tab-item layui-show">{$vo.cdate} {$vo.nickname} 在{$vo.device} 设备上 {$vo.action}
  62 + {if $vo.field eq '' && $vo.comment eq ''}
  63 + <a href="/admin/system/differ?id={$vo.id}" target="_blank" style="color:blue;">
  64 + 点击查看
  65 + </a>
  66 + {elseif $vo.field && $vo.comment eq ''}
  67 + <span style="color:red;"> 变更字段 <b>{$vo.field}</b> {:lang('befoer')} <b>{$vo.old}</b> {:lang('after')} <b>{$vo.new}</b></span>
  68 + {else}
  69 + {/if}
  70 + </div>
  71 + {/volist}
  72 + </div>
  73 + {else}
  74 + <div class="layui-tab">
  75 + <ul class="layui-tab-title">
  76 + <li class="layui-this">{:lang('seller_detail')}</li>
  77 + </ul>
  78 + </div>
  79 + <div class="layui-tab-content">
  80 + {volist name="html.order_detail" id="vo" key="i"}
  81 + <div class="layui-tab-item layui-show">{$vo.cdate} {$vo.nickname} 在{$vo.device} 设备上 {$vo.action}
  82 + {if $vo.field eq '' && $vo.old neq ''}
  83 + <a href="/admin/system/differ?id={$vo.id}" target="_blank" style="color:blue;">
  84 + 点击查看
  85 + </a>
  86 + {elseif $vo.field && $vo.comment eq ''}
  87 + <span style="color:red;"> 变更字段 <b>{$vo.field}</b> {:lang('befoer')} <b>{$vo.old}</b> {:lang('after')} <b>{$vo.new}</b></span>
  88 + {else}
  89 +
  90 + {/if}
  91 + </div>
  92 + {/volist}
  93 + </div>
  94 + {/if}
52 </div> 95 </div>
53 </div> 96 </div>
54 {include file="common/foot"/} 97 {include file="common/foot"/}
@@ -4,11 +4,11 @@ @@ -4,11 +4,11 @@
4 <legend>{:$title}</legend> 4 <legend>{:$title}</legend>
5 </fieldset> 5 </fieldset>
6 <div class="demoTable"> 6 <div class="demoTable">
7 - 商家： 7 + 商家名称：
8 <div class="layui-input-inline"> 8 <div class="layui-input-inline">
9 <input class="layui-input" name="key" id="key" placeholder="{:lang('pleaseEnter')}店铺名称" autocomplete="off"> 9 <input class="layui-input" name="key" id="key" placeholder="{:lang('pleaseEnter')}店铺名称" autocomplete="off">
10 </div> 10 </div>
11 - 昵称： 11 + 变更人：
12 <div class="layui-input-inline"> 12 <div class="layui-input-inline">
13 <input class="layui-input" name="key" id="nickname" placeholder="{:lang('pleaseEnter')}用户昵称或者账号" autocomplete="off"> 13 <input class="layui-input" name="key" id="nickname" placeholder="{:lang('pleaseEnter')}用户昵称或者账号" autocomplete="off">
14 </div> 14 </div>