|
@@ -329,6 +329,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
views.setSkuList(beanSearcher.searchAll(GoodsDonSkuFrontView.class, MapUtils.builder().field(GoodsDonSkuFrontView::getGoodsId, views.getId()).field(GoodsDonSkuFrontView::getStatus, true).build()));
|
|
views.setSkuList(beanSearcher.searchAll(GoodsDonSkuFrontView.class, MapUtils.builder().field(GoodsDonSkuFrontView::getGoodsId, views.getId()).field(GoodsDonSkuFrontView::getStatus, true).build()));
|
|
|
ticket.setGoodsDonViews(views);
|
|
ticket.setGoodsDonViews(views);
|
|
|
}
|
|
}
|
|
|
|
|
+ Date expiryTime = ticket.getExpiryTime();
|
|
|
if (ticket.getMonths() != null && ticket.getMonths() >= 300) {
|
|
if (ticket.getMonths() != null && ticket.getMonths() >= 300) {
|
|
|
ticket.setExpiryTime(null);
|
|
ticket.setExpiryTime(null);
|
|
|
}
|
|
}
|
|
@@ -438,7 +439,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
ticket.setReceivedGptGift(count.intValue() > 0);
|
|
ticket.setReceivedGptGift(count.intValue() > 0);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- markVipDeductTicket(userIds, ticket, vipGoodsIds, vipUserCount > 0);
|
|
|
|
|
|
|
+ markVipDeductTicket(userIds, ticket, vipGoodsIds, vipUserCount > 0, expiryTime);
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
userLoginRecordService.saveUserLoginDayRecord(userId);
|
|
userLoginRecordService.saveUserLoginDayRecord(userId);
|
|
@@ -2154,7 +2155,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
/**
|
|
/**
|
|
|
* 标记是否可抵扣会员车票
|
|
* 标记是否可抵扣会员车票
|
|
|
*/
|
|
*/
|
|
|
- private void markVipDeductTicket(List<Long> userIds, RenewalView ticket, Set<Long> vipGoodsIds, Boolean isVip) {
|
|
|
|
|
|
|
+ private void markVipDeductTicket(List<Long> userIds, RenewalView ticket, Set<Long> vipGoodsIds, Boolean isVip, Date expiryTime) {
|
|
|
if (CollUtil.isNotEmpty(vipGoodsIds) && ticket.getIsMirror() != null && ticket.getIsMirror() && !isVip) {
|
|
if (CollUtil.isNotEmpty(vipGoodsIds) && ticket.getIsMirror() != null && ticket.getIsMirror() && !isVip) {
|
|
|
Long goodsId = ticket.getGoodsId();
|
|
Long goodsId = ticket.getGoodsId();
|
|
|
//只购买
|
|
//只购买
|
|
@@ -2167,7 +2168,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
.field(RenewalView::getRelationId, ticket.getRelationId()).op(Operator.NotEqual)
|
|
.field(RenewalView::getRelationId, ticket.getRelationId()).op(Operator.NotEqual)
|
|
|
.field(RenewalView::getGoodsId, goodsId)
|
|
.field(RenewalView::getGoodsId, goodsId)
|
|
|
.field(RenewalView::getUserId, userIds).op(Operator.InList)
|
|
.field(RenewalView::getUserId, userIds).op(Operator.InList)
|
|
|
- .field(RenewalView::getExpiryTime, ticket.getExpiryTime()).op(Operator.GreaterThan)
|
|
|
|
|
|
|
+ .field(RenewalView::getExpiryTime, expiryTime).op(Operator.GreaterThan)
|
|
|
.build());
|
|
.build());
|
|
|
if (number.intValue() == 0) {
|
|
if (number.intValue() == 0) {
|
|
|
ticket.setIsVipDeduct(true);
|
|
ticket.setIsVipDeduct(true);
|