fix 车票续费车队状态校验

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -462,12 +462,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		}
 
 		if (!order.getIsNoLogin()) {
-			if (order.getOrderType() == 2 && order.getIsChangeTicket()) {
-				//将奈飞月付车票更换成其他规格的车票
-				changeTicketAndRecord(order.getPreSkuId(), order.getRelationId(), order.getId(), order.getNum(), sku, order.getUserId());
-			} else {
-				updateCarParkAndSendMsg(goodsDon, sku, order);
-			}
+			//更新座位信息
+			updateGroupsTicket(order, goodsDon, sku);
 			if (order.getMoney().compareTo(BigDecimal.ZERO) > 0 && order.getIsDistribute()) {
 				TASK_POOL.execute(() -> distributeWaitingSendPointsRecord(order));
 			}
@@ -1116,7 +1112,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				//续费后,下一次续费意愿状态为false
 				relation.setRenewStatus(false);
 				relation.setIsHandle(false);
-				if (GroupsTrips.Status.validity.equals(groupsTrips.getStatus())) {
+				if (GroupsTrips.Status.validity.equals(groupsTrips.getStatus()) || GroupsTrips.Status.down.equals(groupsTrips.getStatus())) {
 					//如果续费增加时间，如果首次则设置当前时间为初始时间
 					Date expiryTime = Optional.ofNullable(relation.getExpiryTime()).orElse(new Date());
 					GoodsDonSku donSku = goodsDonSkuMapper.selectById(order.getSkuId());
@@ -1650,12 +1646,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		if (isSuccess) {
 			//更新车位情况
 			GoodsDonSku sku = goodsDonSkuMapper.selectById(orderDon.getSkuId());
-			if (orderDon.getOrderType() == 2 && orderDon.getIsChangeTicket()) {
-				//将奈飞月付车票更换成其他规格的车票
-				changeTicketAndRecord(orderDon.getPreSkuId(), orderDon.getRelationId(), orderDon.getId(), orderDon.getNum(), sku, orderDon.getUserId());
-			} else {
-				updateCarParkAndSendMsg(goodsDon, sku, orderDon);
-			}
+			//更新座位信息
+			updateGroupsTicket(orderDon, goodsDon, sku);
 			updateById(orderDon);
 			return orderDon.getStatus();
 		}