套餐退款数量错误

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'],
+                    'remain' => $package_order['remain'] + $info['usernumber_hours'],
                     'updatetime' => time(),
                 ];
                 $rs_remain = Db::name('package_order')->where('id',$info['package_order_id'])->update($update);
@@ -141,6 +141,8 @@ class Lessonorder extends Backend
                 $this->error('取消失败');
             }
 
+            Db::commit();
+
             $slot_info = Db::name('lesson_slot')->where('id',$info['slot_id'])->find();
             $lesson_info = Db::name('lesson')->where('id',$slot_info['lesson_id'])->find();
 
@@ -184,7 +186,7 @@ class Lessonorder extends Backend
                 }
             }
 
-            Db::commit();
+
             $this->success('取消完成');
 
         }

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'],
+                            'remain' => $package_order['remain'] + $lesson_order['usernumber_hours'],
                             'updatetime' => time(),
                         ];
                         $rs_remain = Db::name('package_order')->where('id',$lesson_order['package_order_id'])->update($update);

application/api/controller/Lesson.php

@@ -445,11 +445,9 @@ class Lesson extends Api
             $lesson_order['order_status'] = 10;
             $lesson_order['paytime'] = time();
             $lesson_order['package_order_id'] = $packageorder_id;
-            if($number_hours > 1){
-                $lesson_order['package_remark'] = ($package_order['sessions'] - $package_order['remain'] + 1) . '-' . ($package_order['sessions'] - $package_order['remain'] + $number_hours) .'/'. $package_order['sessions'];
-            }else{
-                $lesson_order['package_remark'] = ($package_order['sessions'] - $package_order['remain'] + 1) .'/'. $package_order['sessions'];
-            }
+
+            $lesson_order['package_remark'] = ($package_order['sessions'] - $package_order['remain'] + 1) . '-' . ($package_order['sessions'] - $package_order['remain'] + $number_hours) .'/'. $package_order['sessions'];
+
 
             //预约单写入
             $lesson_order_id = Db::name('lesson_order')->insertGetId($lesson_order);

application/api/controller/Notify.php

@@ -196,11 +196,8 @@ class Notify extends Controller
                         'package_order_id' => $package_order['id'],
                         'paytype' => 1,  //从购买套餐中3，改为 课程套餐1
                     ];
-                    if($lesson_order['usernumber_hours'] > 1){
-                        $update['package_remark'] = ($package_order['sessions'] - $package_order['remain'] + 1) . '-' . ($package_order['sessions'] - $package_order['remain'] + $lesson_order['usernumber_hours']) .'/'. $package_order['sessions'];
-                    }else{
-                        $update['package_remark'] = ($package_order['sessions'] - $package_order['remain'] + 1) .'/'. $package_order['sessions'];
-                    }
+                    $update['package_remark'] = ($package_order['sessions'] - $package_order['remain'] + 1) . '-' . ($package_order['sessions'] - $package_order['remain'] + $lesson_order['usernumber_hours']) .'/'. $package_order['sessions'];
+
                     $rs = Db::name('lesson_order')->where('id',$args['lesson_order_id'])->update($update);
                     if($rs === false){
                         Db::rollback();