|
@@ -10,6 +10,7 @@ namespace App\Http\Controllers\Admin;
|
10
|
10
|
use App\Http\Controllers\Controller;
|
11
|
11
|
use App\Logs;
|
12
|
12
|
use App\Order;
|
|
13
|
+use App\Oplog;
|
13
|
14
|
use Illuminate\Http\Request;
|
14
|
15
|
use Illuminate\Support\Facades\DB;
|
15
|
16
|
|
|
@@ -55,8 +56,12 @@ class OrderController extends Controller
|
55
|
56
|
$etime = $request->input('etime');
|
56
|
57
|
$receiverName = trim($request->input('receiverName'));
|
57
|
58
|
$receiverMobile = trim($request->input('receiverMobile'));
|
|
59
|
+ $status = $request->input('status');
|
|
60
|
+ if($status === null){
|
|
61
|
+ $status = -1;
|
|
62
|
+ }
|
58
|
63
|
|
59
|
|
- $count = Order::where(function($query) use($admin_id, $stime, $etime, $receiverName, $receiverMobile, $self_role, $sale_ids){
|
|
64
|
+ $count = Order::where(function($query) use($admin_id, $stime, $etime, $receiverName, $receiverMobile, $self_role, $sale_ids, $status){
|
60
|
65
|
if($admin_id) $query->where('admin_id', $admin_id);
|
61
|
66
|
if($stime) $query->where('createTime', '>=', $stime);
|
62
|
67
|
if($etime) $query->where('createTime', '<=', $etime);
|
|
@@ -64,6 +69,7 @@ class OrderController extends Controller
|
64
|
69
|
if($receiverMobile) $query->where('receiverMobile', $receiverMobile);
|
65
|
70
|
if($self_role == '管理员') $query->where('status','>',0);
|
66
|
71
|
if(!empty($sale_ids)) $query->whereIn('admin_id', $sale_ids);
|
|
72
|
+ if(($status>=0)) $query->where('status', $status);
|
67
|
73
|
})->where('is_del',0)->count();
|
68
|
74
|
if ($count > 1) {
|
69
|
75
|
// 总页数
|
|
@@ -73,7 +79,7 @@ class OrderController extends Controller
|
73
|
79
|
$pages = 1;
|
74
|
80
|
}
|
75
|
81
|
|
76
|
|
- $result = Order::where(function($query) use($admin_id, $stime, $etime, $receiverName, $receiverMobile, $self_role, $sale_ids){
|
|
82
|
+ $result = Order::where(function($query) use($admin_id, $stime, $etime, $receiverName, $receiverMobile, $self_role, $sale_ids, $status){
|
77
|
83
|
if($admin_id) $query->where('admin_id', $admin_id);
|
78
|
84
|
if($stime) $query->where('createTime', '>=', $stime);
|
79
|
85
|
if($etime) $query->where('createTime', '<=', $etime);
|
|
@@ -81,6 +87,7 @@ class OrderController extends Controller
|
81
|
87
|
if($receiverMobile) $query->where('receiverMobile', $receiverMobile);
|
82
|
88
|
if($self_role == '管理员') $query->where('status','>',0);
|
83
|
89
|
if(!empty($sale_ids)) $query->whereIn('admin_id', $sale_ids);
|
|
90
|
+ if(($status>=0)) $query->where('status', $status);
|
84
|
91
|
})->where('is_del',0)->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
|
85
|
92
|
$result = json_decode(json_encode($result),true);
|
86
|
93
|
|
|
@@ -133,6 +140,7 @@ class OrderController extends Controller
|
133
|
140
|
'self_role' =>$self_role,
|
134
|
141
|
'receiverName' =>$receiverName,
|
135
|
142
|
'receiverMobile' =>$receiverMobile,
|
|
143
|
+ 'status' =>$status,
|
136
|
144
|
]);
|
137
|
145
|
}
|
138
|
146
|
|
|
@@ -257,7 +265,7 @@ class OrderController extends Controller
|
257
|
265
|
$order = array();
|
258
|
266
|
$order['eshopCode'] = '99|34881'; //默认
|
259
|
267
|
$order['outerCode'] = Order::createOuterCode();//随机生成
|
260
|
|
- //$order['status'] = '已审核待发货';
|
|
268
|
+ $order['status'] = (int)$request->input('status');
|
261
|
269
|
$order['customerName'] = $request->input('customerName'); //买家名称
|
262
|
270
|
$order['shippingType'] = '卖家包邮';
|
263
|
271
|
$order['expressCompanyCode'] = '10084';
|
|
@@ -365,7 +373,22 @@ class OrderController extends Controller
|
365
|
373
|
$order['admin_name'] = session('real_name');
|
366
|
374
|
$order['team_id'] = session('team_id');
|
367
|
375
|
}
|
368
|
|
- DB::table('order')->insert($order);
|
|
376
|
+ $res = DB::table('order')->insertGetId($order);
|
|
377
|
+ if($res){
|
|
378
|
+ #记录操作日志
|
|
379
|
+ $self_id = session('admin_id');
|
|
380
|
+ $self_name = session('real_name');
|
|
381
|
+ if($order['status'] == 0){
|
|
382
|
+ $status_text = '仅录入';
|
|
383
|
+ }else{
|
|
384
|
+ $status_text = '录入并提审';
|
|
385
|
+ }
|
|
386
|
+ $context = "录入订单:".$status_text;
|
|
387
|
+ $type = 0; //订单录入
|
|
388
|
+ $tables = 'order';
|
|
389
|
+ $data_id = $res;
|
|
390
|
+ Oplog::addLog($self_id, $self_name, $context, $type, $tables, $data_id);
|
|
391
|
+ }
|
369
|
392
|
|
370
|
393
|
return redirect('/admin/order/index')->with('info', '添加成功');
|
371
|
394
|
}
|
|
@@ -458,6 +481,7 @@ class OrderController extends Controller
|
458
|
481
|
if(!empty($request->input('createTime'))) $order['createTime'] = $request->input('createTime'); // 订单创建时间
|
459
|
482
|
$order['order_status'] = (int)$request->input('order_status');
|
460
|
483
|
$order['payment_type'] = (int)$request->input('payment_type'); //支付方式
|
|
484
|
+ $order['status'] = (int)$request->input('status');
|
461
|
485
|
|
462
|
486
|
$admin_id = (int)$request->input('admin_id');
|
463
|
487
|
if($admin_id>0){
|
|
@@ -468,7 +492,17 @@ class OrderController extends Controller
|
468
|
492
|
}
|
469
|
493
|
|
470
|
494
|
$id = (int)$request->input('id');
|
471
|
|
- $res = DB::table('order')->where('id', $id)->update($order);
|
|
495
|
+ $res = DB::table('order')->where('id', $id)->update($order);
|
|
496
|
+ if($res){
|
|
497
|
+ #记录操作日志
|
|
498
|
+ $self_id = session('admin_id');
|
|
499
|
+ $self_name = session('real_name');
|
|
500
|
+ $context = "修改订单";
|
|
501
|
+ $type = 0;
|
|
502
|
+ $tables = 'order';
|
|
503
|
+ $data_id = $id;
|
|
504
|
+ Oplog::addLog($self_id, $self_name, $context, $type, $tables, $data_id);
|
|
505
|
+ }
|
472
|
506
|
return redirect('/admin/order/index?'.$str_query)->with('info', '更新成功');
|
473
|
507
|
}
|
474
|
508
|
|
|
@@ -482,6 +516,14 @@ class OrderController extends Controller
|
482
|
516
|
$order = Order::find($id);
|
483
|
517
|
$order->is_del = 1;
|
484
|
518
|
if ($order ->save()){
|
|
519
|
+ #记录操作日志
|
|
520
|
+ $self_id = session('admin_id');
|
|
521
|
+ $self_name = session('real_name');
|
|
522
|
+ $context = "删除订单";
|
|
523
|
+ $type = 0;
|
|
524
|
+ $tables = 'order';
|
|
525
|
+ $data_id = $id;
|
|
526
|
+ Oplog::addLog($self_id, $self_name, $context, $type, $tables, $data_id);
|
485
|
527
|
return redirect('/admin/order/index')->with('info', '删除成功');
|
486
|
528
|
}
|
487
|
529
|
}
|
|
@@ -497,8 +539,31 @@ class OrderController extends Controller
|
497
|
539
|
|
498
|
540
|
public function setverify($id, Request $request){
|
499
|
541
|
$order = Order::find($id);
|
|
542
|
+ $old_status = $order->status;
|
500
|
543
|
$order->status = (int)$request->input('status');
|
501
|
|
- $order ->save();
|
|
544
|
+ if($order->status == 0){
|
|
545
|
+ $refuse_reason = trim($request->input('refuse_reason'));
|
|
546
|
+ if(!empty($refuse_reason)){
|
|
547
|
+ $order->refuse_reason = $refuse_reason;
|
|
548
|
+ }
|
|
549
|
+ }
|
|
550
|
+ $res = $order ->save();
|
|
551
|
+ if($res){
|
|
552
|
+ #记录操作日志
|
|
553
|
+ $status_arr = array(
|
|
554
|
+ 0 => '已录入(驳回)',
|
|
555
|
+ 1 => '待审核',
|
|
556
|
+ 2 => '已审核',
|
|
557
|
+ 3 => '已发货',
|
|
558
|
+ );
|
|
559
|
+ $self_id = session('admin_id');
|
|
560
|
+ $self_name = session('real_name');
|
|
561
|
+ $context = "订单状态变更:【".$status_arr[$old_status]."】变更为【". $status_arr[$order->status]."】({$old_status}->{$order->status})";
|
|
562
|
+ $type = 1; //状态变更
|
|
563
|
+ $tables = 'order';
|
|
564
|
+ $data_id = $id;
|
|
565
|
+ Oplog::addLog($self_id, $self_name, $context, $type, $tables, $data_id);
|
|
566
|
+ }
|
502
|
567
|
|
503
|
568
|
$stime = $request->input('stime');
|
504
|
569
|
$etime = $request->input('etime');
|
|
@@ -638,8 +703,9 @@ class OrderController extends Controller
|
638
|
703
|
$etime = $request->input('etime');
|
639
|
704
|
$receiverName = $request->input('receiverName');
|
640
|
705
|
$receiverMobile = $request->input('receiverMobile');
|
|
706
|
+ $status = (int)$request->input('status');
|
641
|
707
|
|
642
|
|
- $result = Order::where(function($query) use($admin_id, $stime, $etime, $warehouse, $receiverMobile, $receiverName, $self_role, $sale_ids){
|
|
708
|
+ $result = Order::where(function($query) use($admin_id, $stime, $etime, $warehouse, $receiverMobile, $receiverName, $self_role, $sale_ids, $status){
|
643
|
709
|
if($admin_id) $query->where('admin_id', $admin_id);
|
644
|
710
|
if($warehouse) $query->where('warehouse', $warehouse);
|
645
|
711
|
if($stime) $query->where('createTime', '>=', $stime);
|
|
@@ -648,6 +714,7 @@ class OrderController extends Controller
|
648
|
714
|
if($receiverMobile) $query->where('receiverMobile', $receiverMobile);
|
649
|
715
|
if($self_role == '管理员') $query->where('status','>',0);
|
650
|
716
|
if(!empty($sale_ids)) $query->whereIn('admin_id', $sale_ids);
|
|
717
|
+ if($status>=0) $query->where('status', $status);
|
651
|
718
|
})->where('is_del',0)->orderBy('id', 'desc')->get();
|
652
|
719
|
$result = json_decode(json_encode($result),true);
|
653
|
720
|
|
|
@@ -880,6 +947,15 @@ class OrderController extends Controller
|
880
|
947
|
$desc = '订单导入成功';
|
881
|
948
|
}
|
882
|
949
|
|
|
950
|
+ #记录操作日志
|
|
951
|
+ $self_id = session('admin_id');
|
|
952
|
+ $self_name = session('real_name');
|
|
953
|
+ $context = "仓管excel导入订单成本等信息 ".$desc;
|
|
954
|
+ $type = 0;
|
|
955
|
+ $tables = 'order';
|
|
956
|
+ $data_id = $okStr;
|
|
957
|
+ Oplog::addLog($self_id, $self_name, $context, $type, $tables, $data_id);
|
|
958
|
+
|
883
|
959
|
return redirect('admin/order/warehouse')->with('info',$desc);
|
884
|
960
|
|
885
|
961
|
|
|
@@ -952,7 +1028,6 @@ class OrderController extends Controller
|
952
|
1028
|
1 => ['status'=>1, 'name'=>'提交审核'],
|
953
|
1029
|
2 => ['status'=>2, 'name'=>'审核通过'],
|
954
|
1030
|
3 => ['status'=>3, 'name'=>'设为发货'],
|
955
|
|
- 10 => ['status'=>0, 'name'=>'审核驳回'],
|
956
|
1031
|
];
|
957
|
1032
|
$status = (int)$status;
|
958
|
1033
|
$result = array();
|
|
@@ -962,7 +1037,7 @@ class OrderController extends Controller
|
962
|
1037
|
break;
|
963
|
1038
|
case '1':
|
964
|
1039
|
$result[] = $status_arr[2];
|
965
|
|
- $result[] = $status_arr[10];
|
|
1040
|
+ $result[] = $status_arr[0];
|
966
|
1041
|
break;
|
967
|
1042
|
case '2':
|
968
|
1043
|
$result[] = $status_arr[3];
|