zoujiajian 1 年之前
父節點
當前提交
0647552e57

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

@@ -0,0 +1,21 @@
+package com.cyksj.model.response;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: NetflixRecoverResp
+ * 创建者: JavaZou
+ * 创建时间:2025/6/24 16:46
+ */
+@Getter
+@Setter
+public class NetflixRecoverResp {
+	private Integer index;
+
+	/**
+	 * 剩余天数
+	 */
+	private Long remainDays;
+}

+ 3 - 1
netflix-service/src/main/java/com/cyksj/service/relation/GroupRelationFrontService.java

@@ -9,6 +9,7 @@ import com.cyksj.model.request.ErrorNetflixChangeReq;
 import com.cyksj.model.request.SpecialGoodsTicketReq;
 import com.cyksj.model.request.TicketLoginReq;
 import com.cyksj.model.response.NetflixErrorAccountStatus;
+import com.cyksj.model.response.NetflixRecoverResp;
 import com.cyksj.model.views.GoodsCategorySkuView;
 import com.cyksj.model.views.RenewalView;
 import com.cyksj.model.views.UserRecommendGoodsFrontView;
@@ -101,7 +102,8 @@ public interface GroupRelationFrontService {
 	Long getTicket(Long userId, Long skuId, Boolean isVip);
 
 	Boolean getVipMirrorTicketIfEmpty(long userId, Long skuId);
-	Integer netflixSubmitRecover(ErrorNetflixChangeReq req);
+
+	NetflixRecoverResp netflixSubmitRecover(ErrorNetflixChangeReq req);
 
 	void errorNetflixSubmitChangeOtherTicket(ErrorNetflixChangeReq req) throws Exception;
 

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

@@ -39,6 +39,7 @@ import com.cyksj.model.request.OrderRefundReq;
 import com.cyksj.model.request.SpecialGoodsTicketReq;
 import com.cyksj.model.request.TicketLoginReq;
 import com.cyksj.model.response.NetflixErrorAccountStatus;
+import com.cyksj.model.response.NetflixRecoverResp;
 import com.cyksj.model.views.*;
 import com.cyksj.redis.RedisService;
 import com.cyksj.service.chatgpt.ChatGptAccountService;
@@ -1441,7 +1442,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 	}
 
 	@Override
-	public Integer netflixSubmitRecover(ErrorNetflixChangeReq req) {
+	public NetflixRecoverResp netflixSubmitRecover(ErrorNetflixChangeReq req) {
 		Long relationId = req.getRelationId();
 		Long userId = req.getUserId();
 		//校验奈飞账号状态
@@ -1472,7 +1473,10 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 		Integer selectCount = netflixUserAccountSubmitRecoverRecordMapper.selectCount(Wrappers.lambdaQuery(NetflixUserAccountSubmitRecoverRecord.class)
 				.lt(NetflixUserAccountSubmitRecoverRecord::getCreatedTime, recoverRecord.getCreatedTime())
 				.eq(NetflixUserAccountSubmitRecoverRecord::getStatus, 0));
-		return selectCount + 1;
+		NetflixRecoverResp recoverResp = new NetflixRecoverResp();
+		recoverResp.setIndex(selectCount + 1);
+		recoverResp.setRemainDays(recoverRecord.getRemainDays());
+		return recoverResp;
 	}
 
 	@Override

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

@@ -33,6 +33,7 @@ import com.cyksj.model.manage.views.GroupsRelationView;
 import com.cyksj.model.request.*;
 import com.cyksj.model.response.GptStandbyResp;
 import com.cyksj.model.response.NetflixErrorAccountStatus;
+import com.cyksj.model.response.NetflixRecoverResp;
 import com.cyksj.model.views.*;
 import com.cyksj.redis.RedisService;
 import com.cyksj.service.chatgpt.ChatGptAuthService;
@@ -1227,11 +1228,11 @@ public class GroupRelationController {
      * 奈飞账号申请恢复
      */
     @PostMapping("/netflix/submit/recover")
-    public Result<Integer> netflixSubmitRecover(@RequestBody ErrorNetflixChangeReq req) {
+    public Result<NetflixRecoverResp> netflixSubmitRecover(@RequestBody ErrorNetflixChangeReq req) {
         long userId = StpUserUtil.getLoginIdAsLong();
         req.setUserId(userId);
-        Integer index = groupRelationFrontService.netflixSubmitRecover(req);
-        return GatewayResponse.SUCCESS.newBuilder().toResult(index);
+        NetflixRecoverResp recoverResp = groupRelationFrontService.netflixSubmitRecover(req);
+        return GatewayResponse.SUCCESS.newBuilder().toResult(recoverResp);
     }
 
     /**