fix 冲突

netflix-service/src/main/java/com/cyksj/service/distribute/equipment/impl/EquipmentDistributeServiceImpl.java

@@ -188,13 +188,13 @@ public class EquipmentDistributeServiceImpl implements EquipmentDistributeServic
 		}
 		if (expiryTime == null) {
 			//未发车直接清除车票
-			groupRelationClearService.clearTicket(relation,, UserTicketClearedRecord.Source.distribute);
+			groupRelationClearService.clearTicket(relation, UserTicketClearedRecord.Source.distribute);
 		} else {
 			DateTime now = DateTime.now();
 			Date finalDate = DateUtil.offset(expiryTime, DateField.MONTH, -months);
 			if (now.isAfter(finalDate)) {
 				//过期 直接清除车票
-				groupRelationClearService.clearTicket(relation,, UserTicketClearedRecord.Source.distribute);
+				groupRelationClearService.clearTicket(relation, UserTicketClearedRecord.Source.distribute);
 			} else {
 				relation.setExpiryTime(finalDate);
 				groupsRelationMapper.updateById(relation);

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

@@ -238,14 +238,14 @@ public class UserRealOrderBenefitsImpl implements UserRealOrderBenefitsService {
 		}
 		if (expiryTime == null) {
 			//未发车直接清除车票
-			groupRelationClearService.clearTicket(relation);
+			groupRelationClearService.clearTicket(relation, UserTicketClearedRecord.Source.pay_equipment);
 		} else {
 			DateTime now = DateTime.now();
 			Date finalDate = DateUtil.offset(expiryTime, DateField.MONTH, -months);
 			finalDate = DateUtil.offsetDay(finalDate, -3);
 			if (now.isAfter(finalDate)) {
 				//过期 直接清除车票
-				groupRelationClearService.clearTicket(relation);
+				groupRelationClearService.clearTicket(relation, UserTicketClearedRecord.Source.pay_equipment);
 			} else {
 				relation.setExpiryTime(finalDate);
 				groupsRelationMapper.updateById(relation);

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

@@ -35,7 +35,7 @@ public class GroupRelationClearServiceImpl implements GroupRelationClearService
 	private final UserTicketClearedRecordMapper userTicketClearedRecordMapper;
 
 	@Override
-	public void clearTicket(GroupsRelation relation,, UserTicketClearedRecord.Source source) {
+	public void clearTicket(GroupsRelation relation, UserTicketClearedRecord.Source source) {
 		Long relationId = relation.getId();
 		Long userId = relation.getUserId();
 		Date startTime = relation.getStartTime();