zoujiajian hai 1 ano
pai
achega
ba30b555d2

+ 0 - 13
netflix-dao/src/main/java/com/cyksj/mapper/NetflixUseAccountStatusRecordMapper.java

@@ -1,13 +0,0 @@
-package com.cyksj.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.cyksj.model.entity.NetflixUseAccountStatusRecord;
-
-/**
- * 项目名: yhlxj2
- * 文件名: NetflixUseAccountStatusRecordMapper
- * 创建者: JavaZou
- * 创建时间:2024/11/12 18:18
- */
-public interface NetflixUseAccountStatusRecordMapper extends BaseMapper<NetflixUseAccountStatusRecord> {
-}

+ 14 - 0
netflix-dao/src/main/java/com/cyksj/mapper/NetflixUserAccountStatusRecordMapper.java

@@ -0,0 +1,14 @@
+package com.cyksj.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.NetflixUserAccountStatusRecord;
+
+/**
+ * 项目名: yhlxj2
+ * 文件名: NetflixUserAccountStatusRecordMapper
+ * 创建者: JavaZou
+ * 创建时间:2024/11/12 18:18
+ */
+public interface NetflixUserAccountStatusRecordMapper extends BaseMapper<NetflixUserAccountStatusRecord> {
+}

+ 2 - 2
netflix-dao/src/main/java/com/cyksj/model/entity/NetflixUseAccountStatusRecord.java → netflix-dao/src/main/java/com/cyksj/model/entity/NetflixUserAccountStatusRecord.java

@@ -5,13 +5,13 @@ import lombok.Setter;
 
 /**
  * 项目名: yhlxj2
- * 文件名: NetflixUseAccountStatusRecord
+ * 文件名: NetflixUserAccountStatusRecord
  * 创建者: JavaZou
  * 创建时间:2024/11/12 18:17
  */
 @Getter
 @Setter
