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

application/api/controller/Order.php

@@ -41,7 +41,7 @@ class Order extends Api
                 ->join($p,$p.'.id = '.$o.'.package_id','LEFT')
                 ->where($where)->order($o.'.createtime desc')->autopage()->select();
             if (!empty($result)) {
-                $statusArr  = [2=>'待处理',3=>'已完成',4=>'已取消'];
+                $statusArr  = [2=>'已接单',3=>'已完成',4=>'已取消'];
                 $paytypeArr = [1=>'线下',2=>'余额',3=>'微信'];
                 $timeArr = ['createtime','cancel_time','finish_time','server_time'];
                 foreach ($result as $key => &$value) {
@@ -131,7 +131,7 @@ class Order extends Api
                 ->join($p,$p.'.id = '.$o.'.package_id','LEFT')
                 ->where($where)->find();
             if (!empty($result)) {
-                $statusArr  = [2=>'待处理',3=>'已完成',4=>'已取消'];
+                $statusArr  = [2=>'已接单',3=>'已完成',4=>'已取消'];
                 $paytypeArr = [1=>'线下',2=>'余额',3=>'微信'];
                 $timeArr = ['createtime','cancel_time','finish_time','server_time'];
                 foreach ($timeArr as $k => $v) {

application/api/controller/company/Coupon.php

@@ -112,19 +112,14 @@ class Coupon extends Apic
                 $check['action'] = $action;
             }
         }else{
-            $p = 'package';
-            $o = 'order';
             $map = [
-                $o.'.company_id' => $this->auth->company_id,
-                $o.'.check_code' => $id,
-                $o.'.ordertype'  => 3,
-                $o.'.status'     => 1, //1=待核销
+                'company_id' => $this->auth->company_id,
+                'check_code' => $id,
+                'ordertype'  => 3,
+                'status'     => 1, //1=待核销
             ];
-            $check = Db::name($o)->alias($o)->field($o.'.id,server_info as name,pay_fee as price,'.$p.'.title as `package_title`')
-                ->join($p,$p.'.id = '.$o.'.package_id','LEFT')
-                ->where($map)->find();
+            $check = Db::name('order')->field('id,server_info as name,pay_fee as price')->where($map)->find();
             if(!empty($check)){
-                $check['name'] = $check['package_title'];
                 $check['getfrom'] = '购买';
                 $check['action'] = $action;
             }

application/api/controller/company/Order.php

@@ -37,28 +37,27 @@ class Order extends Apic
         $endtime = input('endtime',0);
         $servicetype_id = intval(input('servicetype_id',0));
         $status  = intval(input('status',0));
-        $o = 'order';
-        $p = 'package';
-        $order = $o.'.id desc';
+
+        $order = 'order.id desc';
 
         $where = [
-            $o.'.company_id' => $this->auth->company_id,
+            'company_id' => $this->auth->company_id,
         ];
         //员工
         if($this->auth->type == 2){
-            $where[$o.'.staff_id'] = $this->auth->id;
+            $where['staff_id'] = $this->auth->id;
         }//员工
 
         if($starttime || $endtime){
-            $where[$o.'.createtime'] = ['between',$starttime,$endtime];
+            $where['createtime'] = ['between',$starttime,$endtime];
         }
         if($servicetype_id){
-            $where[$o.'.servicetype_id'] = $servicetype_id;
+            $where['servicetype_id'] = $servicetype_id;
         }
         if($status){
-            $where[$o.'.status'] = $status;  //状态:2=待处理,3=已核销(完成),4=已取消
+            $where['status'] = $status;  //状态:2=待处理,3=已核销(完成),4=已取消
             if($status > 2){
-                $order = $o.'.finish_time desc';
+                $order = 'order.finish_time desc';
             }
 
         }
@@ -67,15 +66,12 @@ class Order extends Apic
         {
             $where['user_car_number|user_mobile'] = ['LIKE','%'.$keyword.'%'];
         }
-        $list = Db::name('order')->alias($o)
-            ->join('servicetype',$o.'.servicetype_id = servicetype.id','LEFT')
-            ->join($p,$p.'.id = '.$o.'.package_id','LEFT')
-            ->field($o.'.id,orderno,ordertype,user_name,user_mobile,user_car_number,'.
-                $o.'.createtime,'.$o.'.servicetype_id,server_info,server_time,'.$o.'.status,finish_time,cancel_reason,hexiao_time,cancel_time,servicetype.title as servicetype_title,servicetype.baoyang_switch,'.$p.'.title as `package_title`')->where($where)->order($order)->autopage()->select();
+        $list = Db::name('order')->alias('order')
+            ->join('servicetype','order.servicetype_id = servicetype.id','LEFT')
+            ->field('order.id,orderno,ordertype,user_name,user_mobile,user_car_number,createtime,servicetype_id,server_info,server_time,status,finish_time,cancel_reason,hexiao_time,cancel_time,servicetype.title as servicetype_title,servicetype.baoyang_switch')->where($where)->order($order)->autopage()->select();
 
         foreach($list as $key => &$val){
             $val['status_text'] = $this->status_text($val['status']);
-            $val['server_info'] = $val['package_title'];
         }
         $this->success(1,$list);
     }
@@ -84,17 +80,14 @@ class Order extends Apic
     //详情
     public function info(){
         $id = input('id',0);
-        $o = 'order';
-        $p = 'package';
-        $info = Db::name('order')->alias($o)
-            ->join('servicetype',$o.'.servicetype_id = servicetype.id','LEFT')
-            ->join($p,$p.'.id = '.$o.'.package_id','LEFT')
-            ->field($o.'.*,servicetype.title as servicetype_title,servicetype.baoyang_switch,'.$p.'.title as package_title')
-            ->where($o.'.id',$id)->find();
+        $info = Db::name('order')->alias('order')
+            ->join('servicetype','order.servicetype_id = servicetype.id','LEFT')
+            ->field('order.*,servicetype.title as servicetype_title,servicetype.baoyang_switch')
+            ->where('order.id',$id)->find();
         $info = info_domain_image($info,['server_images']);
         $info['status_text'] = $this->status_text($info['status']);
         $info['total_fee'] = bcadd($info['pay_fee'],$info['appen_fee'],2);
-        $info['server_info'] = $info['package_title'];
+
         $info['appen_list'] = Db::name('order_appen')->where('order_id',$id)->select();
 
         $this->success(1,$info);

application/common/model/Company.php

@@ -23,6 +23,6 @@ class Company extends Model
 
     public function getStatusList()
     {
-        return ['-1' => '新来的', '0' => '待审核', '1' => '审核通过', '2' => '审核不通过'];
+        return ['-1' => '已申请', '0' => '待审核', '1' => '审核通过', '2' => '审核不通过'];
     }
 }

application/common/model/Order.php

@@ -45,7 +45,7 @@ class Order extends Model
 
     public function getStatusList()
     {
-        return ['2' => '待处理', '3' => '已完成', '4' => '已取消'];
+        return ['2' => '已接单', '3' => '已完成', '4' => '已取消'];
     }
 
     public function getPaytypeList()

application/common/model/PreOrder.php

@@ -35,7 +35,7 @@ class PreOrder extends Model
     
     public function getPreOrderStatusList()
     {
-        return ['0' => '已取消', '1' => '待处理', '2' => '已开单'];
+        return ['0' => '已取消', '1' => '待接单', '2' => '已开单'];
     }
 
 

application/common/service/OrderService.php

@@ -49,6 +49,7 @@ class OrderService
             //验证套餐
             $packageWhere['id'] = $packageId;
             $packageWhere['status'] = 1;
+            $packageWhere['num'] = ['gt',0];
             $package = Db::name('package')->where($packageWhere)->find();
             if (empty($package)) {
                 throw new Exception('未找到套餐信息');
@@ -182,7 +183,11 @@ class OrderService
             //生成订单
             $time = time();
             $packageWhere['id'] = $packageId;
+            $packageWhere['num'] = ['gt',0];
             $package = Db::name('package')->where($packageWhere)->lock(true)->find();
+            if (empty($package)) {
+                throw new Exception('未找到套餐信息');
+            }
             $userWhere['id'] = $userId;
             $user = Db::name('user')->where($userWhere)->find();
             //绑定门店
@@ -194,8 +199,7 @@ class OrderService
             ];
             $userBindRes = $userService->userWallet($userParams);
             if (!$userBindRes['status']) {
-                Db::rollback();
-                return false;
+                throw new Exception($userBindRes['msg']);
             }
             $userCarWhere['id'] = $carId;
             $userCar = Db::name('user_car')->where($userCarWhere)->find();
@@ -238,7 +242,7 @@ class OrderService
                 'pre_order_id'    => 0,//预约单ID
                 'package_id'      => isset($package['id']) ? $package['id'] : 0,//套餐ID
                 'servicetype_id'  => isset($package['servicetype_id']) ? $package['servicetype_id'] : 0,//服务类型
-                'server_info'     => isset($package['info']) ? $package['info'] : '',//套餐内容
+                'server_info'     => isset($package['title']) ? $package['title'] : '',//套餐主标题
                 'server_images'   => isset($package['images']) ? $package['images'] : '',//套餐图片
                 'pay_fee'         => isset($package['price']) ? $package['price'] : 0.00,//套餐价格
                 'status'          => $orderStatus,//状态:1=待核销,2=待处理,3=已完成,4=已取消

application/common/service/UserService.php

@@ -36,7 +36,7 @@ class UserService
             $userId = isset($params['user_id']) ? $params['user_id'] : 0;
             $companyId = isset($params['company_id']) ? $params['company_id'] : 0;
             $where['id'] = $userId;
-            $user = Db::name('user')->where($where['id'])->find();
+            $user = Db::name('user')->where($where)->find();
             if (!empty($user)) {
                 if ($user['company_id'] != $companyId) {
                     $userData['company_id'] = $companyId;

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' => 'formal',//跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版
+            'miniprogram_state' => 'trial',//跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版
         ],
         'order' => [  //订单模版
             'template_id'       => '83-333geAfLADp_bcY-4UNcMvfkheyluQAuPESaTbUA',//模版ID
             'page'              => 'pages/order/detail',//跳转地址
-            'miniprogram_state' => 'formal',//跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版
+            'miniprogram_state' => 'trial',//跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版
         ],
     ],
     //微信消息模版ID