|
|
@@ -329,7 +329,6 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
views.setSkuList(beanSearcher.searchAll(GoodsDonSkuFrontView.class, MapUtils.builder().field(GoodsDonSkuFrontView::getGoodsId, views.getId()).field(GoodsDonSkuFrontView::getStatus, true).build()));
|
|
|
ticket.setGoodsDonViews(views);
|
|
|
}
|
|
|
- Date expiryTime = ticket.getExpiryTime();
|
|
|
if (ticket.getMonths() != null && ticket.getMonths() >= 300) {
|
|
|
ticket.setExpiryTime(null);
|
|
|
}
|
|
|
@@ -2156,6 +2155,8 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
* 标记是否可抵扣会员车票
|
|
|
*/
|
|
|
private void markVipDeductTicket(List<Long> userIds, RenewalView ticket, Set<Long> vipGoodsIds, Boolean isVip) {
|
|
|
+ //nano 先不参与抵扣
|
|
|
+ vipGoodsIds.remove(Constant.NANO_GOODS_ID);
|
|
|
if (CollUtil.isNotEmpty(vipGoodsIds) && ticket.getIsMirror() != null && ticket.getIsMirror() && !isVip) {
|
|
|
Long goodsId = ticket.getGoodsId();
|
|
|
//只购买
|