Merge branch 'test' of 39.97.239.116:gyfl/apisongcan into test

application/index/controller/Cabinet.php

@@ -243,8 +243,9 @@ class Cabinet extends Base
         foreach($selectResult as $key=>$vo){
             $selectResult[$key]['status_text'] = $box_status[$vo['box_status']];
             if($vo['enter_time'] == null){
-                $selectResult[$key]['enter_time'] = '';
+                $selectResult[$key]['enter_time'] = $selectResult[$key]['use_time'] = '';
             }else{
+                $selectResult[$key]['use_time'] = $this->eliTime((time() - strtotime($vo['enter_time'])));
                 $selectResult[$key]['enter_time'] = date("m-d H:i",strtotime($vo['enter_time']));
             }
         }
@@ -289,7 +290,7 @@ class Cabinet extends Base
 
         $MsgModel = new MsgModel();
         $selectResult = $MsgModel->getMsgsByWhere($where , $offset, $limit);
-        $status = ['1' => '存入上报' , '2' => '取走上报'];
+        $status = ['1' => '存入上报' , '2' => '取走上报' , '3' => '通知用户'];
         // 拼装参数
         foreach($selectResult as $key=>$vo){
             $selectResult[$key]['status_text'] = $status[$vo['type']];
@@ -352,6 +353,25 @@ class Cabinet extends Base
         return $args;
     }
 
+    private function eliTime($seconds){
+        $msg = "";
+        if($seconds >= 86400){
+            $day = floor($seconds / 86400);
+            $remain = $seconds % 86400;
+            $msg = "{$day}天";
+        }
+        if($remain >= 3600){
+            $hour = floor($remain / 3600);
+            $remain = $remain % 3600;
+            $msg .= "{$hour}小时";
+        }
+        if($remain >= 60){
+            $minute = floor($remain / 60);
+            $msg .= "{$minute}分钟";
+        }
+        return $msg;
+    }
+
     private function getid(){
         return md5(rand(1000000,9999999));
     }

application/index/controller/Order.php

@@ -63,9 +63,15 @@ class Order extends Base
             $this->box_action_record($cabinet_number , $trunk , 1 , $order_sn , $alias);
             $msg = "{$alias}柜门{$trunk}箱门，密码信息{$code}";
             $result = request_post(self::base_url . '/deliver' , ['orderCode' => $order_sn,"boxMsg" => $msg]);
+            if($result == false){
+                json_error(3000);
+            }
+            if($result['code'] != 0){
+                json_return($result['code'] , [] , $result['message']);
+            }
             //todo 存储到消息记录表里面。
             $this->CreateMsg($cabinet_number,$trunk,$msg,$order_sn,1);
-            json_success();
+            json_success($result['data']);
         }
     }
 
@@ -108,11 +114,15 @@ class Order extends Base
         $OrderModel->editData(['order_sn' => $Box['order_sn']] , ['order_status' => 2 , 'out_time' => date("Y-m-d H:i:s")]);
         $order_sn = $Box['order_sn'];
         $result = request_post(self::base_url . '/receive' , ['orderCode' => $Box['order_sn']]);
+        $result = json_decode($result,true);
+        if($result['code'] != 0){
+            json_return($result['code'] , [] , $result['message']);
+        }
         //todo 存消息
         $msg = "{$cabinet['alias']}柜门{$trunk}箱门";
         $this->CreateMsg($cabinet_number,$trunk,$msg,$order_sn,2);
         $this->box_action_record($cabinet_number , $trunk , 2 , $cabinet ,$cabinet['alias']);
-        json_success();
+        json_success($result['data']);
     }
 
     public function OrderList(){
@@ -137,6 +147,33 @@ class Order extends Base
         json_success($return);
     }
 
+    public function SendMsg(){
+        $order_sn   = input('param.order_sn');
+        $box_number      = input('param.box_number');
+        $cabinet_number    = input('param.cabinet_number');
+        $box = BoxModel::where(['cabinet_number' => $cabinet_number , 'box_number' => $box_number , 'order_sn' => $order_sn])->find();
+        if(empty($box)){
+            json_error(2004);
+        }
+        $cabinet = CabinetModel::find($cabinet_number);
+        $alias = $cabinet['alias'];
+        $code = $box['fetch_code'];
+        $msg = "{$alias}柜门{$box_number}箱门，密码信息{$code}";
+        $postData['orderCode'] = $order_sn;
+        $postData['boxMsg'] = $msg;
+        $result = request_post(self::base_url . '/deliver' , $postData);
+        if($result == false){
+            json_error(3000);
+        }
+        $result = json_decode($result,true);
+        if($result['code'] != 0){
+            json_return($result['code'] , [] , $result['message']);
+        }
+        //todo 存储到消息记录表里面。
+        $this->CreateMsg($cabinet_number,$box_number,$msg,$order_sn,3);
+        json_success($result['data']);
+    }
+
     private function hasBox($cabinet_number , $box_number)
     {
         $BoxModel = new BoxModel();

route/route.php

@@ -28,6 +28,7 @@
         'BoxActionList'             => 'index/cabinet/BoxActionList',
         'ActionLogList'             => 'index/cabinet/ActionLogList',
         'OrderList'                 => 'index/order/OrderList',
+        'SendMsg'                   => 'index/order/SendMsg',
 
         'GetCabinetsBoxs'           => 'index/cabinet/GetCabinetsBoxs',
         'BoxChangeStatus'           => 'index/cabinet/BoxChangeStatus',