|
@@ -585,12 +585,10 @@ class CustomerDepositController extends Controller
|
585
|
585
|
public function editMonthGift(Request $request) {
|
586
|
586
|
$id = $request->input('id');
|
587
|
587
|
$gift = CustomerMonthGift::findOrFail($id);
|
588
|
|
- $goods = Goods::find($gift->goods_id);
|
589
|
|
- $sku = GoodsSkus::find($gift->sku_id);
|
|
588
|
+ $goods = Goods::select('gs.id as sku_id', 'goods.id as goods_id', 'goods.name', 'gs.propsName as props_name', 'gs.price', 'gs.is_weigh')->leftJoin('goods_skus as gs', 'gs.goodsCode', '=', 'goods.id')->where('gs.id', $gift->sku_id)->orderBy('goods.id', 'desc')->first();
|
590
|
589
|
return view('customer/customerGiftEdit',[
|
591
|
590
|
'info' => $gift,
|
592
|
|
- 'goods' => $goods,
|
593
|
|
- 'sku' => $sku,
|
|
591
|
+ 'good' => $goods,
|
594
|
592
|
]);
|
595
|
593
|
}
|
596
|
594
|
|
|
@@ -599,7 +597,6 @@ class CustomerDepositController extends Controller
|
599
|
597
|
* @param Request $request
|
600
|
598
|
*/
|
601
|
599
|
public function monthGiftStore(Request $request) {
|
602
|
|
- dd($request->all());
|
603
|
600
|
#数据校验
|
604
|
601
|
$this->validate( $request ,[
|
605
|
602
|
'mtime' => 'required',
|
|
@@ -609,16 +606,33 @@ class CustomerDepositController extends Controller
|
609
|
606
|
);
|
610
|
607
|
|
611
|
608
|
#数据处理
|
612
|
|
- $insert['type'] = $request->input('type');
|
613
|
|
- $insert['mtime'] = date('Y-m-01',strtotime($request->input('type')));
|
|
609
|
+ $type = $request->input('type');
|
|
610
|
+ $mtime = date('Y-m-01',strtotime($request->input('mtime')));
|
614
|
611
|
$skus = $request->input('skus');
|
615
|
|
- $insert['sku_id'] = $skus[0];
|
|
612
|
+ $sku_id = $skus[0];
|
|
613
|
+ $gnum = $request->input('gnum');
|
|
614
|
+ $num = $gnum[0];
|
|
615
|
+
|
616
|
616
|
//根据规格id反向查询商品goods_id
|
617
|
|
- $sku = GoodsSkus::find($insert['sku_id']);
|
|
617
|
+ $sku = GoodsSkus::find($sku_id);
|
|
618
|
+ $goods_id = $sku['goodsCode'];
|
618
|
619
|
|
619
|
620
|
#数据存储
|
|
621
|
+ $gift = new CustomerMonthGift();
|
|
622
|
+ $gift->mtime = $mtime;
|
|
623
|
+ $gift->goods_id = $goods_id;
|
|
624
|
+ $gift->sku_id = $sku_id;
|
|
625
|
+ $gift->type = $type;
|
|
626
|
+ $gift->num = $num;
|
|
627
|
+ $gift->create_time = date('Y-m-d H:i:s',time());
|
|
628
|
+ $res = $gift->save();
|
620
|
629
|
|
621
|
630
|
#结果返回
|
|
631
|
+ if($res){
|
|
632
|
+ return redirect('/admin/customer/giftList')->with('info','添加成功');
|
|
633
|
+ } else {
|
|
634
|
+ return back()->with('info','添加失败');
|
|
635
|
+ }
|
622
|
636
|
}
|
623
|
637
|
|
624
|
638
|
/**
|
|
@@ -626,7 +640,42 @@ class CustomerDepositController extends Controller
|
626
|
640
|
* @param Request $request
|
627
|
641
|
*/
|
628
|
642
|
public function monthGiftUpdate(Request $request) {
|
629
|
|
- //数据校验
|
|
643
|
+ #数据校验
|
|
644
|
+ $this->validate( $request ,[
|
|
645
|
+ 'mtime' => 'required',
|
|
646
|
+ ],[
|
|
647
|
+ 'mtime.required' => '日期必填',
|
|
648
|
+ ]
|
|
649
|
+ );
|
|
650
|
+
|
|
651
|
+ #数据处理
|
|
652
|
+ $type = $request->input('type');
|
|
653
|
+ $id = $request->input('id');
|
|
654
|
+ $mtime = date('Y-m-01',strtotime($request->input('mtime')));
|
|
655
|
+ $skus = $request->input('skus');
|
|
656
|
+ $sku_id = $skus[0];
|
|
657
|
+ $gnum = $request->input('gnum');
|
|
658
|
+ $num = $gnum[0];
|
|
659
|
+
|
|
660
|
+ //根据规格id反向查询商品goods_id
|
|
661
|
+ $sku = GoodsSkus::find($sku_id);
|
|
662
|
+ $goods_id = $sku['goodsCode'];
|
|
663
|
+
|
|
664
|
+ #数据存储
|
|
665
|
+ $gift = CustomerMonthGift::findOrFail($id);
|
|
666
|
+ $gift->mtime = $mtime;
|
|
667
|
+ $gift->goods_id = $goods_id;
|
|
668
|
+ $gift->sku_id = $sku_id;
|
|
669
|
+ $gift->type = $type;
|
|
670
|
+ $gift->num = $num;
|
|
671
|
+ $res = $gift->save();
|
|
672
|
+
|
|
673
|
+ #结果返回
|
|
674
|
+ if($res){
|
|
675
|
+ return redirect('/admin/customer/giftList')->with('info','修改成功');
|
|
676
|
+ } else {
|
|
677
|
+ return back()->with('info','修改失败');
|
|
678
|
+ }
|
630
|
679
|
}
|
631
|
680
|
|
632
|
681
|
}
|