核销码前缀修改，后缀也修改

application/api/controller/company/Coupon.php

@@ -97,11 +97,11 @@ class Coupon extends Apic
         $action = $code[0];
         $id = intval($code[1]);
 
-        if($action != 'hexiaocoupon' && $action != 'hexiaoorder'){
+        if($action != 'coupon' && $action != 'order'){
             $this->error('错误的核销码');
         }
 
-        if($action == 'hexiaocoupon'){
+        if($action == 'coupon'){
             $map = [
                 'company_id' => $this->auth->company_id,
                 'id'         => $id,
@@ -139,7 +139,7 @@ class Coupon extends Apic
         $action = $code[0];
         $id = $code[1];
 
-        if($action != 'hexiaocoupon' && $action != 'hexiaoorder'){
+        if($action != 'coupon' && $action != 'order'){
             $this->error('错误的核销码');
         }
 
@@ -151,7 +151,7 @@ class Coupon extends Apic
 
         $map = [
             'company_id' => $this->auth->company_id,
-            'id'         => $user_coupon_id,
+            'check_code'         => $user_coupon_id,
         ];
 
         Db::startTrans();
@@ -201,16 +201,19 @@ class Coupon extends Apic
     public function hexiaoorder($order_id){
         $map = [
             'company_id' => $this->auth->company_id,
-            'id'         => $order_id,
+            'check_code'         => $order_id,
             'ordertype'  => 3,
-            'status'     => 1, //2=已支付,待处理
         ];
 
         Db::startTrans();
         $check = Db::name('order')->where($map)->lock(true)->find();
         if(empty($check)){
             Db::rollback();
-            $this->error('不存在的订单');
+            $this->error('不存在的套餐');
+        }
+        if($check['status'] != 1){
+            Db::rollback();
+            $this->error('该套餐已经核销过了');
         }
 
 
@@ -221,7 +224,7 @@ class Coupon extends Apic
         }
 
         Db::commit();
-        $this->success('订单核销完成');
+        $this->success('核销完成');
     }
 
 }