|
@@ -22,6 +22,8 @@ class OrderController extends Controller
|
22
|
22
|
$page = 1;
|
23
|
23
|
}
|
24
|
24
|
|
|
25
|
+ $offset = ($page-1) * $pageSize;
|
|
26
|
+
|
25
|
27
|
$self_role = session('role_name');
|
26
|
28
|
if($self_role == '超级管理员' || $self_role == '团队主管'){
|
27
|
29
|
$admin_id = $request->input('admin_id');
|
|
@@ -51,7 +53,7 @@ class OrderController extends Controller
|
51
|
53
|
if($admin_id) $query->where('admin_id', $admin_id);
|
52
|
54
|
if($stime) $query->where('createTime', '>=', $stime);
|
53
|
55
|
if($etime) $query->where('createTime', '<=', $etime);
|
54
|
|
- })->where('is_del',0)->orderBy('id', 'desc')->get();
|
|
56
|
+ })->where('is_del',0)->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
|
55
|
57
|
$result = json_decode(json_encode($result),true);
|
56
|
58
|
|
57
|
59
|
foreach($result as $k=>&$v){
|
|
@@ -148,6 +150,7 @@ class OrderController extends Controller
|
148
|
150
|
if($request->input('cost')) $order['cost'] = $request->input('cost'); //成本
|
149
|
151
|
$order['logistics_id'] = $request->input('logistics_id'); //物流单号
|
150
|
152
|
$order['is_refund'] = (int)$request->input('is_refund'); //是否退过单
|
|
153
|
+ $order['is_fugou'] = (int)$request->input('is_fugou'); //是否复购
|
151
|
154
|
|
152
|
155
|
//商品信息
|
153
|
156
|
/*
|
|
@@ -200,6 +203,7 @@ class OrderController extends Controller
|
200
|
203
|
}else{
|
201
|
204
|
$customers['phone'] = $order['receiverMobile'];
|
202
|
205
|
$customers['fanTime'] = $request->input('fanTime');
|
|
206
|
+ $customers['is_fugou'] = $order['is_fugou'];
|
203
|
207
|
$in_c = DB::table('customers')->insert($customers);
|
204
|
208
|
}
|
205
|
209
|
|
|
@@ -207,7 +211,7 @@ class OrderController extends Controller
|
207
|
211
|
//unset($order['skuList']);
|
208
|
212
|
//DB::table('order_goods')->insert($order_goods);
|
209
|
213
|
//$order['orderCode'] = $mj_add['order']['code'];
|
210
|
|
- $admin_id = (int)$request->input('admin_id');
|
|
214
|
+ $admin_id = (int)$request->input('admin_id');
|
211
|
215
|
if($admin_id>0){
|
212
|
216
|
$admin_info = DB::table('admin')->select('realname', 'team_id')->where('id', $admin_id)->first();
|
213
|
217
|
$order['admin_id'] = $admin_id;
|
|
@@ -288,6 +292,7 @@ class OrderController extends Controller
|
288
|
292
|
if($request->input('cost')) $order['cost'] = $request->input('cost'); //成本
|
289
|
293
|
$order['logistics_id'] = $request->input('logistics_id'); //物流单号
|
290
|
294
|
$order['is_refund'] = (int)$request->input('is_refund'); //是否退过单
|
|
295
|
+ $order['is_fugou'] = (int)$request->input('is_fugou'); //是否复购
|
291
|
296
|
|
292
|
297
|
$admin_id = (int)$request->input('admin_id');
|
293
|
298
|
if($admin_id>0){
|
|
@@ -492,5 +497,7 @@ class OrderController extends Controller
|
492
|
497
|
echo $data_str;
|
493
|
498
|
exit;
|
494
|
499
|
}
|
|
500
|
+
|
|
501
|
+
|
495
|
502
|
}
|
496
|
503
|
|