|
|
@@ -218,11 +218,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','order.cancel_reason','order.order_status',
|
|
|
'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)
|
|
|
->order('slot.starttime desc,order.id desc')
|
|
|
->autopage()->select();
|
|
|
@@ -250,7 +252,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'] = '';
|
|
|
@@ -709,7 +716,7 @@ class Usercenter extends Api
|
|
|
unset($order['danceroom_name']);
|
|
|
unset($order['danceroom_name_en']);
|
|
|
|
|
|
- $order['coach_text'] = $yuyue.' '.$order['coach_text'].'\n'.$danceroom;;
|
|
|
+ $order['coach_text'] = $yuyue.' '.$order['coach_text'].'\n'.$danceroom;
|
|
|
|
|
|
//放入支付套餐
|
|
|
$order['package_name'] = '';
|
lizhen_gitee