-public class NetflixUseAccountStatusRecord extends BaseEntity{
+public class NetflixUserAccountStatusRecord extends BaseEntity{
 	private Long userId;
 
 	private Long relationId;

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

@@ -3,7 +3,7 @@ package com.cyksj.service.relation;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cyksj.model.entity.GoodsDonSku;
 import com.cyksj.model.entity.GroupsRelation;
-import com.cyksj.model.entity.NetflixUseAccountStatusRecord;
+import com.cyksj.model.entity.NetflixUserAccountStatusRecord;
 import com.cyksj.model.manage.views.AccountView;
 import com.cyksj.model.request.SpecialGoodsTicketReq;
 import com.cyksj.model.request.TicketLoginReq;
@@ -79,5 +79,5 @@ public interface GroupRelationFrontService {
 
 	Integer getNetflixErrorAccountStatus(long userId, Long relationId);
 
-	List<NetflixUseAccountStatusRecord> getUserNetflixSubmitRecord(long userId);
+	List<NetflixUserAccountStatusRecord> getUserNetflixSubmitRecord(long userId);
 }

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

@@ -163,7 +163,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 
 	private final NetflixTempAccountUserMapper netflixTempAccountUserMapper;
 
-	private final NetflixUseAccountStatusRecordMapper netflixUseAccountStatusRecordMapper;
+	private final NetflixUserAccountStatusRecordMapper netflixUserAccountStatusRecordMapper;
 
 	private final AccountNetflixStateMapper accountNetflixStateMapper;
 
@@ -1044,12 +1044,12 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 			throw BusinessRuntimeException.getInstance("更换异常,请重新提交");
 		}
 
-		NetflixUseAccountStatusRecord netflixUseAccountStatusRecord = netflixUseAccountStatusRecordMapper.selectOne(Wrappers.lambdaQuery(NetflixUseAccountStatusRecord.class)
-				.eq(NetflixUseAccountStatusRecord::getRelationId, relationId)
+		NetflixUserAccountStatusRecord netflixUserAccountStatusRecord = netflixUserAccountStatusRecordMapper.selectOne(Wrappers.lambdaQuery(NetflixUserAccountStatusRecord.class)
+				.eq(NetflixUserAccountStatusRecord::getRelationId, relationId)
 				.last("limit 1"));
-		if (netflixUseAccountStatusRecord != null) {
-			netflixUseAccountStatusRecord.setDeleted(false);
-			netflixUseAccountStatusRecordMapper.updateById(netflixUseAccountStatusRecord);
+		if (netflixUserAccountStatusRecord != null) {
+			netflixUserAccountStatusRecord.setDeleted(false);
+			netflixUserAccountStatusRecordMapper.updateById(netflixUserAccountStatusRecord);
 		}
 	}
 
@@ -1115,10 +1115,10 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 		String account = renewalView.getAccount();
 		String password = renewalView.getPassword();
 
-		Integer selectCount = netflixUseAccountStatusRecordMapper.selectCount(Wrappers.lambdaQuery(NetflixUseAccountStatusRecord.class)
-				.eq(NetflixUseAccountStatusRecord::getRelationId, relationId)
-				.eq(NetflixUseAccountStatusRecord::getUserId, userId)
-				.eq(NetflixUseAccountStatusRecord::getAccount, account));
+		Integer selectCount = netflixUserAccountStatusRecordMapper.selectCount(Wrappers.lambdaQuery(NetflixUserAccountStatusRecord.class)
+				.eq(NetflixUserAccountStatusRecord::getRelationId, relationId)
+				.eq(NetflixUserAccountStatusRecord::getUserId, userId)
+				.eq(NetflixUserAccountStatusRecord::getAccount, account));
 		if (selectCount > 0) {
 			throw BusinessRuntimeException.getInstance("该账号正在检测中");
 		}
@@ -1129,22 +1129,22 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 		if (accountNetflixState != null && (accountNetflixState.getState() == 2 || accountNetflixState.getState() == 3)) {
 			state = accountNetflixState.getState();
 		}
-		NetflixUseAccountStatusRecord netflixUseAccountStatusRecord = new NetflixUseAccountStatusRecord();
-		netflixUseAccountStatusRecord.setAccount(account);
-		netflixUseAccountStatusRecord.setRelationId(relationId);
-		netflixUseAccountStatusRecord.setPassword(password);
-		netflixUseAccountStatusRecord.setUserId(renewalView.getUserId());
-		netflixUseAccountStatusRecord.setState(state);
-		netflixUseAccountStatusRecordMapper.insert(netflixUseAccountStatusRecord);
+		NetflixUserAccountStatusRecord netflixUserAccountStatusRecord = new NetflixUserAccountStatusRecord();
+		netflixUserAccountStatusRecord.setAccount(account);
+		netflixUserAccountStatusRecord.setRelationId(relationId);
+		netflixUserAccountStatusRecord.setPassword(password);
+		netflixUserAccountStatusRecord.setUserId(renewalView.getUserId());
+		netflixUserAccountStatusRecord.setState(state);
+		netflixUserAccountStatusRecordMapper.insert(netflixUserAccountStatusRecord);
 	}
 
 	@Override
 	public Integer getNetflixErrorAccountStatus(long userId, Long relationId) {
 		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
-		NetflixUseAccountStatusRecord netflixUseAccountStatusRecord = netflixUseAccountStatusRecordMapper.selectOne(Wrappers.lambdaQuery(NetflixUseAccountStatusRecord.class)
-				.eq(NetflixUseAccountStatusRecord::getRelationId, relationId)
-				.eq(NetflixUseAccountStatusRecord::getDeleted, 1)
-				.in(NetflixUseAccountStatusRecord::getUserId, userIdList)
+		NetflixUserAccountStatusRecord netflixUseAccountStatusRecord = netflixUserAccountStatusRecordMapper.selectOne(Wrappers.lambdaQuery(NetflixUserAccountStatusRecord.class)
+				.eq(NetflixUserAccountStatusRecord::getRelationId, relationId)
+				.eq(NetflixUserAccountStatusRecord::getDeleted, 1)
+				.in(NetflixUserAccountStatusRecord::getUserId, userIdList)
 				.last("limit 1"));
 		if (netflixUseAccountStatusRecord == null) {
 			throw BusinessRuntimeException.getInstance("未有提交记录");
@@ -1160,12 +1160,12 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 	}
 
 	@Override
-	public List<NetflixUseAccountStatusRecord> getUserNetflixSubmitRecord(long userId) {
+	public List<NetflixUserAccountStatusRecord> getUserNetflixSubmitRecord(long userId) {
 		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
-		List<NetflixUseAccountStatusRecord> netflixUseAccountStatusRecords = netflixUseAccountStatusRecordMapper.selectList(Wrappers.lambdaQuery(NetflixUseAccountStatusRecord.class)
-				.in(NetflixUseAccountStatusRecord::getUserId, userIdList)
-				.eq(NetflixUseAccountStatusRecord::getDeleted, 1)
-				.select(NetflixUseAccountStatusRecord::getRelationId, NetflixUseAccountStatusRecord::getState, NetflixUseAccountStatusRecord::getCreatedTime));
+		List<NetflixUserAccountStatusRecord> netflixUseAccountStatusRecords = netflixUserAccountStatusRecordMapper.selectList(Wrappers.lambdaQuery(NetflixUserAccountStatusRecord.class)
+				.in(NetflixUserAccountStatusRecord::getUserId, userIdList)
+				.eq(NetflixUserAccountStatusRecord::getDeleted, 1)
+				.select(NetflixUserAccountStatusRecord::getRelationId, NetflixUserAccountStatusRecord::getState, NetflixUserAccountStatusRecord::getCreatedTime));
 		return netflixUseAccountStatusRecords;
 	}
 

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

@@ -1118,10 +1118,10 @@ public class GroupRelationController {
      * 申请提交记录
      */
     @GetMapping("/get/netflix/get/error/submit/record")
-    public Result<List<NetflixUseAccountStatusRecord>> getUserNetflixSubmitRecord() {
+    public Result<List<NetflixUserAccountStatusRecord>> getUserNetflixSubmitRecord() {
         long userId = StpUserUtil.getLoginIdAsLong();
-        List<NetflixUseAccountStatusRecord> netflixUseAccountStatusRecords = groupRelationFrontService.getUserNetflixSubmitRecord(userId);
-        return GatewayResponse.SUCCESS.newBuilder().toResult(netflixUseAccountStatusRecords);
+        List<NetflixUserAccountStatusRecord> netflixUserAccountStatusRecords = groupRelationFrontService.getUserNetflixSubmitRecord(userId);
+        return GatewayResponse.SUCCESS.newBuilder().toResult(netflixUserAccountStatusRecords);
     }
 
     /**