Browse Source

商品分类必填

sunhao 5 years ago
parent
commit
280a52a942

+ 11 - 4
app/Http/Controllers/Admin/GoodsController.php

88
      */
88
      */
89
     public function store(Request $request)
89
     public function store(Request $request)
90
     {       
90
     {       
91
+        $cateVali = '';
92
+        $goodsCategoryName = trim($request->input('goodsCategoryName'));
93
+        $goodsCategoryName2 = trim($request->input('goodsCategoryName2'));
94
+        if( empty($goodsCategoryName) && empty($goodsCategoryName2) ){
95
+            $cateVali = 'required';
96
+        }
97
+
91
         $this->validate($request, [  
98
         $this->validate($request, [  
92
             'name'           => 'required|unique:goods',   
99
             'name'           => 'required|unique:goods',   
93
             'productCode'           => 'required|unique:goods,productCode,1,is_del',     
100
             'productCode'           => 'required|unique:goods,productCode,1,is_del',     
94
             'sku'           => 'required',     
101
             'sku'           => 'required',     
95
-            //'goodsCategoryName'           => 'required',     
102
+            'goodsCategoryName2'           => $cateVali,     
96
         ], [                                                              
103
         ], [                                                              
97
             'name.required'           => '商品名不能为空',
104
             'name.required'           => '商品名不能为空',
98
             'name.unique'           => '该商品已存在',
105
             'name.unique'           => '该商品已存在',
99
             'productCode.required'           => '商品货号不能为空',          
106
             'productCode.required'           => '商品货号不能为空',          
100
             'productCode.unique'           => '该商品货号已经存在',          
107
             'productCode.unique'           => '该商品货号已经存在',          
101
-            'sku.required'    => '必须添加商品规格',          
108
+            'sku.required'    => '必须添加商品规格',    
109
+            'goodsCategoryName2.required' => '商品分类必填',     
102
         ]);
110
         ]);
111
+
103
         //数据库-新增数据
112
         //数据库-新增数据
104
         $goods = array();       
113
         $goods = array();       
105
         $goods['name'] = trim($request->input('name')); 
114
         $goods['name'] = trim($request->input('name')); 
106
         $goods['description'] = trim($request->input('description'));  //非必填
115
         $goods['description'] = trim($request->input('description'));  //非必填
107
         $goods['eshopCode'] = config('constants.ESHOP_CODE'); 
116
         $goods['eshopCode'] = config('constants.ESHOP_CODE'); 
108
         $goods['productCode'] = trim($request->input('productCode')); 
117
         $goods['productCode'] = trim($request->input('productCode')); 
109
-        $goodsCategoryName = trim($request->input('goodsCategoryName'));
110
-        $goodsCategoryName2 = trim($request->input('goodsCategoryName2'));
111
 
118
 
112
         DB::beginTransaction();
119
         DB::beginTransaction();
113
         try{
120
         try{

+ 2 - 2
app/Http/Controllers/Admin/OrderController.php

495
 
495
 
496
         //redis防重复数据
496
         //redis防重复数据
497
         $phone = $request->input('receiverMobile');
497
         $phone = $request->input('receiverMobile');
498
-        /*
498
+        
499
         $redisKey = 'seafood.order_phone_add.'.$phone;
499
         $redisKey = 'seafood.order_phone_add.'.$phone;
500
         $res = RedisModel::setnx($redisKey, 1);
500
         $res = RedisModel::setnx($redisKey, 1);
501
         if( $res == 0 ){
501
         if( $res == 0 ){
503
             return redirect('/admin/order/index')->with('info', $msg);
503
             return redirect('/admin/order/index')->with('info', $msg);
504
         }
504
         }
505
         $res = RedisModel::expire( $redisKey, 60 );
505
         $res = RedisModel::expire( $redisKey, 60 );
506
-*/
506
+
507
         $skus = $request->input('skus');
507
         $skus = $request->input('skus');
508
         $warehouse = (int)$request->input('warehouse');
508
         $warehouse = (int)$request->input('warehouse');
509
         if($warehouse == 3 && empty($skus)){
509
         if($warehouse == 3 && empty($skus)){