Ver Fonte

核销修改

lizhen_gitee há 1 ano atrás
pai
commit
b0a5bef155

+ 2 - 2
application/api/controller/company/Coupon.php

@@ -203,7 +203,7 @@ class Coupon extends Apic
             'company_id' => $this->auth->company_id,
             'id'         => $order_id,
             'ordertype'  => 3,
-            'status'     => 2, //2=已支付,待处理
+            'status'     => 1, //2=已支付,待处理
         ];
 
         Db::startTrans();
@@ -214,7 +214,7 @@ class Coupon extends Apic
         }
 
 
-        $rs = Db::name('order')->where($map)->update(['hexiao_time'=>time()]);
+        $rs = Db::name('order')->where($map)->update(['status'=>2,'hexiao_time'=>time()]);
         if($rs === false){
             Db::rollback();
             $this->error('核销失败');

+ 1 - 1
application/api/controller/company/Order.php

@@ -66,7 +66,7 @@ class Order extends Apic
         }
         $list = Db::name('order')->alias('order')
             ->join('servicetype','order.servicetype_id = servicetype.id','LEFT')
-            ->field('order.id,orderno,ordertype,user_name,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();
+            ->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']);

+ 1 - 1
application/extra/site.php

@@ -45,5 +45,5 @@ return array (
   'max_withdrawal_money' => '10000',
   'article_name' => '蓝精灵官方',
   'article_avatar' => '/uploads/20230608/68bab200ae016db0fbe31e91ff370ecf.png',
-  'comment_switch' => '1',
+  'comment_switch' => '0',
 );