Merge branch 'dev' of https://github.com/trieyouth/basic into dcc

# Conflicts: # composer.lock 座位的添加
trieyouth · Dec 23, 2015 · b0f7037 · b0f7037
1 parent 346c8ee
commit b0f7037
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 7 deletions.
diff --git a/controllers/DishController.php b/controllers/DishController.php
@@ -24,7 +24,7 @@ public function actionAdd(){
 
         $dish = new Dish();
         $res = Yii::$app->request;
-        $dish->s_id = '1@qq.com';
+        $dish->s_id = Yii::$app->user->id;
         $dish->dish_name = $res->post('dish_name');
         $dish->price = $res->post('price');
         $dish->discount = $res->post('discount');
@@ -55,7 +55,6 @@ public function actionUpdate(){
 
         $id = Yii::$app->request->post('dish_id');
         $res = Yii::$app->request;
-        $dish = new Dish();
         $dish = Dish::findOne($id);
         $dish->dish_name = $res->post('dish_name');
         $dish->price = $res->post('price');

diff --git a/controllers/SeatController.php b/controllers/SeatController.php
@@ -19,21 +19,50 @@ class SeatController extends Controller{
      *
      */
     public function actionAdd(){
-
+        $seat = new Seat();
+        $res = Yii::$app->request;
+        //$seat->s_id = Yii::$app->user->id;
+        $seat->s_id = '1@qq.com';
+        $seat->id = $res->post('id');
+        $seat->count = $res->post('count');
+        $seat->statue = 0;
+        if($seat->validate()&&$seat->save()){
+            return 'success';
+        }else{
+            return 'fales';
+        }
     }
 
     /**
      *
      */
     public function actionDel(){
 
+        $id = Yii::$app->request->post('id');
+        $s_id = Yii::$app->user->id;
+        Seat::find()->where(['s_id'=>$s_id,'id'=>$id])->one()->delete();
     }
 
     /**
      *
      */
     public function actionUpdate(){
 
+        $id = Yii::$app->request->post('id');
+        $s_id = Yii::$app->user->id;
+        $res = Yii::$app->request;
+        $seat = Seat::find()->where(['s_id'=>$s_id,'id'=>$id])->one();
+        $seat->id = $res->post('id');
+        $seat->count = $res->post('count');
+        $seat->desc = $res->post('desc');
+        if ($seat === null) {
+            echo 'no data';
+            throw new NotFoundHttpException;
+        }
+        if ($seat->save()) {
+            echo 'success';
+            // 获取用户输入的数据，验证并保存
+        }
     }
 
 
@@ -42,5 +71,9 @@ public function actionUpdate(){
      */
     public function actionDisplay(){
 
+        $s_id = Yii::$app->user->id;
+        $dishes = Seat::find()->where(['s_id'=>$s_id])->all();
+        return json_encode($dishes);
     }
+
 }
diff --git a/models/Seat.php b/models/Seat.php
@@ -12,13 +12,28 @@
 
 class Seat extends ActiveRecord{
 
-    public function tableName(){
-        return 'seat';
-    }
 
     public function rule(){
         return [
-            [],
+            [['id','s_id','status','count'],'required'],
+            ['s_id','email'],
+            ['status','integer'],
+            ['count','integer'],
+            ['desc','string','max'=>200],
         ];
     }
+
+    /**
+     *检验是否有重复的位置
+     */
+    public function validateId(){
+         if(!$this->hasErrors()){
+            if(isset($this->id)){
+                $seat = $this->find()->where(['s_id'=>$this->s_id,'id'=>$this->id])->one();
+                if(isset($seat)){
+                    $this->addError('座位已存在');
+                }
+            }
+        }
+    }
 }