|
|
@@ -1764,12 +1764,15 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * @param preSkuId 续费之前的规格id
|
|
|
- * @param preRelationId 续费之前的座位id
|
|
|
- * @param orderId 订单id
|
|
|
+ * @param orderDon 续费订单
|
|
|
* @param afterSku 续费之后的规格
|
|
|
*/
|
|
|
- private void changeTicketAndRecord(Long preSkuId, Long preRelationId, Long orderId, Integer num, GoodsDonSku afterSku, Long userId) {
|
|
|
+ private void changeTicketAndRecord(OrderDon orderDon,GoodsDonSku afterSku) {
|
|
|
+ Long preSkuId = orderDon.getSkuId();
|
|
|
+ Long preRelationId = orderDon.getRelationId();
|
|
|
+ Long orderId = orderDon.getId();
|
|
|
+ Integer num = orderDon.getNum();
|
|
|
+ Long userId = orderDon.getUserId();
|
|
|
//清理之前的车票
|
|
|
GroupsRelation relation = groupsRelationMapper.selectById(preRelationId);
|
|
|
if (relation != null) {
|
|
|
@@ -1787,6 +1790,10 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
afterRelation.setExpiryTime(afterExpiryTime);
|
|
|
groupsRelationMapper.updateById(afterRelation);
|
|
|
|
|
|
+ //更新订单对应的relation_id
|
|
|
+ orderDon.setRelationId(afterRelation.getId());
|
|
|
+ orderDonMapper.updateById(orderDon);
|
|
|
+
|
|
|
//保存更换车票记录
|
|
|
saveChangeTicketRecord(preStartTime, preExpiryTime, preRelationId, userId, preSkuId, orderId, num, afterSku, afterRelation.getId());
|
|
|
|
|
|
@@ -1814,6 +1821,10 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
.set(GroupsRelation::getExpiryTime, relationView.getExpiryTime())
|
|
|
.eq(GroupsRelation::getId, relationView.getId()));
|
|
|
|
|
|
+ //更新订单对应的relation_id
|
|
|
+ orderDon.setRelationId(relationView.getId());
|
|
|
+ orderDonMapper.updateById(orderDon);
|
|
|
+
|
|
|
//保存更换车票记录
|
|
|
saveChangeTicketRecord(preStartTime, preExpiryTime, relationView.getId(), userId, preSkuId, orderId, num, afterSku, relationView.getId());
|
|
|
}
|
|
|
@@ -2173,7 +2184,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
public void updateGroupsTicket(OrderDon orderDon, GoodsDon goodsDon, GoodsDonSku sku) {
|
|
|
if (orderDon.getOrderType() == 2 && orderDon.getIsChangeTicket()) {
|
|
|
//将奈飞月付车票更换成其他规格的车票
|
|
|
- changeTicketAndRecord(orderDon.getPreSkuId(), orderDon.getRelationId(), orderDon.getId(), orderDon.getNum(), sku, orderDon.getUserId());
|
|
|
+ changeTicketAndRecord(orderDon, sku);
|
|
|
} else {
|
|
|
//修改车位状态并发送模板消息
|
|
|
updateCarParkAndSendMsg(goodsDon, sku, orderDon);
|