|
@@ -6,6 +6,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
|
|
|
import com.huifu.adapay.core.exception.BaseAdaPayException;
|
|
import com.huifu.adapay.core.exception.BaseAdaPayException;
|
|
|
import com.izouma.nineth.TokenHistory;
|
|
import com.izouma.nineth.TokenHistory;
|
|
|
import com.izouma.nineth.config.Constants;
|
|
import com.izouma.nineth.config.Constants;
|
|
|
|
|
+import com.izouma.nineth.domain.Collection;
|
|
|
import com.izouma.nineth.domain.Follow;
|
|
import com.izouma.nineth.domain.Follow;
|
|
|
import com.izouma.nineth.domain.IdentityAuth;
|
|
import com.izouma.nineth.domain.IdentityAuth;
|
|
|
import com.izouma.nineth.domain.Invite;
|
|
import com.izouma.nineth.domain.Invite;
|
|
@@ -46,6 +47,7 @@ import org.springframework.stereotype.Service;
|
|
|
import javax.persistence.criteria.Predicate;
|
|
import javax.persistence.criteria.Predicate;
|
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
|
|
|
+import java.time.LocalDateTime;
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
|
import java.util.regex.Pattern;
|
|
import java.util.regex.Pattern;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
@@ -72,6 +74,7 @@ public class UserService {
|
|
|
private CacheService cacheService;
|
|
private CacheService cacheService;
|
|
|
private ApplicationContext context;
|
|
private ApplicationContext context;
|
|
|
private TokenHistoryRepo tokenHistoryRepo;
|
|
private TokenHistoryRepo tokenHistoryRepo;
|
|
|
|
|
+ private CollectionRepo collectionRepo;
|
|
|
|
|
|
|
|
public User update(User user) {
|
|
public User update(User user) {
|
|
|
User orig = userRepo.findById(user.getId()).orElseThrow(new BusinessException("无记录"));
|
|
User orig = userRepo.findById(user.getId()).orElseThrow(new BusinessException("无记录"));
|
|
@@ -156,6 +159,16 @@ public class UserService {
|
|
|
invite = inviteRepo.findFirstByCode(inviteCode).orElse(null);
|
|
invite = inviteRepo.findFirstByCode(inviteCode).orElse(null);
|
|
|
}
|
|
}
|
|
|
smsService.verify(phone, code);
|
|
smsService.verify(phone, code);
|
|
|
|
|
+ if (collectionId != null) {
|
|
|
|
|
+ Collection collection = collectionRepo.findById(collectionId).orElseThrow(new BusinessException("无藏品"));
|
|
|
|
|
+ if (!collection.isOnShelf() || !collection.isSalable()) {
|
|
|
|
|
+ collectionId = null;
|
|
|
|
|
+ } else if (collection.isScheduleSale()) {
|
|
|
|
|
+ if (collection.getStartTime().isAfter(LocalDateTime.now())){
|
|
|
|
|
+ collectionId = null;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
User user = create(UserRegister.builder()
|
|
User user = create(UserRegister.builder()
|
|
|
.authorities(Collections.singleton(Authority.get(AuthorityName.ROLE_USER)))
|
|
.authorities(Collections.singleton(Authority.get(AuthorityName.ROLE_USER)))
|
|
|
.username(name)
|
|
.username(name)
|