|
@@ -27,7 +27,7 @@ class Usercenter extends Api
|
|
|
'order.use_status' => $user_status,
|
|
|
];
|
|
|
$list = Db::name('package_order')->alias('order')
|
|
|
- ->field('order.id,order.starttime,order.endtime,order.days,order.is_gift,order.remain,order.price,order.use_apply_status,order.createtime,order.pay_type,order.remark,order.pay_time,
|
|
|
+ ->field('order.id,order.starttime,order.endtime,order.days,order.is_gift,order.remain,order.price,order.use_apply_status,order.createtime,order.pay_type,order.remark,order.paytime,
|
|
|
p.name,p.name_en,p.image,p.activeremark,p.activeremark_en,p.validity,p.validity_en')
|
|
|
->join('lesson_package p','order.package_id = p.id','LEFT')
|
|
|
->where($map)->order('order.remain desc,order.endtime asc')
|
|
@@ -49,7 +49,7 @@ class Usercenter extends Api
|
|
|
$val['expired'] = 1;
|
|
|
}
|
|
|
//支付方式
|
|
|
- $pay_time_text = $this->date_lang($val['pay_time']);
|
|
|
+ $pay_time_text = $this->date_lang($val['paytime']);
|
|
|
$val['pay_type_text'] = ($val['pay_type'] == 1 ? '线上支付' : '线下支付('.$val['remark'].')') .' '. $pay_time_text;
|
|
|
$val['pay_type_text_en'] = ($val['pay_type'] == 1 ? 'Paid Online' : 'Paid Offline ('.$val['remark'].')') .' '. $pay_time_text;
|
|
|
}
|