fix

netflix-dao/src/main/java/com/cyksj/model/response/NetflixRecoverResp.java

@@ -20,7 +20,7 @@ public class NetflixRecoverResp {
 	private Long remainDays;
 
 	/**
-	 * 是否设置成功
+	 * 是否替换车票成功
 	 */
 	private Boolean isReset = false;
 }

netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -1534,13 +1534,6 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				Long skuId = netflixRelationView.getSkuId();
 				GoodsDonSku sku = goodsDonSkuMapper.selectById(skuId);
 				GroupsRelation relation = getRelation(null, userId, sku, null);
-				if (relation == null) {
-					//还原冻结状态
-					groupsRelationMapper.update(null, Wrappers.lambdaUpdate(GroupsRelation.class)
-							.set(GroupsRelation::getIsFrozen, Boolean.TRUE)
-							.eq(GroupsRelation::getId, netflixRelationView.getId())
-							.eq(GroupsRelation::getIsFrozen, Boolean.FALSE));
-				}
 				if (relation != null) {
 					Long groupsId = relation.getGroupsId();
 					GroupsTrips groupsTrips = groupsMapper.selectById(groupsId);

netflix-web/src/main/java/com/cyksj/web/controller/manage/statistics/StatisticsDataController.java

@@ -32,6 +32,7 @@ import com.cyksj.model.request.RedBookReq;
 import com.cyksj.model.request.RenewTimeUpReq;
 import com.cyksj.model.views.*;
 import com.cyksj.service.mange.statistics.StatisticsDataService;
+import com.cyksj.service.relation.GroupRelationClearService;
 import com.cyksj.web.util.EasyExcelUtils;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
@@ -92,6 +93,8 @@ public class StatisticsDataController {
 
 	private final CmsUserMapper cmsUserMapper;
 
+	private final GroupRelationClearService clearService;
+
 	private final HttpServletRequest request;
 
 	/**
@@ -238,6 +241,11 @@ public class StatisticsDataController {
 		incrExpiryTimeRecord.setRelationId(relation.getId());
 		Optional.ofNullable(cmsUserMapper.selectById(adminId)).ifPresent(admin -> incrExpiryTimeRecord.setOperator(admin.getNickname()));
 		incrExpiryTimeRecordMapper.insert(incrExpiryTimeRecord);
+
+		//清除车票
+		if (relation.getExpiryTime().before(DateTime.now())) {
+			clearService.clearTicket(relation, UserTicketClearedRecord.Source.manual);
+		}
 		return GatewayResponse.SUCCESS.newBuilder().toResult("增加车票有效期成功");
 	}