舞蹈室

application/api/controller/Usercenter.php

@@ -665,11 +665,13 @@ class Usercenter extends Api
                 'order.id','order.order_amount','order.paytype','order.package_order_id','order.package_remark','order.trylesson_order_id','order.userremark','order.usernumber','order.jointype',
                 'lesson.name','lesson.name_en',
                 'slot.starttime','slot.hours','slot.address','slot.coach_ids',
-                'coach.nickname as coach_text'
+                'coach.nickname as coach_text',
+                'danceroom.name as danceroom_name','danceroom.name_en as danceroom_name_en',
             ])
             ->join('lesson_slot slot','order.slot_id = slot.id','LEFT')
             ->join('lesson','order.lesson_id = lesson.id','LEFT')
             ->join('coach','slot.coach_ids = coach.id','LEFT')
+            ->join('danceroom','slot.danceroom_id = danceroom.id','LEFT')
             ->where($map)
             ->where('(order.jointype = 1 and order.order_status = 10) or (order.jointype = 2 and order.order_status = 0)') //已支付的 或 候补单
             ->order('slot.starttime desc,order.id desc')
@@ -702,7 +704,12 @@ class Usercenter extends Api
             $yuyue_en = $order['usernumber'] . ($order['jointype'] == 1 ? ' Booked' : ' Waitlisted');
             $yuyue = $this->lang == 'en' ? $yuyue_en : $yuyue;
 
-            $order['coach_text'] = $yuyue.'  '.$order['coach_text'];
+            //舞蹈室
+            $danceroom = $this->lang == 'en' ? $order['danceroom_name_en'] : $order['danceroom_name'];
+            unset($order['danceroom_name']);
+            unset($order['danceroom_name_en']);
+
+            $order['coach_text'] = $yuyue.'  '.$order['coach_text'].'\n'.$danceroom;;
 
             //放入支付套餐
             $order['package_name']      = '';
@@ -758,11 +765,13 @@ class Usercenter extends Api
                 'order.id','order.order_amount','order.paytype','order.package_order_id','order.package_remark','order.trylesson_order_id','order.userremark','order.usernumber','order.jointype',
                 'lesson.name','lesson.name_en',
                 'slot.starttime','slot.hours','slot.address','slot.coach_ids',
-                'coach.nickname as coach_text'
+                'coach.nickname as coach_text',
+                'danceroom.name as danceroom_name','danceroom.name_en as danceroom_name_en',
             ])
             ->join('lesson_slot slot','order.slot_id = slot.id','LEFT')
             ->join('lesson','order.lesson_id = lesson.id','LEFT')
             ->join('coach','slot.coach_ids = coach.id','LEFT')
+            ->join('danceroom','slot.danceroom_id = danceroom.id','LEFT')
             ->where($map)
             ->where('(order.jointype = 1 and order.order_status = 10) or (order.jointype = 2 and order.order_status = 0)') //已支付的 或 候补单
             ->order('slot.starttime desc,order.id desc')
@@ -795,7 +804,12 @@ class Usercenter extends Api
             $yuyue_en = $order['usernumber'] . ($order['jointype'] == 1 ? ' Booked' : ' Waitlisted');
             $yuyue = $this->lang == 'en' ? $yuyue_en : $yuyue;
 
-            $order['coach_text'] = $yuyue.'  '.$order['coach_text'];
+            //舞蹈室
+            $danceroom = $this->lang == 'en' ? $order['danceroom_name_en'] : $order['danceroom_name'];
+            unset($order['danceroom_name']);
+            unset($order['danceroom_name_en']);
+
+            $order['coach_text'] = $yuyue.'  '.$order['coach_text'].'\n'.$danceroom;
 
             //放入支付套餐
             $order['package_name']      = '';