|
|
@@ -17,6 +17,7 @@ import com.zhongshu.card.server.core.dao.org.UserCountDao;
|
|
|
import com.zhongshu.card.server.core.domain.org.Organization;
|
|
|
import com.zhongshu.card.server.core.domain.org.OrganizationUser;
|
|
|
import com.zhongshu.card.server.core.domain.org.UserAccount;
|
|
|
+import com.zhongshu.card.server.core.domain.school.CardInfo;
|
|
|
import com.zhongshu.card.server.core.service.base.SuperService;
|
|
|
import com.zhongshu.card.server.core.util.BeanUtils;
|
|
|
import com.zhongshu.card.server.core.util.CommonUtil;
|
|
|
@@ -272,6 +273,11 @@ public class SchoolUserServiceImpl extends SuperService implements SchoolUserSer
|
|
|
return ResultContent.buildFail(String.format("code已存在:%s", cardInfo.getCode()));
|
|
|
}
|
|
|
map.put(cardInfo.getCode(), cardInfo.getCode());
|
|
|
+
|
|
|
+ CardInfo cardInfo1 = cardInfoDao.findByCode(cardInfo.getCode());
|
|
|
+ if (ObjectUtils.isNotEmpty(cardInfo1)) {
|
|
|
+ return ResultContent.buildFail(String.format("卡号code已存在:%s", cardInfo.getCode()));
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
UserAccount userAccount = userCountDao.findTopByLoginName(phone);
|
|
|
@@ -282,6 +288,7 @@ public class SchoolUserServiceImpl extends SuperService implements SchoolUserSer
|
|
|
if (!ValidateUtils.isIDCard(cardNumber)) {
|
|
|
return ResultContent.buildFail("身份证号码格式不正确");
|
|
|
}
|
|
|
+ // 注册用户
|
|
|
RegisterUserAccountParam addParam = new RegisterUserAccountParam();
|
|
|
BeanUtils.copyProperties(param, addParam);
|
|
|
addParam.setUserType(UserType.ConsumerUser);
|
|
|
@@ -289,6 +296,7 @@ public class SchoolUserServiceImpl extends SuperService implements SchoolUserSer
|
|
|
if (resultContent.isFailed()) {
|
|
|
return ResultContent.buildFail(resultContent.getMsg());
|
|
|
}
|
|
|
+
|
|
|
String userId = resultContent.getContent();
|
|
|
if (ObjectUtils.isNotEmpty(cardInfos)) {
|
|
|
for (CardInfoParam cardInfo : cardInfos) {
|