商品分类必填

app/Http/Controllers/Admin/GoodsController.php

@@ -88,26 +88,33 @@ class GoodsController extends Controller
      */
     public function store(Request $request)
     {       
+        $cateVali = '';
+        $goodsCategoryName = trim($request->input('goodsCategoryName'));
+        $goodsCategoryName2 = trim($request->input('goodsCategoryName2'));
+        if( empty($goodsCategoryName) && empty($goodsCategoryName2) ){
+            $cateVali = 'required';
+        }
+
         $this->validate($request, [  
             'name'           => 'required|unique:goods',   
             'productCode'           => 'required|unique:goods,productCode,1,is_del',     
             'sku'           => 'required',     
-            //'goodsCategoryName'           => 'required',     
+            'goodsCategoryName2'           => $cateVali,     
         ], [                                                              
             'name.required'           => '商品名不能为空',
             'name.unique'           => '该商品已存在',
             'productCode.required'           => '商品货号不能为空',          
             'productCode.unique'           => '该商品货号已经存在',          
-            'sku.required'    => '必须添加商品规格',          
+            'sku.required'    => '必须添加商品规格',    
+            'goodsCategoryName2.required' => '商品分类必填',     
         ]);
+
         //数据库-新增数据
         $goods = array();       
         $goods['name'] = trim($request->input('name')); 
         $goods['description'] = trim($request->input('description'));  //非必填
         $goods['eshopCode'] = config('constants.ESHOP_CODE'); 
         $goods['productCode'] = trim($request->input('productCode')); 
-        $goodsCategoryName = trim($request->input('goodsCategoryName'));
-        $goodsCategoryName2 = trim($request->input('goodsCategoryName2'));
 
         DB::beginTransaction();
         try{

app/Http/Controllers/Admin/OrderController.php

@@ -495,7 +495,7 @@ class OrderController extends Controller
 
         //redis防重复数据
         $phone = $request->input('receiverMobile');
-        /*
+        
         $redisKey = 'seafood.order_phone_add.'.$phone;
         $res = RedisModel::setnx($redisKey, 1);
         if( $res == 0 ){
@@ -503,7 +503,7 @@ class OrderController extends Controller
             return redirect('/admin/order/index')->with('info', $msg);
         }
         $res = RedisModel::expire( $redisKey, 60 );
-*/
+
         $skus = $request->input('skus');
         $warehouse = (int)$request->input('warehouse');
         if($warehouse == 3 && empty($skus)){