|
@@ -41,7 +41,7 @@ class GoodsController extends Controller
|
41
|
41
|
if($cate_name) $query->where('goodsCategoryName', '=', $cate_name);
|
42
|
42
|
if($stime) $query->where('createTime', '>=', $stime);
|
43
|
43
|
if($etime) $query->where('createTime', '<=', $etime);
|
44
|
|
- })->where('is_del',0)->count();
|
|
44
|
+ })->count();
|
45
|
45
|
if ($count > 1) {
|
46
|
46
|
// 总页数
|
47
|
47
|
$pages = ceil($count/$pageSize);
|
|
@@ -55,7 +55,7 @@ class GoodsController extends Controller
|
55
|
55
|
if($cate_name) $query->where('goodsCategoryName', '=', $cate_name);
|
56
|
56
|
if($stime) $query->where('createTime', '>=', $stime);
|
57
|
57
|
if($etime) $query->where('createTime', '<=', $etime);
|
58
|
|
- })->where('is_del',0)->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
|
|
58
|
+ })->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
|
59
|
59
|
$result = json_decode(json_encode($result),true);
|
60
|
60
|
|
61
|
61
|
foreach($result as $k=>&$v){
|
|
@@ -316,7 +316,7 @@ class GoodsController extends Controller
|
316
|
316
|
}
|
317
|
317
|
|
318
|
318
|
/**
|
319
|
|
- * 分组管理-进行删除操作
|
|
319
|
+ * 下架操作
|
320
|
320
|
* @param Request $request
|
321
|
321
|
* @return \Illuminate\Http\RedirectResponse
|
322
|
322
|
*/
|
|
@@ -328,7 +328,30 @@ class GoodsController extends Controller
|
328
|
328
|
#记录操作日志
|
329
|
329
|
$self_id = session('admin_id');
|
330
|
330
|
$self_name = session('real_name');
|
331
|
|
- $context = "删除商品";
|
|
331
|
+ $context = "下架商品";
|
|
332
|
+ $type = 0;
|
|
333
|
+ $tables = 'goods';
|
|
334
|
+ $data_id = $id;
|
|
335
|
+ Oplog::addLog($self_id, $self_name, $context, $type, $tables, $data_id);
|
|
336
|
+ exit('1');
|
|
337
|
+ }
|
|
338
|
+ exit('0');
|
|
339
|
+ }
|
|
340
|
+
|
|
341
|
+ /**
|
|
342
|
+ * 上架操作
|
|
343
|
+ * @param Request $request
|
|
344
|
+ * @return \Illuminate\Http\RedirectResponse
|
|
345
|
+ */
|
|
346
|
+ public function up($id)
|
|
347
|
+ {
|
|
348
|
+ $goods = Goods::find($id);
|
|
349
|
+ $goods->is_del = 0;
|
|
350
|
+ if ($goods ->save()){
|
|
351
|
+ #记录操作日志
|
|
352
|
+ $self_id = session('admin_id');
|
|
353
|
+ $self_name = session('real_name');
|
|
354
|
+ $context = "上架商品";
|
332
|
355
|
$type = 0;
|
333
|
356
|
$tables = 'goods';
|
334
|
357
|
$data_id = $id;
|
|
@@ -355,7 +378,7 @@ class GoodsController extends Controller
|
355
|
378
|
*/
|
356
|
379
|
public function skuList(Request $request){
|
357
|
380
|
$goods_id = $request->input('goods_id');
|
358
|
|
- $result = GoodsSkus::where('goodsCode', $goods_id)->where('is_del', 0)->orderBy('id', 'desc')->get();
|
|
381
|
+ $result = GoodsSkus::where('goodsCode', $goods_id)->orderBy('id', 'desc')->get();
|
359
|
382
|
return view('/goods/skulist', ['result'=>$result, 'goods_id' => $goods_id]);
|
360
|
383
|
}
|
361
|
384
|
|
|
@@ -530,7 +553,7 @@ class GoodsController extends Controller
|
530
|
553
|
}
|
531
|
554
|
|
532
|
555
|
/**
|
533
|
|
- * 进行删除操作
|
|
556
|
+ * 进行下架操作
|
534
|
557
|
* @param Request $request
|
535
|
558
|
* @return \Illuminate\Http\RedirectResponse
|
536
|
559
|
*/
|
|
@@ -542,7 +565,30 @@ class GoodsController extends Controller
|
542
|
565
|
#记录操作日志
|
543
|
566
|
$self_id = session('admin_id');
|
544
|
567
|
$self_name = session('real_name');
|
545
|
|
- $context = "删除sku";
|
|
568
|
+ $context = "下架sku";
|
|
569
|
+ $type = 0;
|
|
570
|
+ $tables = 'goods_skus';
|
|
571
|
+ $data_id = $id;
|
|
572
|
+ Oplog::addLog($self_id, $self_name, $context, $type, $tables, $data_id);
|
|
573
|
+ exit('1');
|
|
574
|
+ }
|
|
575
|
+ exit('0');
|
|
576
|
+ }
|
|
577
|
+
|
|
578
|
+ /**
|
|
579
|
+ * 进行上架操作
|
|
580
|
+ * @param Request $request
|
|
581
|
+ * @return \Illuminate\Http\RedirectResponse
|
|
582
|
+ */
|
|
583
|
+ public function skuUp($id)
|
|
584
|
+ {
|
|
585
|
+ $goods = GoodsSkus::find($id);
|
|
586
|
+ $goods->is_del = 0;
|
|
587
|
+ if ($goods ->save()){
|
|
588
|
+ #记录操作日志
|
|
589
|
+ $self_id = session('admin_id');
|
|
590
|
+ $self_name = session('real_name');
|
|
591
|
+ $context = "上架sku";
|
546
|
592
|
$type = 0;
|
547
|
593
|
$tables = 'goods_skus';
|
548
|
594
|
$data_id = $id;
|