Merge branch 'master' of http://git.huxiukeji.com/lizhen/lanjingling

application/api/controller/Order.php

@@ -28,8 +28,9 @@ class Order extends Api
 
             $o = 'order';
             $st = 'servicetype';
-            $field = $o.'.id,check_code,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';
+            $p = 'package';
+            $field = $o.'.id,check_code,orderno,server_time,server_info,server_images,'.$o.'.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,'.$p.'.title as `package_title`';
             $where[$o.'.user_id'] = $this->auth->id;
             $where[$o.'.company_id'] = $this->auth->company_id;
             if (!empty($status)) {
@@ -37,6 +38,7 @@ class Order extends Api
             }
             $result = $this->model->alias($o)->field($field)
                 ->join($st,$st.'.id = '.$o.'.servicetype_id','LEFT')
+                ->join($p,$p.'.id = '.$o.'.package_id','LEFT')
                 ->where($where)->order($o.'.createtime desc')->autopage()->select();
             if (!empty($result)) {
                 $statusArr  = [2=>'待处理',3=>'已完成',4=>'已取消'];
@@ -119,12 +121,14 @@ class Order extends Api
             }
             $o = 'order';
             $st = 'servicetype';
+            $p = 'package';
             $where[$o.'.user_id'] = $this->auth->id;
             $where[$o.'.id'] = $id;
-            $field = $o.'.id,check_code,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';
+            $field = $o.'.id,check_code,orderno,server_time,server_info,server_images,'.$o.'.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,'.$p.'.title as `package_title`';
             $result = $this->model->alias($o)->field($field)
                 ->join($st,$st.'.id = '.$o.'.servicetype_id','LEFT')
+                ->join($p,$p.'.id = '.$o.'.package_id','LEFT')
                 ->where($where)->find();
             if (!empty($result)) {
                 $statusArr  = [2=>'待处理',3=>'已完成',4=>'已取消'];

application/common/service/SmsService.php

@@ -91,15 +91,15 @@ class SmsService
                     if ($upkeepTime != $userCarRemind['upkeep_time']) {
                         $data['is_remind']  = 0;
                         $data['updatetime'] = $time;
-                        $result = Db::name('user_car_remind')->where($remindWhere)->update($data);
-                        if (!$result) {
+                        $res = Db::name('user_car_remind')->where($remindWhere)->update($data);
+                        if (!$res) {
                             throw new Exception('更新保养提醒失败');
                         }
                     }
                 } else {
                     $data['createtime'] = $time;
-                    $result = Db::name('user_car_remind')->insertGetId($data);
-                    if (!$result) {
+                    $res = Db::name('user_car_remind')->insertGetId($data);
+                    if (!$res) {
                         throw new Exception('记录保养提醒失败');
                     }
                 }

application/extra/param.php

@@ -6,12 +6,12 @@ return [
         'pre_order' => [  //预约模版
             'template_id'       => 'TsG-62YzB7zHwQ9T5PMdSPsur9mfr9L-mMhMoqi-Emk',//模版ID
             'page'              => 'pages/home/maintenance/reserveRecord',//跳转地址
-            'miniprogram_state' => 'trial',//跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版
+            'miniprogram_state' => 'formal',//跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版
         ],
         'order' => [  //订单模版
             'template_id'       => '83-333geAfLADp_bcY-4UNcMvfkheyluQAuPESaTbUA',//模版ID
             'page'              => 'pages/order/detail',//跳转地址
-            'miniprogram_state' => 'trial',//跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版
+            'miniprogram_state' => 'formal',//跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版
         ],
     ],
     //微信消息模版ID
@@ -23,6 +23,6 @@ return [
     'wechat_setting' => 'release',//微信消息模版：test=测试,release=正式
     'mini_code' => [
         'check_path' =>false,//默认是true，检查page 是否存在，为 true 时 page 必须是已经发布的小程序存在的页面（否则报错）；为 false 时允许小程序未发布或者 page 不存在， 但page 有数量上限（60000个）请勿滥用。
-        'env_version'=>'trial',//正式版为 "release"，体验版为 "trial"，开发版为 "develop"。默认是正式版。
+        'env_version'=>'release',//正式版为 "release"，体验版为 "trial"，开发版为 "develop"。默认是正式版。
     ],
 ];