Преглед на файлове

fix 30以内奈飞有效期,直接退款

zoujiajian преди 1 година
родител
ревизия
9b5f4217e5

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

@@ -1518,7 +1518,8 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				.lt(NetflixUserAccountSubmitRecoverRecord::getCreatedTime, recoverRecord.getCreatedTime())
 				.eq(NetflixUserAccountSubmitRecoverRecord::getStatus, 0));
 		NetflixRecoverResp recoverResp = new NetflixRecoverResp();
-		recoverResp.setIndex(selectCount + 1);
+		//往前加100位
+		recoverResp.setIndex(100 + selectCount + 1);
 		recoverResp.setRemainDays(recoverRecord.getRemainDays());
 		return recoverResp;
 	}
@@ -1533,8 +1534,8 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 		Date expiryTime = netflixRelationView.getExpiryTime();
 		//小于15 不可替换其他车票
 		Long betweenDay = DateUtil.betweenDay(DateTime.now(), expiryTime, false) + 1;
-		if (betweenDay <= 15) {
-			throw BusinessRuntimeException.getInstance("您的车票有效期未超过15天");
+		if (betweenDay <= 30) {
+			throw BusinessRuntimeException.getInstance("您的车票有效期未超过30天");
 		}
 		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
 		Integer count = netflixUserAccountSubmitRecoverRecordMapper.selectCount(Wrappers.lambdaQuery(NetflixUserAccountSubmitRecoverRecord.class)
@@ -1644,7 +1645,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				.last("limit 1"));
 		List<ErrorNetflixChangeOtherSkuTicketDto> errorNetflixChangeOtherSkuTicketDtos = Jsons.parseList(sysConfig.getSysValue(), ErrorNetflixChangeOtherSkuTicketDto.class);
 		ErrorNetflixChangeOtherSkuTicketDto errorNetflixChangeOtherSkuTicketDto;
-		if (betweenDay <= 15) {
+		if (betweenDay <= 30) {
 			return null;
 		}
 		//自定义顺序 直接获取
@@ -1672,7 +1673,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 		Long betweenDay = DateUtil.betweenDay(DateTime.now(), expiryTime, false) + 1;
 		NetflixRefundInfoResp refundInfoResp = new NetflixRefundInfoResp();
 		refundInfoResp.setIsRefund(true);
-		if (betweenDay > 15) {
+		if (betweenDay > 30) {
 			refundInfoResp.setIsRefund(false);
 		}
 		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
@@ -1717,8 +1718,8 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 		Date expiryTime = netflixRelationView.getExpiryTime();
 		//小于15
 		Long betweenDay = DateUtil.betweenDay(DateTime.now(), expiryTime, false) + 1;
-		if (betweenDay > 15) {
-			throw BusinessRuntimeException.getInstance("车票有效期不超过15天可退款");
+		if (betweenDay > 30) {
+			throw BusinessRuntimeException.getInstance("车票有效期不超过30天可退款");
 		}
 		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
 		OrderDon orderDon = orderDonMapper.selectOne(Wrappers.lambdaQuery(OrderDon.class)

+ 2 - 2
netflix-web/src/main/java/com/cyksj/web/controller/group/GroupRelationController.java

@@ -1248,7 +1248,7 @@ public class GroupRelationController {
     }
 
     /**
-     * 不超过15天 奈飞退款info
+     * 不超过30天 奈飞退款info
      */
     @GetMapping("/netflix/refund/info/{relationId}")
     public Result<NetflixRefundInfoResp> refundNetflixInfo(@PathVariable Long relationId) {
@@ -1259,7 +1259,7 @@ public class GroupRelationController {
     }
 
     /**
-     * 奈飞不超过15天有效期进行退款
+     * 奈飞不超过30天有效期进行退款
      * 是否可进行退款 true可 false否 走恢复账号流程
      */
     @PostMapping("/netflix/refund")