|
|
@@ -173,22 +173,26 @@ class Usercenter extends Api
|
|
|
->field('p.name,p.name_en,order.starttime,order.endtime')
|
|
|
->join('lesson_package p','order.package_id = p.id','LEFT')
|
|
|
->where('order.id',$order['package_order_id'])->find();
|
|
|
+ if(!empty($package_order)){
|
|
|
$order['package_name'] = $package_order['name'];
|
|
|
$order['package_name_en'] = $package_order['name_en'];
|
|
|
/*$order['package_starttime'] = $package_order['starttime'];
|
|
|
$order['package_endtime'] = $package_order['endtime'];*/
|
|
|
$order['package_showtime_text'] = $this->date_lang($package_order['starttime']).'-'.$this->date_lang($package_order['endtime']);
|
|
|
+ }
|
|
|
}
|
|
|
if($order['paytype'] == 4){
|
|
|
$trylesson_order = Db::name('trylesson_order')->alias('order')
|
|
|
->field('t.name,t.name_en,order.starttime,order.endtime')
|
|
|
->join('trylesson t','order.trylesson_id = t.id','LEFT')
|
|
|
->where('order.id',$order['trylesson_order_id'])->find();
|
|
|
+ if(!empty($trylesson_order)){
|
|
|
$order['package_name'] = $trylesson_order['name'];
|
|
|
$order['package_name_en'] = $trylesson_order['name_en'];
|
|
|
/*$order['package_starttime'] = $trylesson_order['starttime'];
|
|
|
$order['package_endtime'] = $trylesson_order['endtime'];*/
|
|
|
$order['package_showtime_text'] = $this->date_lang($trylesson_order['starttime']).'-'.$this->date_lang($trylesson_order['endtime']);
|
|
|
+ }
|
|
|
}
|
|
|
if($order['paytype'] == 2){
|
|
|
$order['package_name'] = '在线支付';
|
|
|
@@ -258,22 +262,26 @@ class Usercenter extends Api
|
|
|
->field('p.name,p.name_en,order.starttime,order.endtime')
|
|
|
->join('lesson_package p','order.package_id = p.id','LEFT')
|
|
|
->where('order.id',$order['package_order_id'])->find();
|
|
|
+ if(!empty($package_order)){
|
|
|
$order['package_name'] = $package_order['name'];
|
|
|
$order['package_name_en'] = $package_order['name_en'];
|
|
|
/*$order['package_starttime'] = $package_order['starttime'];
|
|
|
$order['package_endtime'] = $package_order['endtime'];*/
|
|
|
$order['package_showtime_text'] = $this->date_lang($package_order['starttime']).'-'.$this->date_lang($package_order['endtime']);
|
|
|
+ }
|
|
|
}
|
|
|
if($order['paytype'] == 4){
|
|
|
$trylesson_order = Db::name('trylesson_order')->alias('order')
|
|
|
->field('t.name,t.name_en,order.starttime,order.endtime')
|
|
|
->join('trylesson t','order.trylesson_id = t.id','LEFT')
|
|
|
->where('order.id',$order['trylesson_order_id'])->find();
|
|
|
+ if(!empty($trylesson_order)){
|
|
|
$order['package_name'] = $trylesson_order['name'];
|
|
|
$order['package_name_en'] = $trylesson_order['name_en'];
|
|
|
/*$order['package_starttime'] = $trylesson_order['starttime'];
|
|
|
$order['package_endtime'] = $trylesson_order['endtime'];*/
|
|
|
$order['package_showtime_text'] = $this->date_lang($trylesson_order['starttime']).'-'.$this->date_lang($trylesson_order['endtime']);
|
|
|
+ }
|
|
|
}
|
|
|
if($order['paytype'] == 2){
|
|
|
$order['package_name'] = '在线支付';
|
|
|
@@ -606,22 +614,26 @@ class Usercenter extends Api
|
|
|
->field('p.name,p.name_en,order.starttime,order.endtime')
|
|
|
->join('lesson_package p','order.package_id = p.id','LEFT')
|
|
|
->where('order.id',$order['package_order_id'])->find();
|
|
|
+ if(!empty($package_order)){
|
|
|
$order['package_name'] = $package_order['name'];
|
|
|
$order['package_name_en'] = $package_order['name_en'];
|
|
|
/*$order['package_starttime'] = $package_order['starttime'];
|
|
|
$order['package_endtime'] = $package_order['endtime'];*/
|
|
|
$order['package_showtime_text'] = $this->date_lang($package_order['starttime']).'-'.$this->date_lang($package_order['endtime']);
|
|
|
+ }
|
|
|
}
|
|
|
if($order['paytype'] == 4){
|
|
|
$trylesson_order = Db::name('trylesson_order')->alias('order')
|
|
|
->field('t.name,t.name_en,order.starttime,order.endtime')
|
|
|
->join('trylesson t','order.trylesson_id = t.id','LEFT')
|
|
|
->where('order.id',$order['trylesson_order_id'])->find();
|
|
|
+ if(!empty($trylesson_order)){
|
|
|
$order['package_name'] = $trylesson_order['name'];
|
|
|
$order['package_name_en'] = $trylesson_order['name_en'];
|
|
|
/*$order['package_starttime'] = $trylesson_order['starttime'];
|
|
|
$order['package_endtime'] = $trylesson_order['endtime'];*/
|
|
|
$order['package_showtime_text'] = $this->date_lang($trylesson_order['starttime']).'-'.$this->date_lang($trylesson_order['endtime']);
|
|
|
+ }
|
|
|
}
|
|
|
if($order['paytype'] == 2){
|
|
|
$order['package_name'] = '在线支付';
|
|
|
@@ -702,22 +714,26 @@ class Usercenter extends Api
|
|
|
->field('p.name,p.name_en,order.starttime,order.endtime')
|
|
|
->join('lesson_package p','order.package_id = p.id','LEFT')
|
|
|
->where('order.id',$order['package_order_id'])->find();
|
|
|
+ if(!empty($package_order)){
|
|
|
$order['package_name'] = $package_order['name'];
|
|
|
$order['package_name_en'] = $package_order['name_en'];
|
|
|
/*$order['package_starttime'] = $package_order['starttime'];
|
|
|
$order['package_endtime'] = $package_order['endtime'];*/
|
|
|
$order['package_showtime_text'] = $this->date_lang($package_order['starttime']).'-'.$this->date_lang($package_order['endtime']);
|
|
|
+ }
|
|
|
}
|
|
|
if($order['paytype'] == 4){
|
|
|
$trylesson_order = Db::name('trylesson_order')->alias('order')
|
|
|
->field('t.name,t.name_en,order.starttime,order.endtime')
|
|
|
->join('trylesson t','order.trylesson_id = t.id','LEFT')
|
|
|
->where('order.id',$order['trylesson_order_id'])->find();
|
|
|
+ if(!empty($trylesson_order)){
|
|
|
$order['package_name'] = $trylesson_order['name'];
|
|
|
$order['package_name_en'] = $trylesson_order['name_en'];
|
|
|
/*$order['package_starttime'] = $trylesson_order['starttime'];
|
|
|
$order['package_endtime'] = $trylesson_order['endtime'];*/
|
|
|
$order['package_showtime_text'] = $this->date_lang($trylesson_order['starttime']).'-'.$this->date_lang($trylesson_order['endtime']);
|
|
|
+ }
|
|
|
}
|
|
|
if($order['paytype'] == 2){
|
|
|
$order['package_name'] = '在线支付';
|
|
|
@@ -791,22 +807,26 @@ class Usercenter extends Api
|
|
|
->field('p.name,p.name_en,order.starttime,order.endtime')
|
|
|
->join('lesson_package p','order.package_id = p.id','LEFT')
|
|
|
->where('order.id',$order['package_order_id'])->find();
|
|
|
+ if(!empty($package_order)){
|
|
|
$order['package_name'] = $package_order['name'];
|
|
|
$order['package_name_en'] = $package_order['name_en'];
|
|
|
/*$order['package_starttime'] = $package_order['starttime'];
|
|
|
$order['package_endtime'] = $package_order['endtime'];*/
|
|
|
$order['package_showtime_text'] = $this->date_lang($package_order['starttime']).'-'.$this->date_lang($package_order['endtime']);
|
|
|
+ }
|
|
|
}
|
|
|
if($order['paytype'] == 4){
|
|
|
$trylesson_order = Db::name('trylesson_order')->alias('order')
|
|
|
->field('t.name,t.name_en,order.starttime,order.endtime')
|
|
|
->join('trylesson t','order.trylesson_id = t.id','LEFT')
|
|
|
->where('order.id',$order['trylesson_order_id'])->find();
|
|
|
+ if(!empty($trylesson_order)){
|
|
|
$order['package_name'] = $trylesson_order['name'];
|
|
|
$order['package_name_en'] = $trylesson_order['name_en'];
|
|
|
/*$order['package_starttime'] = $trylesson_order['starttime'];
|
|
|
$order['package_endtime'] = $trylesson_order['endtime'];*/
|
|
|
$order['package_showtime_text'] = $this->date_lang($trylesson_order['starttime']).'-'.$this->date_lang($trylesson_order['endtime']);
|
|
|
+ }
|
|
|
}
|
|
|
if($order['paytype'] == 2){
|
|
|
$order['package_name'] = '在线支付';
|
lizhen_gitee