diff --git a/application/api/model/Nobility.php b/application/api/model/Nobility.php index 2e84295..02a36be 100644 --- a/application/api/model/Nobility.php +++ b/application/api/model/Nobility.php @@ -54,7 +54,7 @@ class Nobility extends Model //爵位详情 public static function getNobilityInfo($user_id){ $user_info = db::name('user') - ->field('id,nickname,avatar') + ->field('id as user_id,nickname,avatar') ->where('delete_time', 0) ->where('id', $user_id) ->find(); @@ -68,6 +68,7 @@ class Nobility extends Model $return['user_info'] = $user_info; //用户信息 $return['nobility_info'] = []; //爵位信息 $return['nobility_info']['status'] = 0; //去开通 + $return['nobility_info']['end_time'] = ''; if($user_nobility_info){ $nobility_info = db::name('vs_nobility') ->field('lid,name,image,images,pay_price,renew_price,pay_coin,renew_coin,day,power_ids') @@ -75,11 +76,12 @@ class Nobility extends Model ->where('lid', $user_nobility_info['lid']) ->find(); $return['nobility_info']['status'] = 1; //去续费 + $return['nobility_info']['end_time'] = date('Y-m-d H:i:s', $user_nobility_info['end_time']); } $return['nobility_info']['lid'] = $nobility_info['lid'] ?? 0; $return['nobility_info']['name'] = $nobility_info['name'] ?? ''; $return['nobility_info']['image'] = $nobility_info['image'] ?? ''; - $return['nobility_info']['end_time'] = $user_nobility_info['end_time'] ?? 0; + $return['nobility_power_list'] = []; //爵位列表 @@ -254,6 +256,7 @@ class Nobility extends Model if ($user_nobility_info) { //已购买过 续费 if($user_nobility_info['lid'] == $lid){ //续费 $price = $nobility_info['renew_price']; + $end_time = $user_nobility_info['end_time'] + $nobility_info['day'] * 86400; }else{ //升级 $old_nobility_info = db::name('vs_nobility') ->field('lid,name,pay_price,pay_coin') @@ -270,9 +273,11 @@ class Nobility extends Model }else{ $price = $nobility_info['pay_price']; } + $end_time = time() + $nobility_info['day'] * 86400; } }else{ //未购买 新购 $price = $nobility_info['pay_price']; + $end_time = time() + $nobility_info['day'] * 86400; } $power_ids = explode(',', $nobility_info['power_ids']); $power_list = db::name('vs_nobility_power') @@ -285,8 +290,10 @@ class Nobility extends Model 'nobility_name' => $nobility_info['name'], 'nobility_image' => $nobility_info['image'], 'price' => $price, + 'pay_price' => $nobility_info['pay_price'], 'day' => $nobility_info['day'], 'power_list' => $power_list, + 'end_time' => date('Y-m-d H:i:s', $end_time), ]; return ['code' => 1, 'msg' => '成功', 'data' => $return]; }