|
@@ -84,10 +84,14 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
}
|
|
}
|
|
|
if (ticket.getExpiryTime() != null && ticket.getGoodsType() == 1 && ticket.getSecondType() == 2) {
|
|
if (ticket.getExpiryTime() != null && ticket.getGoodsType() == 1 && ticket.getSecondType() == 2) {
|
|
|
String remainDays = DateUtil.formatBetween(now, ticket.getExpiryTime(), BetweenFormater.Level.DAY);
|
|
String remainDays = DateUtil.formatBetween(now, ticket.getExpiryTime(), BetweenFormater.Level.DAY);
|
|
|
|
|
+ if ("0天".equals(remainDays)) {
|
|
|
|
|
+ remainDays = "小于1天";
|
|
|
|
|
+ }
|
|
|
ticket.setRemainDays(remainDays);
|
|
ticket.setRemainDays(remainDays);
|
|
|
}
|
|
}
|
|
|
List<GroupsRelationUserView> relationUserViews = groupsRelationMapper.getUserRelationUserViews(ticket.getGroupId(), ticket.getRelationId(), ticket.getUserId(), List.of(GroupsRelation.Status.validity, GroupsRelation.Status.outside));
|
|
List<GroupsRelationUserView> relationUserViews = groupsRelationMapper.getUserRelationUserViews(ticket.getGroupId(), ticket.getRelationId(), ticket.getUserId(), List.of(GroupsRelation.Status.validity, GroupsRelation.Status.outside));
|
|
|
ticket.setRelationViews(relationUserViews);
|
|
ticket.setRelationViews(relationUserViews);
|
|
|
|
|
+ ticket.setExpiryTime(DateUtil.parse(ticket.getExpiryTime().toString(), "yyyy-MM-dd"));
|
|
|
return true;
|
|
return true;
|
|
|
}).collect(Collectors.toList());
|
|
}).collect(Collectors.toList());
|
|
|
return collect;
|
|
return collect;
|