文字修改

application/admin/controller/Order.php

@@ -114,7 +114,7 @@ class Order extends Backend
         $data['ordertype']    = 2;  //类型:1=预约下单,2=在线下单,3=套餐订单
         $data['total_fee'] = $data['pay_fee'];
 
-        $data['status'] = 2; //2=已支付,待处理
+        $data['status'] = 2; //2=已接单
         $data['createtime'] = time();
 
         $order_id = Db::name('order')->insertGetId($data);

application/admin/controller/Preorder.php

@@ -160,7 +160,7 @@ class Preorder extends Backend
         $data['company_id'] = $pre_order['company_id'];
         $data['total_fee']  = $data['pay_fee'];
 
-        $data['status'] = 2; //2=已支付,待处理
+        $data['status'] = 2; //2=已接单
         $data['createtime'] = time();
 
         $order_id = Db::name('order')->insertGetId($data);

application/admin/lang/zh-cn/order.php

@@ -24,7 +24,7 @@ return [
     'Package_endtime'    => '套餐到期时间',
     'Status'             => '状态',
     'Status 1'           => '待核销',
-    'Status 2'           => '待处理',
+    'Status 2'           => '已接单',
     'Status 3'           => '已完成',
     'Status 4'           => '已取消',
     'Pay_time'           => '套餐支付时间',

application/admin/lang/zh-cn/preorder.php

@@ -19,7 +19,7 @@ return [
     'Cancel_reason'      => '取消原因',
     'Pre_order_status'   => '预约状态',
     'Pre_order_status 0' => '已取消',
-    'Pre_order_status 1' => '待处理',
+    'Pre_order_status 1' => '待接单',
     'Pre_order_status 2' => '已开单',
     'Createtime'         => '创建时间',
     'Updatetime'         => '更新时间',

application/api/controller/Order.php

@@ -24,7 +24,7 @@ class Order extends Api
      */
     public function getList(){
         try {
-            $status = input('status',0);//状态:1=待支付,2=待处理,3=已完成,4=已取消
+            $status = input('status',0);//状态:1=待核销,2=已接单,3=已完成,4=已取消
 
             $o = 'order';
             $st = 'servicetype';
@@ -79,7 +79,7 @@ class Order extends Api
             $where[$o.'.user_id'] = $this->auth->id;
             $where[$o.'.company_id'] = $this->auth->company_id;
             $where[$o.'.ordertype'] = 3;//类型:1=预约下单,2=在线下单,3=套餐订单
-            $where[$o.'.status'] = ['in',[1,2,3]];//状态:2=待处理,3=已完成,4=已取消
+            $where[$o.'.status'] = ['in',[1,2,3]];//状态:2=已接单,3=已完成,4=已取消
             $where[$p.'.type'] = 1;//类型:1=普通,2=卡券
             if (!empty($status)) {
                 if ($status == 1) {
@@ -230,7 +230,7 @@ class Order extends Api
                 }
             }
             $where[$o.'.user_id'] = $this->auth->id;
-            $where[$o.'.status'] = ['in',[2,3]];//状态:2=待处理,3=已完成,4=已取消
+            $where[$o.'.status'] = ['in',[2,3]];//状态:2=已接单,3=已完成,4=已取消
             $where[$st.'.is_upkeep'] = 1;//是否保养:1=是,0=否
             $field = $o.'.id,'.$o.'.servicetype_id,server_info,finish_time,next_date,next_carlicheng,pay_fee,appen_fee,'.$st.'.title as `service_title`,'.$p.'.title as `package_title`';
             $result = $this->model->alias($o)->field($field)

application/api/controller/company/Order.php

@@ -22,8 +22,8 @@ class Order extends Apic
 
     private function status_text($status){
         $arr = [
-            1 => '待支付',
-            2 => '待处理',
+            1 => '待核销',
+            2 => '已接单',
             3 => '已完成',
             4 => '已取消',
         ];
@@ -55,7 +55,7 @@ class Order extends Apic
             $where['servicetype_id'] = $servicetype_id;
         }
         if($status){
-            $where['status'] = $status;  //状态:2=待处理,3=已核销(完成),4=已取消
+            $where['status'] = $status;  //状态:2=已接单,3=已完成,4=已取消
             if($status > 2){
                 $order = 'order.finish_time desc';
             }
@@ -239,7 +239,7 @@ class Order extends Apic
 
         //加入新的一条
         $name = input('name','');
-        $price = intval(input('price',0));
+        $price = input('price',0);
 
         if($price <= 0){
             Db::rollback();

application/api/controller/company/Preorder.php

@@ -145,7 +145,7 @@ class Preorder extends Apic
         $data['staff_id'] = $this->auth->id;
         $data['total_fee'] = $data['pay_fee'];
 
-        $data['status'] = 2; //2=已支付,待处理
+        $data['status'] = 2; //2=已接单
         $data['createtime'] = time();
 
         $order_id = Db::name('order')->insertGetId($data);

application/api/lang/zh-cn/pre_order.php

@@ -20,7 +20,7 @@ return [
     'Cancel_reason'      => '取消原因',
     'Pre_order_status'   => '预约状态',
     'Pre_order_status 0' => '已取消',
-    'Pre_order_status 1' => '待处理',
+    'Pre_order_status 1' => '待接单',
     'Pre_order_status 2' => '已开单',
     'Createtime'         => '创建时间',
     'Updatetime'         => '更新时间'

application/common/library/Authcompany.php

@@ -371,7 +371,7 @@ class Authcompany
         ];
         $userinfo['today_newpre'] = Db::name('pre_order')->where($map)->count();
 
-        //待处理订单数量
+        //已接单订单数量
         $map = [
             'company_id' => $this->company_id,
             'status'     => 2,

application/common/service/OrderService.php

@@ -245,7 +245,7 @@ class OrderService
                 '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=已取消
+                'status'          => $orderStatus,//状态:1=待核销,2=已接单,3=已完成,4=已取消
                 'pay_time'        => $time,
                 'paytype'         => $orderPayType,//支付方式:1=线下,2=余额,3=微信
                 'total_fee'       => isset($package['price']) ? $package['price'] : 0.00,//支付总额
@@ -297,7 +297,7 @@ class OrderService
             $orderWhere['user_id'] = $userId;
             $orderWhere['company_id'] = $companyId;
             $orderWhere['next_date'] = ['neq',''];
-            $orderWhere['status'] = 3;//状态:2=待处理,3=已完成,4=已取消
+            $orderWhere['status'] = 3;//状态:2=已接单,3=已完成,4=已取消
             $subQuery = Db::name('order')->alias('o')->where($orderWhere)
                 ->order(['finish_time' => 'desc'])
                 ->buildSql(); //构建查询语句