|
|
@@ -64,7 +64,6 @@ import com.goafanti.user.bo.OrgProBo;
|
|
|
import com.goafanti.user.bo.UidAndTypeBo;
|
|
|
import com.goafanti.user.bo.UserIdentityBo;
|
|
|
import com.goafanti.user.bo.UserInfoBo;
|
|
|
-import com.goafanti.user.bo.UserPageHomeBo;
|
|
|
import com.goafanti.user.service.OrgHumanResourceService;
|
|
|
import com.goafanti.user.service.OrganizationIdentityService;
|
|
|
import com.goafanti.user.service.OrganizationInfoService;
|
|
|
@@ -281,7 +280,7 @@ public class UserApiController extends BaseApiController {
|
|
|
if (res.getError().isEmpty()) {
|
|
|
UserIdentity ui = new UserIdentity();
|
|
|
BeanUtils.copyProperties(userIdentity, ui);
|
|
|
- if (null == ui.getId()) {
|
|
|
+ if (StringUtils.isBlank(ui.getId())) {
|
|
|
ui.setId(UUID.randomUUID().toString());
|
|
|
ui.setUid(TokenManager.getUserId());
|
|
|
userIdentityService.insert(ui);
|
|
|
@@ -544,7 +543,7 @@ public class UserApiController extends BaseApiController {
|
|
|
public Result basic() {
|
|
|
Result res = new Result();
|
|
|
UidAndTypeBo ub = basicInfo(userService);
|
|
|
- if (null != ub && ub.getType() == UserType.PERSONAL.getCode()) {
|
|
|
+ if (UserType.PERSONAL.getCode().equals(ub.getType())) {
|
|
|
UserIdentityBo u = userIdentityService.selectUserIdentityBoByUserId(ub.getUid());
|
|
|
res.setData(u);
|
|
|
} else {
|
|
|
@@ -563,7 +562,7 @@ public class UserApiController extends BaseApiController {
|
|
|
public Result member() {
|
|
|
Result res = new Result();
|
|
|
UidAndTypeBo ub = basicInfo(userService);
|
|
|
- if (null != ub && ub.getType() == UserType.PERSONAL.getCode()) {
|
|
|
+ if (UserType.PERSONAL.getCode().equals(ub.getType())) {
|
|
|
UserInfoBo u = userInfoService.selectUserInfoBoByUserId(ub.getUid());
|
|
|
res.setData(u);
|
|
|
} else {
|
|
|
@@ -600,7 +599,7 @@ public class UserApiController extends BaseApiController {
|
|
|
public Result job() {
|
|
|
Result res = new Result();
|
|
|
UidAndTypeBo ub = basicInfo(userService);
|
|
|
- if (null != ub && ub.getType() == UserType.PERSONAL.getCode()) {
|
|
|
+ if (UserType.PERSONAL.getCode().equals(ub.getType())) {
|
|
|
UserCareer u = userCareerService.selectUserCareerByUserId(ub.getUid());
|
|
|
res.setData(u);
|
|
|
} else {
|
|
|
@@ -698,10 +697,7 @@ public class UserApiController extends BaseApiController {
|
|
|
@RequestMapping(value = "/homePage", method = RequestMethod.GET)
|
|
|
public Result homePage() {
|
|
|
Result res = new Result();
|
|
|
- if (TokenManager.isLogin()) {
|
|
|
- UserPageHomeBo userPageHomeBo = userService.selectUserPageHomeBoByUserId(TokenManager.getUserId());
|
|
|
- res.setData(userPageHomeBo);
|
|
|
- }
|
|
|
+ res.setData(userService.selectUserPageHomeBoByUserId(TokenManager.getUserId()));
|
|
|
return res;
|
|
|
|
|
|
}
|
|
|
@@ -748,7 +744,7 @@ public class UserApiController extends BaseApiController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (IdentityProcess.COMMITTED.getCode() == userIdentity.getProcess()) {//3
|
|
|
+ if (IdentityProcess.COMMITTED.getCode() == userIdentity.getProcess()) {// 3
|
|
|
UserIdentity u = userIdentityService.selectUserIdentityByUserId(TokenManager.getUserId());
|
|
|
u.setProcess(IdentityProcess.COMMITTED.getCode());
|
|
|
u.setAuditStatus(IdentityAuditStatus.COMMITTED.getCode());
|
|
|
@@ -759,14 +755,14 @@ public class UserApiController extends BaseApiController {
|
|
|
if (IdentityProcess.RESULTS.getCode() == userIdentity.getProcess()) {
|
|
|
UserIdentity u = userIdentityService.selectUserIdentityByUserId(TokenManager.getUserId());
|
|
|
if ((System.currentTimeMillis() - u.getPaymentDate().getTime()) > 432000000) {
|
|
|
- u.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());//4
|
|
|
+ u.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());// 4
|
|
|
userIdentityService.updateByPrimaryKeySelective(u);
|
|
|
res.getError().add(buildError("", "1"));// 超过打款日期5日,无法提交确认
|
|
|
return res;
|
|
|
}
|
|
|
if (3 == u.getWrongCount()) {
|
|
|
- u.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());//4
|
|
|
- u.setProcess(IdentityProcess.RESULTS.getCode());//5
|
|
|
+ u.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());// 4
|
|
|
+ u.setProcess(IdentityProcess.RESULTS.getCode());// 5
|
|
|
userIdentityService.updateByPrimaryKeySelective(u);
|
|
|
res.getError().add(buildError("", "2"));// 输入错误金额次数过多
|
|
|
return res;
|
|
|
@@ -776,8 +772,8 @@ public class UserApiController extends BaseApiController {
|
|
|
u.setWrongCount(u.getWrongCount() + 1);
|
|
|
|
|
|
if (0 == t) {
|
|
|
- u.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());//4
|
|
|
- u.setProcess(IdentityProcess.RESULTS.getCode());//5
|
|
|
+ u.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());// 4
|
|
|
+ u.setProcess(IdentityProcess.RESULTS.getCode());// 5
|
|
|
res.getError().add(buildError("", "2"));// 输入错误金额次数过多
|
|
|
} else {
|
|
|
res.getError().add(buildError("", "输入打款金额错误,您还有" + t + "次机会"));
|
|
|
@@ -831,14 +827,14 @@ public class UserApiController extends BaseApiController {
|
|
|
if (5 == orgIdentity.getProcess()) {
|
|
|
OrganizationIdentity o = organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId());
|
|
|
if (System.currentTimeMillis() - o.getPaymentDate().getTime() > 432000000) {
|
|
|
- o.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());//4
|
|
|
+ o.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());// 4
|
|
|
organizationIdentityService.updateByPrimaryKeySelective(o);
|
|
|
res.getError().add(buildError("", "1"));// 超过打款日期5日,无法提交确认
|
|
|
return res;
|
|
|
}
|
|
|
if (3 == o.getWrongCount()) {
|
|
|
- o.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());//4
|
|
|
- o.setProcess(IdentityProcess.RESULTS.getCode());//5
|
|
|
+ o.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());// 4
|
|
|
+ o.setProcess(IdentityProcess.RESULTS.getCode());// 5
|
|
|
organizationIdentityService.updateByPrimaryKeySelective(o);
|
|
|
res.getError().add(buildError("", "2"));// 输入错误金额次数过多
|
|
|
return res;
|
|
|
@@ -847,8 +843,8 @@ public class UserApiController extends BaseApiController {
|
|
|
int t = 3 - o.getWrongCount() - 1;
|
|
|
o.setWrongCount(o.getWrongCount() + 1);
|
|
|
if (0 == t) {
|
|
|
- o.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());//4
|
|
|
- o.setProcess(IdentityProcess.RESULTS.getCode());//5
|
|
|
+ o.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());// 4
|
|
|
+ o.setProcess(IdentityProcess.RESULTS.getCode());// 5
|
|
|
res.getError().add(buildError("", "2"));// 输入错误金额次数过多
|
|
|
} else {
|
|
|
res.getError().add(buildError("", "输入打款金额错误,您还有" + t + "次机会"));
|
|
|
@@ -872,34 +868,6 @@ public class UserApiController extends BaseApiController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 管理端确认用户认证
|
|
|
- *
|
|
|
- * @param auditStatus
|
|
|
- * @param money
|
|
|
- * @param uid
|
|
|
- * @return
|
|
|
- */
|
|
|
- @RequestMapping(value = "/adminConfirmIdent", method = RequestMethod.POST)
|
|
|
- public Result adminConfirmIdent(Integer auditStatus, BigDecimal money, String uid) {
|
|
|
- Result res = new Result();
|
|
|
- User user = userService.selectByPrimaryKey(uid);
|
|
|
- if (null != user) {
|
|
|
- if (0 == user.getType()) {
|
|
|
- UserIdentity u = userIdentityService.selectUserIdentityByUserId(uid);
|
|
|
- u.setAuditStatus(auditStatus);
|
|
|
- u.setAmountMoney(money);
|
|
|
- res.setData(userIdentityService.updateByPrimaryKeySelective(u));
|
|
|
- } else {
|
|
|
- OrganizationIdentity o = organizationIdentityService.selectOrgIdentityByUserId(uid);
|
|
|
- o.setAuditStatus(auditStatus);
|
|
|
- o.setValidationAmount(money);
|
|
|
- res.setData(organizationIdentityService.updateByPrimaryKeySelective(o));
|
|
|
- }
|
|
|
- }
|
|
|
- return res;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
* 获取公司联系人
|
|
|
*
|
|
|
* @param uid
|
|
|
@@ -914,24 +882,24 @@ public class UserApiController extends BaseApiController {
|
|
|
|
|
|
// 认证失败清除相关认证信息
|
|
|
private Result dealFaild(Result res) {
|
|
|
- if (0 == userService.selectByPrimaryKey(TokenManager.getUserId()).getType()) {
|
|
|
+ if (UserType.PERSONAL.getCode().equals(userService.selectByPrimaryKey(TokenManager.getUserId()).getType())) {
|
|
|
UserIdentity u = userIdentityService.selectUserIdentityByUserId(TokenManager.getUserId());
|
|
|
UserIdentity user = new UserIdentity();
|
|
|
user.setId(u.getId());
|
|
|
user.setUid(u.getUid());
|
|
|
- user.setProcess(0);
|
|
|
+ user.setProcess(IdentityProcess.UNCOMMITTED.getCode());
|
|
|
user.setWrongCount(0);
|
|
|
user.setAmountMoney(new BigDecimal(0));
|
|
|
- user.setAuditStatus(0);
|
|
|
+ user.setAuditStatus(IdentityAuditStatus.UNCOMMITTED.getCode());
|
|
|
res.setData(userIdentityService.updateByPrimaryKey(user));
|
|
|
} else {
|
|
|
OrganizationIdentity o = organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId());
|
|
|
OrganizationIdentity org = new OrganizationIdentity();
|
|
|
org.setId(o.getId());
|
|
|
org.setUid(o.getUid());
|
|
|
- org.setProcess(0);
|
|
|
+ org.setProcess(IdentityProcess.UNCOMMITTED.getCode());
|
|
|
org.setWrongCount(0);
|
|
|
- org.setAuditStatus(0);
|
|
|
+ org.setAuditStatus(IdentityAuditStatus.UNCOMMITTED.getCode());
|
|
|
org.setValidationAmount(new BigDecimal(0));
|
|
|
res.setData(organizationIdentityService.updateByPrimaryKey(org));
|
|
|
}
|