|
@@ -1043,6 +1043,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
RenewalView renewalView = beanSearcher.searchFirst(RenewalView.class, MapUtils.builder()
|
|
RenewalView renewalView = beanSearcher.searchFirst(RenewalView.class, MapUtils.builder()
|
|
|
.field(RenewalView::getRelationId, relationId)
|
|
.field(RenewalView::getRelationId, relationId)
|
|
|
.field(RenewalView::getUserId, userIdList).op(Operator.InList)
|
|
.field(RenewalView::getUserId, userIdList).op(Operator.InList)
|
|
|
|
|
+ .field(RenewalView::getGroupsStatus, GroupsTrips.Status.down.name())
|
|
|
.field(RenewalView::getExpiryTime, DateTime.now()).op(Operator.GreaterThan)
|
|
.field(RenewalView::getExpiryTime, DateTime.now()).op(Operator.GreaterThan)
|
|
|
.build());
|
|
.build());
|
|
|
if (renewalView == null) {
|
|
if (renewalView == null) {
|
|
@@ -1056,16 +1057,20 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
Account account;
|
|
Account account;
|
|
|
if (netflixTempAccountUser == null) {
|
|
if (netflixTempAccountUser == null) {
|
|
|
account = accountMapper.selectNetflixTempAccount();
|
|
account = accountMapper.selectNetflixTempAccount();
|
|
|
- netflixTempAccountUser = new NetflixTempAccountUser();
|
|
|
|
|
- netflixTempAccountUser.setAccountId(account.getId());
|
|
|
|
|
- netflixTempAccountUser.setRelationId(relationId);
|
|
|
|
|
- netflixTempAccountUser.setUserId(renewalView.getUserId());
|
|
|
|
|
- netflixTempAccountUserMapper.insert(netflixTempAccountUser);
|
|
|
|
|
|
|
+ if (account != null) {
|
|
|
|
|
+ netflixTempAccountUser = new NetflixTempAccountUser();
|
|
|
|
|
+ netflixTempAccountUser.setAccountId(account.getId());
|
|
|
|
|
+ netflixTempAccountUser.setRelationId(relationId);
|
|
|
|
|
+ netflixTempAccountUser.setUserId(renewalView.getUserId());
|
|
|
|
|
+ netflixTempAccountUserMapper.insert(netflixTempAccountUser);
|
|
|
|
|
+ }
|
|
|
} else {
|
|
} else {
|
|
|
account = accountMapper.selectById(netflixTempAccountUser.getAccountId());
|
|
account = accountMapper.selectById(netflixTempAccountUser.getAccountId());
|
|
|
}
|
|
}
|
|
|
- accountView.setAccount(account.getAccount());
|
|
|
|
|
- accountView.setPassword(account.getPassword());
|
|
|
|
|
|
|
+ if (account != null) {
|
|
|
|
|
+ accountView.setAccount(account.getAccount());
|
|
|
|
|
+ accountView.setPassword(account.getPassword());
|
|
|
|
|
+ }
|
|
|
return accountView;
|
|
return accountView;
|
|
|
}
|
|
}
|
|
|
|
|
|