|
@@ -611,10 +611,9 @@ class Match extends Api
|
|
|
|
|
|
$level = 0; //当前等级
|
|
|
$level_name = ''; //当前等级名称
|
|
|
-
|
|
|
$qinmi_sum = 0; //当前亲密度
|
|
|
- $next_level_diff = 0; //距下一等级亲密度差值
|
|
|
|
|
|
+ $next_level_diff = 0; //距下一等级亲密度差值
|
|
|
$next_level_name = 0; //下一等级名称
|
|
|
$next_level_value = 0;//下一等级亲密度值
|
|
|
|
|
@@ -626,23 +625,27 @@ class Match extends Api
|
|
|
if ($user_intimacy_info) {
|
|
|
//当前亲密度
|
|
|
$qinmi_sum = $user_intimacy_info['value'];
|
|
|
- if ($list) {
|
|
|
- //当前等级信息
|
|
|
- $level_info = Db::name('intimacy_level')->where(['value' => ['elt', $user_intimacy_info['value']]])->order('level desc')->find();
|
|
|
- if ($level_info) {
|
|
|
- $level = $level_info['level'];
|
|
|
- $level_name = $level_info['name'];
|
|
|
- }
|
|
|
- //下一等级信息
|
|
|
- $next_level_info = Db::name('intimacy_level')->where(['value' => ['gt', $user_intimacy_info['value']]])->order('value')->find();
|
|
|
- if ($next_level_info) {
|
|
|
- $next_level_name = $next_level_info['name'];
|
|
|
- $next_level_value = $next_level_info['value'];
|
|
|
- $next_level_diff = $next_level_info['value'] - $user_intimacy_info['value'];
|
|
|
- }
|
|
|
+
|
|
|
+ //当前等级信息
|
|
|
+ $level_info = Db::name('intimacy_level')->where(['value' => ['elt', $user_intimacy_info['value']]])->order('level desc')->find();
|
|
|
+ if ($level_info) {
|
|
|
+ $level = $level_info['level'];
|
|
|
+ $level_name = $level_info['name'];
|
|
|
+ }
|
|
|
+ //下一等级信息
|
|
|
+ $next_level_info = Db::name('intimacy_level')->where(['value' => ['gt', $user_intimacy_info['value']]])->order('value')->find();
|
|
|
+ if ($next_level_info) {
|
|
|
+ $next_level_name = $next_level_info['name'];
|
|
|
+ $next_level_value = $next_level_info['value'];
|
|
|
+ $next_level_diff = $next_level_info['value'] - $user_intimacy_info['value'];
|
|
|
}
|
|
|
+
|
|
|
} else {
|
|
|
- $next_level = Db::name('intimacy_level')->order('value')->find();
|
|
|
+ $level = 1; //当前等级
|
|
|
+ $level_name = '初级'; //当前等级名称
|
|
|
+ $qinmi_sum = 0; //当前亲密度
|
|
|
+
|
|
|
+ $next_level = Db::name('intimacy_level')->where('level',2)->find();
|
|
|
$next_level_diff = $next_level['value'];
|
|
|
$next_level_name = $next_level['name'];
|
|
|
$next_level_value = $next_level['value'];
|