|
@@ -104,15 +104,18 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserMapper, StoreUser
|
|
|
lambdaQueryWrapper.eq(StoreUser::getPhone, phone);
|
|
lambdaQueryWrapper.eq(StoreUser::getPhone, phone);
|
|
|
StoreUser user = this.getOne(lambdaQueryWrapper);
|
|
StoreUser user = this.getOne(lambdaQueryWrapper);
|
|
|
StoreUserVo storeUserVo = new StoreUserVo();
|
|
StoreUserVo storeUserVo = new StoreUserVo();
|
|
|
- if (user.getStatus() == -1) {
|
|
|
|
|
- LocalDateTime localDateTime = user.getLogoutTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
|
|
|
|
|
- LocalDateTime future = localDateTime.plusDays(7);
|
|
|
|
|
- LocalDateTime now = LocalDateTime.now();
|
|
|
|
|
- Duration duration = Duration.between(now, future);
|
|
|
|
|
- long correct = duration.toMillis();
|
|
|
|
|
- storeUserVo.setCountdown(correct);
|
|
|
|
|
|
|
+ if(user != null){
|
|
|
|
|
+ if (user.getStatus() == -1) {
|
|
|
|
|
+ LocalDateTime localDateTime = user.getLogoutTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
|
|
|
|
|
+ LocalDateTime future = localDateTime.plusDays(7);
|
|
|
|
|
+ LocalDateTime now = LocalDateTime.now();
|
|
|
|
|
+ Duration duration = Duration.between(now, future);
|
|
|
|
|
+ long correct = duration.toMillis();
|
|
|
|
|
+ storeUserVo.setCountdown(correct);
|
|
|
|
|
+ }
|
|
|
|
|
+ }else {
|
|
|
|
|
+ return new StoreUserVo();
|
|
|
}
|
|
}
|
|
|
- if (null == user) return new StoreUserVo();
|
|
|
|
|
BeanUtils.copyProperties(user, storeUserVo);
|
|
BeanUtils.copyProperties(user, storeUserVo);
|
|
|
storeUserVo.setMoneyStr(new BigDecimal(storeUserVo.getMoney()).divide(new BigDecimal(100), 2, RoundingMode.DOWN).toString());
|
|
storeUserVo.setMoneyStr(new BigDecimal(storeUserVo.getMoney()).divide(new BigDecimal(100), 2, RoundingMode.DOWN).toString());
|
|
|
return storeUserVo;
|
|
return storeUserVo;
|