订单和预约单核销码调整

application/api/controller/Order.php

@@ -28,7 +28,7 @@ class Order extends Api
 
             $o = 'order';
             $st = 'servicetype';
-            $field = $o.'.id,orderno,server_info,server_images,status,user_mobile,'.$o.'.user_car_number,'.
+            $field = $o.'.id,orderno,server_time,server_info,server_images,status,user_mobile,'.$o.'.user_car_number,'.
                 $o.'.createtime,cancel_time,cancel_reason,pay_fee,appen_fee,finish_time,'.$st.'.title as `service_title`,paytype';
             $where[$o.'.user_id'] = $this->auth->id;
             $where[$o.'.company_id'] = $this->auth->company_id;
@@ -41,7 +41,7 @@ class Order extends Api
             if (!empty($result)) {
                 $statusArr  = [2=>'待处理',3=>'已完成',4=>'已取消'];
                 $paytypeArr = [1=>'线下',2=>'余额',3=>'微信'];
-                $timeArr = ['createtime','cancel_time','finish_time'];
+                $timeArr = ['createtime','cancel_time','finish_time','server_time'];
                 foreach ($result as $key => &$value) {
                     foreach ($timeArr as $k => $v) {
                         $value[$v] = !empty($value[$v]) ? date('Y年m月d日 H:i:s', $value[$v]) : '';
@@ -121,7 +121,7 @@ class Order extends Api
             $st = 'servicetype';
             $where[$o.'.user_id'] = $this->auth->id;
             $where[$o.'.id'] = $id;
-            $field = $o.'.id,orderno,server_info,server_images,status,user_mobile,'.$o.'.user_car_number,'.
+            $field = $o.'.id,orderno,server_time,server_info,server_images,status,user_mobile,'.$o.'.user_car_number,'.
                 $o.'.createtime,cancel_time,cancel_reason,pay_fee,appen_fee,finish_time,'.$st.'.title as `service_title`,paytype';
             $result = $this->model->alias($o)->field($field)
                 ->join($st,$st.'.id = '.$o.'.servicetype_id','LEFT')
@@ -129,7 +129,7 @@ class Order extends Api
             if (!empty($result)) {
                 $statusArr  = [2=>'待处理',3=>'已完成',4=>'已取消'];
                 $paytypeArr = [1=>'线下',2=>'余额',3=>'微信'];
-                $timeArr = ['createtime','cancel_time','finish_time'];
+                $timeArr = ['createtime','cancel_time','finish_time','server_time'];
                 foreach ($timeArr as $k => $v) {
                     $result[$v] = !empty($result[$v]) ? date('Y年m月d日 H:i:s', $result[$v]) : '';
                 }
@@ -185,7 +185,7 @@ class Order extends Api
             $text = 'hexiaoorder_'.$id;
             $logo = '';
             $filRoute = '/uploads/temp/';
-            $saveDir = ROOT_PATH.'public/uploads/temp'.DS;
+            $saveDir = ROOT_PATH.'public'.DS.'uploads'.DS.'temp'.DS;
             $fileStr = md5('order_'.$id);
             $localpng = $saveDir.$fileStr.'.png';
             //验证存在直接返回

application/api/controller/PreOrder.php

@@ -35,7 +35,7 @@ class PreOrder extends Api
                 $where[$po.'.pre_order_status'] = $preOrderStatus;
             }
             $field = $po.'.id,name,mobile,address,remark,'.$po.'.car_id,'.$po.'.car_number,pre_time,order_time,'.$po.'.cancel_time,'.
-                $po.'.cancel_reason,'.$st.'.title,pre_order_status,'.$o.'.id as `order_id`';
+                $po.'.cancel_reason,'.$st.'.title,pre_order_status,'.$o.'.id as `order_id`,'.$o.'.server_time';
             $result = $this->model->alias($po)->field($field)
                 ->join($st,$st.'.id = '.$po.'.servicetype_id','LEFT')
                 ->join($o,$o.'.pre_order_id = '.$po.'.id','LEFT')
@@ -43,7 +43,7 @@ class PreOrder extends Api
             if (!empty($result)) {
                 $model = model('PreOrder');
                 $statusArr = $model->getPreOrderStatusList();
-                $timeArr = ['pre_time','order_time','cancel_time'];
+                $timeArr = ['pre_time','order_time','cancel_time','server_time'];
                 foreach ($result as $key => &$value) {
                     foreach ($timeArr as $k => $v) {
                         $value[$v] = !empty($value[$v]) ? date('Y年m月d日 H:i:s', $value[$v]) : '';

application/api/controller/UserCoupons.php

@@ -79,7 +79,7 @@ class UserCoupons extends Api
             $text = 'hexiaocoupon_'.$id;
             $logo = '';
             $filRoute = '/uploads/temp/';
-            $saveDir = ROOT_PATH.'public\uploads\temp'.DS;
+            $saveDir = ROOT_PATH.'public'.DS.'uploads'.DS.'temp'.DS;
             $fileStr = md5('coupon_'.$id);
             $localpng = $saveDir.$fileStr.'.png';
             //验证存在直接返回

application/common.php

@@ -1026,7 +1026,6 @@ if(!function_exists('build_qrcode')) {
         }
         //输出图片
         $res = imagepng($QR, $filename);
-        dump($res);
         imagedestroy($QR);
         if($res === false) {
             return $res;