소스 검색

fix 退款扣除权益加减去3天

zoujiajian 3 년 전
부모
커밋
db2dc28e0e

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

@@ -110,7 +110,6 @@ public class UserRealOrderBenefitsImpl implements UserRealOrderBenefitsService {
 				.eq(UserPayEquipmentReceiveBenefitsRecord::getRealOrderId, orderId))).orElse(new ArrayList<>());
 		benefitsRecords.forEach(benefitsRecord -> {
 			//扣除领取的权益
-			Long benefitsRecordId = benefitsRecord.getId();
 			deductReceivedBenefits(benefitsRecord.getUserId(), benefitsRecord.getTicketOrderId(), benefitsRecord.getRelationId(), benefitsRecord.getMonths());
 			benefitsRecord.setStatusCode(0);
 			receiveBenefitsRecordMapper.updateById(benefitsRecord);
@@ -243,6 +242,7 @@ public class UserRealOrderBenefitsImpl implements UserRealOrderBenefitsService {
 		} 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);

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

@@ -60,6 +60,8 @@ public class GroupRelationClearServiceImpl implements GroupRelationClearService
 						MapUtils.builder().field(GroupsRelationView::getId, relationId).build());
 				if (groupsTrips != null) {
 					UserTicketClearedRecord userTicketClearedRecord = new UserTicketClearedRecord();
+					userTicketClearedRecord.setAccountId(groupsTrips.getAccountId());
+					userTicketClearedRecord.setAccount(groupsTrips.getTripsAccount());
 					userTicketClearedRecord.setRelationId(relationId);
 					userTicketClearedRecord.setUserId(userId);
 					userTicketClearedRecord.setGoodsId(groupsTrips.getGoodsId());