|
@@ -375,7 +375,7 @@ public class VipOrderDonServiceImpl extends ServiceImpl<VipOrderDonMapper, VipOr
|
|
|
}
|
|
}
|
|
|
} else vipUserMapper.updateById(vipUser);
|
|
} else vipUserMapper.updateById(vipUser);
|
|
|
//发送车票
|
|
//发送车票
|
|
|
- sendVipTicketToUser(vipUser.getUserId(), vipUser.getExpiryTime(), userIdList, orderDon.getId());
|
|
|
|
|
|
|
+ sendVipTicketToUser(vipUser.getUserId(), vipUser.getStartTime(), vipUser.getExpiryTime(), userIdList, orderDon.getId());
|
|
|
} else {
|
|
} else {
|
|
|
//续费订单
|
|
//续费订单
|
|
|
vipUser.setExpiryTime(DateUtil.offsetMonth(vipUser.getExpiryTime(), 1));
|
|
vipUser.setExpiryTime(DateUtil.offsetMonth(vipUser.getExpiryTime(), 1));
|
|
@@ -390,7 +390,7 @@ public class VipOrderDonServiceImpl extends ServiceImpl<VipOrderDonMapper, VipOr
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- private void sendVipTicketToUser(Long userId, Date vipExpiryTime, List<Long> userIds, Long orderId) {
|
|
|
|
|
|
|
+ private void sendVipTicketToUser(Long userId, Date vipStartTime, Date vipExpiryTime, List<Long> userIds, Long orderId) {
|
|
|
//是否存在抵扣 抵扣成功 清除车票
|
|
//是否存在抵扣 抵扣成功 清除车票
|
|
|
VipOrderDonDeductRelation vipOrderDonDeductRelation = vipOrderDonDeductRelationMapper.selectOne(Wrappers.lambdaQuery(VipOrderDonDeductRelation.class)
|
|
VipOrderDonDeductRelation vipOrderDonDeductRelation = vipOrderDonDeductRelationMapper.selectOne(Wrappers.lambdaQuery(VipOrderDonDeductRelation.class)
|
|
|
.eq(VipOrderDonDeductRelation::getOrderId, orderId)
|
|
.eq(VipOrderDonDeductRelation::getOrderId, orderId)
|
|
@@ -413,7 +413,10 @@ public class VipOrderDonServiceImpl extends ServiceImpl<VipOrderDonMapper, VipOr
|
|
|
deductSkuIds = groupsRelationViews.stream().map(GroupsRelationView::getSkuId).collect(Collectors.toList());
|
|
deductSkuIds = groupsRelationViews.stream().map(GroupsRelationView::getSkuId).collect(Collectors.toList());
|
|
|
//将车票弄成会员类型
|
|
//将车票弄成会员类型
|
|
|
relationMapper.update(null, Wrappers.lambdaUpdate(GroupsRelation.class)
|
|
relationMapper.update(null, Wrappers.lambdaUpdate(GroupsRelation.class)
|
|
|
|
|
+ .set(GroupsRelation::getUserId, userId)
|
|
|
.set(GroupsRelation::getIsVip, Boolean.TRUE)
|
|
.set(GroupsRelation::getIsVip, Boolean.TRUE)
|
|
|
|
|
+ .set(GroupsRelation::getStartTime, vipStartTime)
|
|
|
|
|
+ .set(GroupsRelation::getExpiryTime, vipExpiryTime)
|
|
|
.in(GroupsRelation::getUserId, userIds)
|
|
.in(GroupsRelation::getUserId, userIds)
|
|
|
.in(GroupsRelation::getId, deductRelationIds));
|
|
.in(GroupsRelation::getId, deductRelationIds));
|
|
|
//重置镜像user
|
|
//重置镜像user
|