|
|
@@ -12,6 +12,7 @@ import com.cyksj.mapper.corp.CorpUserMapper;
|
|
|
import com.cyksj.model.entity.*;
|
|
|
import com.cyksj.model.views.CorpUserFollowView;
|
|
|
import com.cyksj.model.views.GoodsDonViews;
|
|
|
+import com.cyksj.model.views.GroupsRelationUserView;
|
|
|
import com.cyksj.model.views.RenewalView;
|
|
|
import com.cyksj.service.mange.coupon.CouponCommonService;
|
|
|
import com.cyksj.service.relation.GroupRelationFrontService;
|
|
|
@@ -82,11 +83,12 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
views.setSkuList(beanSearcher.searchAll(GoodsDonSku.class, MapUtils.builder().field(GoodsDonSku::getGoodsId, views.getId()).field(GoodsDonSku::getStatus, true).build()));
|
|
|
ticket.setGoodsDonViews(views);
|
|
|
}
|
|
|
- if (ticket.getGoodsType() == 1 && ticket.getSecondType() == 2 && ticket.getMonths() < 300 && ticket.getExpiryTime() != null) {
|
|
|
+ if (ticket.getExpiryTime() != null && ticket.getGoodsType() == 1 && ticket.getSecondType() == 2 && ticket.getMonths() < 300) {
|
|
|
String remainDays = DateUtil.formatBetween(now, ticket.getExpiryTime());
|
|
|
-
|
|
|
- ticket.setRemainDays();
|
|
|
+ ticket.setRemainDays(remainDays);
|
|
|
}
|
|
|
+ List<GroupsRelationUserView> relationUserViews = groupsRelationMapper.getUserRelationUserViews(ticket.getGroupId(), ticket.getRelationId(), ticket.getUserId(), List.of(GroupsRelation.Status.validity, GroupsRelation.Status.outside));
|
|
|
+ ticket.setRelationViews(relationUserViews);
|
|
|
return true;
|
|
|
}).collect(Collectors.toList());
|
|
|
return collect;
|