Browse Source

使用试课单支付

lizhen_gitee 1 year ago
parent
commit
7e29d3e8f9

+ 12 - 0
application/admin/controller/Lessonslot.php

@@ -118,6 +118,18 @@ class Lessonslot extends Backend
                             $this->error('取消失败');
                         }
                     }
+                    if($lesson_order['paytype'] == 4){
+                        $update = [
+                            'order_status' => 10,
+                            'lesson_order_id' => 0,
+                            'updatetime' => time(),
+                        ];
+                        $rs_remain = Db::name('trylesson_order')->where('id',$lesson_order['trylesson_order_id'])->update($update);
+                        if($rs_remain === false){
+                            Db::rollback();
+                            $this->error('取消失败');
+                        }
+                    }
                     //现金支付不给退,线下处理
 
                     //取消预约单

+ 5 - 3
application/admin/lang/en/trylessonorder.php

@@ -5,14 +5,15 @@ return [
     'Order_no'          => 'Order no',
     'User_id'           => 'User id',
     'Trylesson_id'      => 'Try lesson id',
+    'Lesson_ids'        => 'Lesson ids',
     'Order_amount'      => 'Order amount',
     'Order_status'      => 'Order status',
     'Order_status 0'    => 'unpaid',
     'Order_status 10'   => 'have paid',
-    'Order_status 20'   => 'signed in',
-    'Order_status 30'   => 'canceled',
-    'Order_status 40'   => 'returned',
+    'Order_status 20'   => 'Booked',
     'Paytime'           => 'Pay time',
+    'Starttime'         => 'start time',
+    'Endtime'           => 'end time',
     'Firstname'         => 'Firstname',
     'Lastname'          => 'Lastname',
     'Mobile'            => 'Mobile',
@@ -29,6 +30,7 @@ return [
     'Is_first 1'        => 'yes',
     'Createtime'        => 'Create time',
     'Updatetime'        => 'Update time',
+    'Lesson_order_id'   => '下单订单id',
     'User.firstname'    => 'firstname',
     'User.lastname'     => 'lastname',
     'Trylesson.name'    => 'Try lesson name',

+ 4 - 4
application/admin/lang/zh-cn/trylessonorder.php

@@ -4,8 +4,8 @@ return [
     'Id'                => 'id',
     'Order_no'          => '订单号',
     'User_id'           => '用户id',
-    'Trylesson_id'      => '课程id',
-    'Lesson_ids'        => '课程ids',
+    'Trylesson_id'      => '试课课程id',
+    'Lesson_ids'        => '可用售课课程ids',
     'Order_amount'      => '订单金额',
     'Order_status'      => '状态',
     'Order_status 0'    => '待支付',
@@ -33,6 +33,6 @@ return [
     'Lesson_order_id'   => '下单订单id',
     'User.firstname'    => '名',
     'User.lastname'     => '姓',
-    'Trylesson.name'    => '标题',
-    'Trylesson.name_en' => '标题(en)'
+    'Trylesson.name'    => '试课标题',
+    'Trylesson.name_en' => '试课标题(en)'
 ];

+ 1 - 1
application/api/controller/Lesson.php

@@ -540,7 +540,7 @@ class Lesson extends Api
             $rs1 = Db::name('trylesson_order')->where('id',$trylessonorder_id)->update($update);
             if($rs1 === false){
                 Db::rollback();
-                $this->error('扣除套餐余额失败');
+                $this->error('使用试课失败');
             }
 
             Db::commit();

+ 0 - 24
application/api/controller/Usercenter.php

@@ -428,34 +428,10 @@ class Usercenter extends Api
         $this->success(1,$list);
     }
 
-    //课程预约,即将到来,试课
-    public function trylesson_order_near(){
-        $map = [
-            'order.user_id' => $this->auth->id,
-            'order.order_status' => 10
-        ];
-
-        $list = Db::name('trylesson_order')->alias('order')
-            ->field('order.id,order.order_amount,order.paytime,order.order_status,
-            trylesson.name,trylesson.name_en')
-            ->join('trylesson','order.trylesson_id = trylesson.id','LEFT')
-            ->where($map)->order('order.paytime desc')
-            ->autopage()->select();
-        $list = $this->list_lang($list,['name']);
-
-        foreach($list as $key => &$order){
-            //显示时间
-            $order['showtime_text'] = date('Y-m-d H:i',$order['paytime']);
-        }
-
-        $this->success(1,$list);
-    }
-
     //课程预约,预约记录,试课
     public function trylesson_order(){
         $map = [
             'order.user_id' => $this->auth->id,
-            'order.order_status' => ['gt',10]
         ];
 
         $list = Db::name('trylesson_order')->alias('order')

+ 2 - 0
application/api/lang/en/lesson.php

@@ -18,4 +18,6 @@ return [
     '扣除套餐余额失败' => 'Failed to deduct package balance',
     '预约失败' => 'Reservation failed',
     '下单失败' => 'Order failed',
+    '试课信息不正确,请刷新重试' => 'the trylesson information is incorrect, please refresh and try again',
+    '使用试课失败' => 'Failed to use try lesson',
 ];