fix outside状态车票更新时间

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

@@ -55,7 +55,7 @@ public class OrderCommonServiceImpl implements OrderCommonService {
 			GroupsRelation relation = groupsRelationMapper.selectOne(Wrappers.lambdaQuery(GroupsRelation.class)
 					.eq(GroupsRelation::getUserId, orderDon.getUserId())
 					.eq(GroupsRelation::getId, relationId)
-					.eq(GroupsRelation::getStatus, GroupsRelation.Status.validity));
+					.in(GroupsRelation::getStatus, List.of(GroupsRelation.Status.validity, GroupsRelation.Status.outside)));
 			//车票变更之后
 			if (relation == null || orderDon.getIsChangeTicket()) {
 				UserRenewChangeTicketRecord record = userRenewChangeTicketRecordMapper.selectOne(Wrappers.lambdaQuery(UserRenewChangeTicketRecord.class)
@@ -98,7 +98,9 @@ public class OrderCommonServiceImpl implements OrderCommonService {
 				}
 				if (isFlag) {
 					relation.setUserId(0l);
-					relation.setStatus(GroupsRelation.Status.none);
+					if (relation.getStatus() != GroupsRelation.Status.outside) {
+						relation.setStatus(GroupsRelation.Status.none);
+					}
 					if (expiryTime != null) {
 						relation.setStartTime(null);
 						relation.setExpiryTime(null);
@@ -109,7 +111,9 @@ public class OrderCommonServiceImpl implements OrderCommonService {
 					} else {
 						groupsRelationMapper.updateById(relation);
 					}
-					delRelation(relation.getId());
+					if (relation.getStatus() != GroupsRelation.Status.outside) {
+						delRelation(relation.getId());
+					}
 				} else {
 					if (expiryTime != null) {
 						relation.setExpiryTime(DateUtil.offsetMonth(expiryTime, -months * num));

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

@@ -1106,7 +1106,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			}
 
 			GroupsTrips groupsTrips = groupsMapper.selectById(relation.getGroupsId());
-			if (GroupsRelation.Status.locking.equals(relation.getStatus()) || GroupsRelation.Status.validity.equals(relation.getStatus())) {
+			if (GroupsRelation.Status.locking.equals(relation.getStatus()) || GroupsRelation.Status.validity.equals(relation.getStatus()) || GroupsRelation.Status.outside.equals(relation.getStatus())) {
 				log.info("订单号orderNo:{}开始修改车位:{}状态", order.getOrderNo(), relation.getId());
 				relation.setStatus(GroupsRelation.Status.validity);
 				//续费后,下一次续费意愿状态为false