|
@@ -128,6 +128,17 @@ class Usercenter extends Api
|
|
|
$order['package_endtime'] = $package_order['endtime'];
|
|
|
$order['package_showtime_text'] = date('Y-m-d H:i',$package_order['starttime']).'-'.date('Y-m-d H:i',$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();
|
|
|
+ $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'] = date('Y-m-d H:i',$trylesson_order['starttime']).'-'.date('Y-m-d H:i',$trylesson_order['endtime']);
|
|
|
+ }
|
|
|
|
|
|
|
|
|
//显示时间
|
|
@@ -229,6 +240,19 @@ class Usercenter extends Api
|
|
|
$this->error('取消失败');
|
|
|
}
|
|
|
}
|
|
|
+ //试课给改回去
|
|
|
+ if($lesson_order['paytype'] == 4){
|
|
|
+ $update = [
|
|
|
+ 'order_status' => 10,
|
|
|
+ 'updatetime' => time(),
|
|
|
+ 'lesson_order_id' => 0,
|
|
|
+ ];
|
|
|
+ $rs_remain = Db::name('trylesson_order')->where('id',$lesson_order['trylesson_order_id'])->update($update);
|
|
|
+ if($rs_remain === false){
|
|
|
+ Db::rollback();
|
|
|
+ $this->error('取消失败');
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
//现金支付不给退,线下处理
|
|
|
|
|
@@ -544,7 +568,7 @@ class Usercenter extends Api
|
|
|
//可以申请退课的
|
|
|
public function refund_lesson_order(){
|
|
|
//试课单
|
|
|
- $map = [
|
|
|
+ /*$map = [
|
|
|
'order.user_id' => $this->auth->id,
|
|
|
'order.order_status' => 10
|
|
|
];
|
|
@@ -555,7 +579,7 @@ class Usercenter extends Api
|
|
|
->join('trylesson','order.trylesson_id = trylesson.id','LEFT')
|
|
|
->where($map)->order('order.paytime desc')
|
|
|
->select();
|
|
|
- $trylist = $this->list_lang($list,['name']);
|
|
|
+ $trylist = $this->list_lang($list,['name']);*/
|
|
|
/*if(!empty($trylist)){
|
|
|
foreach($trylist as $key2 => $val2){
|
|
|
//日期
|
|
@@ -592,7 +616,7 @@ class Usercenter extends Api
|
|
|
|
|
|
//
|
|
|
$result = [
|
|
|
- 'trylesson' => $trylist,
|
|
|
+ 'trylesson' => [],
|
|
|
'lesson' => $lesson,
|
|
|
];
|
|
|
|