用户身份只升级，不降级

app/common/repositories/user/UserRepository.php

@@ -3244,6 +3244,10 @@ class UserRepository extends BaseRepository
         }
 
         $userData = $this->dao->get($uid)->toArray();
+        // 只升级 不降级
+        if ($identityId < $userData['user_group']) {
+            $identityId = $userData['user_group'];
+        }
         $data = ['user_group' => $identityId];
         if (empty($userData['identity_up_time'] ?? null) && $userData['user_group'] == 1 && $identityId > 1) {
             $data['identity_up_time'] = date('Y-m-d H:i:s');
@@ -3339,7 +3343,6 @@ class UserRepository extends BaseRepository
             // 从小向大循环，满足则去 下一等级继续验证，不满足 则 返回上次循环记录的值，并结束循环
             if ($item['arrive_num_own'] <= $arriveNumOwn && $item['arrive_num_team'] <= $arriveNumTeam) {
                 $identityId = $item['user_group_id'];
-
                 // 用户等级限制，本次获取身份 最大可获取什么身份，比如 用户没有 团队贡献值，他最高只能升到 2 级 即业务员
                 if ($identityId == $maxLvRestrict) {
                     break;
@@ -3348,6 +3351,9 @@ class UserRepository extends BaseRepository
                 break;
             }
         }
+        if ($identityId < $userData['user_group']) {
+            $identityId = $userData['user_group'];
+        }
         return $identityId;
     }
 
@@ -3638,13 +3644,13 @@ class UserRepository extends BaseRepository
                         break;
                     }
                 }
-                if (!empty($myIdentityUpTime) && !empty($yeWuYuanId)) {
-                    $userData['identity_up_time'] = $myIdentityUpTime;
-                    $userData['user_group'] = $yeWuYuanId;
-                    $this->dao->update($uid, [
-                        'identity_up_time' => $userData['identity_up_time'],
-                        'user_group' => $yeWuYuanId
-                    ]);
+                if (!empty($myIdentityUpTime)) {
+                    $data['identity_up_time'] = $userData['identity_up_time'] = $myIdentityUpTime;
+                    // 只升级 不降级
+                    if ($userData['user_group'] == 1) {
+                        $userData['user_group'] = $yeWuYuanId;
+                    }
+                    $this->dao->update($uid, $data);
                 }
             }
         }