预约课程取消

application/admin/controller/Lessonorder.php

@@ -101,7 +101,7 @@ class Lessonorder extends Backend
             if($info['paytype'] == 1){
                 $package_order = Db::name('package_order')->where('id',$info['package_order_id'])->lock(true)->find();
                 $update = [
-                    'remain' => $package_order['remain'] + $info['usernumber_hours'],
+                    'remain' => bcadd($package_order['remain'],$info['usernumber_hours'],1),
                     'updatetime' => time(),
                 ];
                 $rs_remain = Db::name('package_order')->where('id',$info['package_order_id'])->update($update);
@@ -110,11 +110,12 @@ class Lessonorder extends Backend
                     $this->error('取消失败');
                 }
             }
+            //试课给改回去
             if($info['paytype'] == 4){
                 $update = [
                     'order_status' => 10,
-                    'lesson_order_id' => 0,
                     'updatetime' => time(),
+                    'lesson_order_id' => 0,
                 ];
                 $rs_remain = Db::name('trylesson_order')->where('id',$info['trylesson_order_id'])->update($update);
                 if($rs_remain === false){
@@ -122,6 +123,7 @@ class Lessonorder extends Backend
                     $this->error('取消失败');
                 }
             }
+
             //现金支付不给退，线下处理
 
             //取消预约单

application/admin/controller/Lessonslot.php

@@ -111,7 +111,7 @@ class Lessonslot extends Backend
                     if($lesson_order['paytype'] == 1){
                         $package_order = Db::name('package_order')->where('id',$lesson_order['package_order_id'])->lock(true)->find();
                         $update = [
-                            'remain' => $package_order['remain'] + $lesson_order['usernumber_hours'],
+                            'remain' => bcadd($package_order['remain'],$lesson_order['usernumber_hours'],1),
                             'updatetime' => time(),
                         ];
                         $rs_remain = Db::name('package_order')->where('id',$lesson_order['package_order_id'])->update($update);
@@ -120,11 +120,12 @@ class Lessonslot extends Backend
                             $this->error('取消失败');
                         }
                     }
+                    //试课给改回去
                     if($lesson_order['paytype'] == 4){
                         $update = [
                             'order_status' => 10,
-                            'lesson_order_id' => 0,
                             'updatetime' => time(),
+                            'lesson_order_id' => 0,
                         ];
                         $rs_remain = Db::name('trylesson_order')->where('id',$lesson_order['trylesson_order_id'])->update($update);
                         if($rs_remain === false){
@@ -132,6 +133,7 @@ class Lessonslot extends Backend
                             $this->error('取消失败');
                         }
                     }
+
                     //现金支付不给退，线下处理
 
                     //取消预约单
@@ -150,16 +152,6 @@ class Lessonslot extends Backend
                         $this->error('取消失败');
                     }
 
-                    //给用户发通知
-                    /*$user_info = Db::name('user')->where('id',$lesson_order['user_id'])->find();
-                    if(!empty($user_info['email'])){
-                        $obj = new Email();
-                        $result = $obj
-                            ->to($user_info['email'])
-                            ->subject('Elin Dance Studio 订单取消!')
-                            ->message('Hi,'.$user_info['firstname']. ' ' .$user_info['lastname'].',您预约的'.$lesson_info['name'].'已取消')
-                            ->send();
-                    }*/
 
                 }
             }

application/api/controller/Usercenter.php

@@ -155,7 +155,7 @@ class Usercenter extends Api
     public function lesson_order_cancel(){
         $map = [
             'order.user_id' => $this->auth->id,
-            'order.order_status' => 30,//已取消
+            'order.order_status' => ['IN',[30,40]],//已取消
         ];
         $list = Db::name('lesson_order')->alias('order')
             ->field('order.id,order.order_amount,order.paytype,order.package_order_id,order.package_remark,order.cancel_reason,
@@ -262,7 +262,7 @@ class Usercenter extends Api
             'cancel_time' => time(),
             'cancel_reason' => __('用户主动取消'),
         ];
-        if($lesson_order['paytype'] == 1){
+        if($lesson_order['paytype'] == 1 || $lesson_order['paytype'] == 4){
             $update['order_status'] = 40;
         }