Merge branch 'master' of 39.97.239.116:gyfl/apisongcan

application/index/controller/Cabinet.php

@@ -73,6 +73,20 @@ class Cabinet extends Base
             json_success([]);
         }
     }
+    public function DelCabinet(){
+        $id = input('param.id');
+        $cabinet = $this->get_cabinet($id);
+        if(empty($cabinet)){
+            return json(json_error_exception(1008));
+        }
+        $CabinetModel = new CabinetModel();
+        $ret = $CabinetModel->DelCabinetBox($id);
+        if($ret == false){
+            return json(json_error_exception(1006));
+        }else{
+            json_success([]);
+        }
+    }
 
     public function OpenBox()
     {

application/index/controller/Order.php

@@ -22,7 +22,7 @@ class Order extends Base
         //商网接口
         $postData['orderCode'] = $order_sn;
         $OrderModel = new OrderModel();
-        $order = $OrderModel->checkOrder();
+        $order = $OrderModel->checkOrder($order_sn);
         if(empty($order_sn)){
             json_error(2006);
         }

application/index/model/CabinetModel.php

@@ -71,4 +71,28 @@ class CabinetModel extends Model{
         return $this->count();
     }
 
+    public function DelCabinetBox($cabinet_number){
+        try {
+            $this->startTrans();
+            $ret = $this->where('id' , $cabinet_number)->delete($cabinet_number);
+            if(false === $ret){
+                $this->rollback();
+                return msg(-1, '', $this->getError());
+            }else{
+                $BoxModel = new BoxModel();
+                $ret = $BoxModel->where('cabinet_number' , $cabinet_number)->delete();
+                if(false === $ret){
+                    $this->rollback();
+                    return msg(-1, '', $this->getError());
+                }else{
+                    $this->commit();
+                    return msg(1, '', '删除成功');
+                }
+            }
+        }catch(PDOException $e){
+            $this->rollback();
+            return msg(-2, '', $e->getMessage());
+        }
+    }
+
 }

route/route.php

@@ -8,6 +8,7 @@
         'EditPwd'                   => 'index/user/EditPwd',
 
         'AddCabinet'                => 'index/cabinet/AddCabinet',
+        'DelCabinet'                => 'index/cabinet/DelCabinet',
         'AddBox'                    => 'index/cabinet/AddBox',
 
         'OpenBox'                   => 'index/cabinet/OpenBox',