|
@@ -1074,16 +1074,17 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
|
|
userSubscribeImport.setCause("用户信息错误");
|
|
userSubscribeImport.setCause("用户信息错误");
|
|
userSubscribeImports.add(userSubscribeImport);
|
|
userSubscribeImports.add(userSubscribeImport);
|
|
continue;
|
|
continue;
|
|
- }
|
|
|
|
- List<UserSubscribe> userSubscribes = this.list(new LambdaQueryWrapper<UserSubscribe>().eq(UserSubscribe::getUserId, userId).eq(UserSubscribe::getSubscribeStatus, 1).last("limit 1"));
|
|
|
|
- if (!userSubscribes.isEmpty()){
|
|
|
|
- UserSubscribe userSubscribe = userSubscribes.get(0);
|
|
|
|
- if (Validator.isNotEmpty(userSubscribeImport.getStudentType())){
|
|
|
|
- String name = getName(userSubscribe.getStudentType().longValue());
|
|
|
|
- if (!userSubscribeImport.getStudentType().equals(name)){
|
|
|
|
- userSubscribeImport.setCause("学员类型错误");
|
|
|
|
- userSubscribeImports.add(userSubscribeImport);
|
|
|
|
- continue;
|
|
|
|
|
|
+ }else {
|
|
|
|
+ List<UserSubscribe> userSubscribes = this.list(new LambdaQueryWrapper<UserSubscribe>().eq(UserSubscribe::getUserId, userId).eq(UserSubscribe::getSubscribeStatus, 1).last("limit 1"));
|
|
|
|
+ if (!userSubscribes.isEmpty()){
|
|
|
|
+ UserSubscribe userSubscribe = userSubscribes.get(0);
|
|
|
|
+ if (Validator.isNotEmpty(userSubscribeImport.getStudentType())){
|
|
|
|
+ String name = getName(userSubscribe.getStudentType().longValue());
|
|
|
|
+ if (!userSubscribeImport.getStudentType().equals(name)){
|
|
|
|
+ userSubscribeImport.setCause("学员类型错误");
|
|
|
|
+ userSubscribeImports.add(userSubscribeImport);
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|