核销码相关调整

application/api/controller/Order.php

@@ -28,7 +28,7 @@ class Order extends Api
 
             $o = 'order';
             $st = 'servicetype';
-            $field = $o.'.id,orderno,server_time,server_info,server_images,status,user_mobile,'.$o.'.user_car_number,'.
+            $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';
             $where[$o.'.user_id'] = $this->auth->id;
             $where[$o.'.company_id'] = $this->auth->company_id;
@@ -71,7 +71,7 @@ class Order extends Api
             $st= 'servicetype';
             $p = 'package';
 
-            $field = $o.'.id,server_info,'.$o.'.servicetype_id,'.$st.'.title as `service_title`,'.$p.'.title as `package_title`,'.
+            $field = $o.'.id,check_code,server_info,'.$o.'.servicetype_id,'.$st.'.title as `service_title`,'.$p.'.title as `package_title`,'.
             $p.'.images as `package_images`,hexiao_time';
 
             $where[$o.'.user_id'] = $this->auth->id;
@@ -120,7 +120,7 @@ class Order extends Api
             $st = 'servicetype';
             $where[$o.'.user_id'] = $this->auth->id;
             $where[$o.'.id'] = $id;
-            $field = $o.'.id,orderno,server_time,server_info,server_images,status,user_mobile,'.$o.'.user_car_number,'.
+            $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';
             $result = $this->model->alias($o)->field($field)
                 ->join($st,$st.'.id = '.$o.'.servicetype_id','LEFT')
@@ -193,6 +193,7 @@ class Order extends Api
             }
             $result = [
                 'url' => $userCouponsUrl,
+                'check_code' => $modelData['check_code'],
             ];
             $this->success('获取成功',$result);
         } catch (Exception $e) {

application/api/controller/UserCoupons.php

@@ -28,7 +28,7 @@ class UserCoupons extends Api
             $status = $this->request->param('status',1);//状态:1待使用,2已失效
             $userId = $this->auth->id;
             $companyId = $this->auth->company_id;
-            $field = 'id,coupon_name,coupon_info,endtime,number,remain';
+            $field = 'id,coupon_name,coupon_info,endtime,number,remain,check_code';
             $where['user_id'] = $userId;
             $where['company_id'] = $companyId;
             $whereOr = [];
@@ -89,6 +89,7 @@ class UserCoupons extends Api
             }
             $result = [
                 'url' => $userCouponsUrl,
+                'check_code' => $modelData['check_code'],
             ];
             $this->success('获取成功',$result);
         } catch (Exception $e) {

application/api/controller/company/Coupon.php

@@ -95,7 +95,7 @@ class Coupon extends Apic
         }
 
         $action = $code[0];
-        $id = intval($code[1]);
+        $id = $code[1];
 
         if($action != 'coupon' && $action != 'order'){
             $this->error('错误的核销码');