|
|
@@ -239,19 +239,6 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
if (CollectionUtil.isNotEmpty(upgradePackages)){
|
|
|
upgradePackages.stream().map(e -> e.getPrice().divide(BigDecimal.valueOf(e.getNum()), 2, RoundingMode.HALF_UP)).min(BigDecimal::compareTo).ifPresent(ticket::setMjPackagePrice);
|
|
|
}
|
|
|
- }
|
|
|
- List<GroupsRelationUserView> relationUserViews = groupsRelationMapper.getUserRelationUserViews(ticket.getGroupId(), ticket.getRelationId(), ticket.getUserId(), List.of(GroupsRelation.Status.validity, GroupsRelation.Status.outside));
|
|
|
- ticket.setRelationViews(relationUserViews);
|
|
|
- if (ticket.getExpiryTime() != null) {
|
|
|
- ticket.setExpiryTimeStr(DateUtil.format(ticket.getExpiryTime(), "yyyy-MM-dd"));
|
|
|
- }
|
|
|
- //查看双重验证码
|
|
|
- if (StrUtil.isNotEmpty(ticket.getApiSecret())) {
|
|
|
- Boolean isHasVerifyCode = StrUtil.isNotBlank(ticket.getVerifyCode()) ? true : false;
|
|
|
- Integer codeNum = getUserCodeNumBySkuId(ticket.getUserId(), ticket.getSkuId(), isHasVerifyCode);
|
|
|
- ticket.setCodeNum(codeNum);
|
|
|
- }
|
|
|
- if (ticket.getGoodsId() == 26l) {
|
|
|
MidjourneyUserView search = beanSearcher.searchFirst(MidjourneyUserView.class, MapUtils.flatBuilder(request.getParameterMap())
|
|
|
.field(MidjourneyUserView::getUserId, ticket.getUserId()).field(MidjourneyUserView::getRelationId, ticket.getRelationId())
|
|
|
.onlySelect(MidjourneyUserView::getMjFastNum, MidjourneyUserView::getMjRelaxNum)
|
|
|
@@ -265,6 +252,17 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
ticket.setMjUserRelaxNum(search.getMjRelaxNum());
|
|
|
}
|
|
|
}
|
|
|
+ List<GroupsRelationUserView> relationUserViews = groupsRelationMapper.getUserRelationUserViews(ticket.getGroupId(), ticket.getRelationId(), ticket.getUserId(), List.of(GroupsRelation.Status.validity, GroupsRelation.Status.outside));
|
|
|
+ ticket.setRelationViews(relationUserViews);
|
|
|
+ if (ticket.getExpiryTime() != null) {
|
|
|
+ ticket.setExpiryTimeStr(DateUtil.format(ticket.getExpiryTime(), "yyyy-MM-dd"));
|
|
|
+ }
|
|
|
+ //查看双重验证码
|
|
|
+ if (StrUtil.isNotEmpty(ticket.getApiSecret())) {
|
|
|
+ Boolean isHasVerifyCode = StrUtil.isNotBlank(ticket.getVerifyCode()) ? true : false;
|
|
|
+ Integer codeNum = getUserCodeNumBySkuId(ticket.getUserId(), ticket.getSkuId(), isHasVerifyCode);
|
|
|
+ ticket.setCodeNum(codeNum);
|
|
|
+ }
|
|
|
});
|
|
|
userLoginRecordService.saveUserLoginDayRecord(userId);
|
|
|
return list;
|