|
|
@@ -14,6 +14,7 @@ import com.izouma.nineth.config.RedisKeys;
|
|
|
import com.izouma.nineth.domain.Collection;
|
|
|
import com.izouma.nineth.domain.*;
|
|
|
import com.izouma.nineth.dto.*;
|
|
|
+import com.izouma.nineth.enums.AssetStatus;
|
|
|
import com.izouma.nineth.enums.AuthStatus;
|
|
|
import com.izouma.nineth.enums.AuthorityName;
|
|
|
import com.izouma.nineth.event.AccountCreatedEvent;
|
|
|
@@ -99,6 +100,7 @@ public class UserService {
|
|
|
private UserBalanceRepo userBalanceRepo;
|
|
|
private ContentAuditService contentAuditService;
|
|
|
private AuctionPassRecordRepo auctionPassRecordRepo;
|
|
|
+ private AssetRepo assetRepo;
|
|
|
|
|
|
public User update(User user) {
|
|
|
if (!SecurityUtils.hasRole(AuthorityName.ROLE_ADMIN)) {
|
|
|
@@ -582,7 +584,7 @@ public class UserService {
|
|
|
throw new BusinessException("用户不存在或未认证");
|
|
|
}
|
|
|
String realName = identityAuthRepo.findFirstByUserIdAndStatusAndDelFalseOrderByCreatedAtDesc(
|
|
|
- user.getId(), AuthStatus.SUCCESS)
|
|
|
+ user.getId(), AuthStatus.SUCCESS)
|
|
|
.map(IdentityAuth::getRealName).orElse("").replaceAll(".*(?=.)", "**");
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
map.put("id", user.getId());
|
|
|
@@ -595,8 +597,8 @@ public class UserService {
|
|
|
|
|
|
public Map<String, Object> searchByPhoneAdmin(String phoneStr) {
|
|
|
List<String> phone = Arrays.stream(phoneStr.replaceAll("\n", " ")
|
|
|
- .replaceAll("\r\n", " ")
|
|
|
- .split(" "))
|
|
|
+ .replaceAll("\r\n", " ")
|
|
|
+ .split(" "))
|
|
|
.map(String::trim)
|
|
|
.filter(s -> !StringUtils.isEmpty(s))
|
|
|
.collect(Collectors.toList());
|
|
|
@@ -887,6 +889,14 @@ public class UserService {
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
+ public Map<String, Object> oasisInfo(Long userId) {
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
+ map.put("nickName", SecurityUtils.getAuthenticatedUser().getNickname());
|
|
|
+ map.put("oasisIds", assetRepo.findAllByOwnerIdAndStatusAndOasisIdNotNull(userId, AssetStatus.NORMAL).stream()
|
|
|
+ .map(Asset::getOasisId).collect(Collectors.toSet()));
|
|
|
+ return map;
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 流拍5次直接删号处罚
|
|
|
*/
|