|
@@ -331,14 +331,15 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
|
|
// 发起前置判断
|
|
// 发起前置判断
|
|
boolean preSignCert = preSignCert(sysUser, userSub);
|
|
boolean preSignCert = preSignCert(sysUser, userSub);
|
|
if (!preSignCert) {
|
|
if (!preSignCert) {
|
|
|
|
+ // false直接返回,不发送mq
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
// 请求流水号
|
|
// 请求流水号
|
|
String requestId = RandomStringUtils.randomAlphabetic(16);
|
|
String requestId = RandomStringUtils.randomAlphabetic(16);
|
|
- // 是否需要传核身视频
|
|
|
|
- boolean uploadFaceID = userSignCertDTO.getUploadFaceID() != null && userSignCertDTO.getUploadFaceID();
|
|
|
|
|
|
+ // 是否需要传核身视频,阿拉丁、易联默认都要传
|
|
|
|
+// boolean uploadFaceID = userSignCertDTO.getUploadFaceID() != null && userSignCertDTO.getUploadFaceID();
|
|
// 封装请求参数
|
|
// 封装请求参数
|
|
- GigInfoModel infoModel = this.buildChannelCertModel(sysUser, userSub, dept.getTaxCode(), requestId, uploadFaceID);
|
|
|
|
|
|
+ GigInfoModel infoModel = this.buildChannelCertModel(sysUser, userSub, dept.getTaxCode(), requestId, true);
|
|
// 更新为进行中状态
|
|
// 更新为进行中状态
|
|
SysUserSub updateUserSub = new SysUserSub();
|
|
SysUserSub updateUserSub = new SysUserSub();
|
|
updateUserSub.setId(userSub.getId());
|
|
updateUserSub.setId(userSub.getId());
|
|
@@ -365,6 +366,12 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
|
|
private boolean preSignCert(SysUser sysUser, SysUserSub userSub) {
|
|
private boolean preSignCert(SysUser sysUser, SysUserSub userSub) {
|
|
boolean flag = true;
|
|
boolean flag = true;
|
|
switch (userSub.getGigType()) {
|
|
switch (userSub.getGigType()) {
|
|
|
|
+ case YEE:
|
|
|
|
+ // 如果不是金园数科,则直接返回
|
|
|
|
+ if (!GigChannelEnum.JIN_YUAN.equals(userSub.getGigChannel())) {
|
|
|
|
+ return true;
|
|
|
|
+ }
|
|
|
|
+ // 否则直接执行以下判断是否该用户对应姓名身份证已认证,是则直接同步
|
|
case OLADING:
|
|
case OLADING:
|
|
// 如果存在相同身份证信息的用户,并且是签约或认证过,则不发起,直接返回签约认证状态
|
|
// 如果存在相同身份证信息的用户,并且是签约或认证过,则不发起,直接返回签约认证状态
|
|
List<SysUser> existUserList = sysUserService.list(Wrappers.<SysUser>lambdaQuery()
|
|
List<SysUser> existUserList = sysUserService.list(Wrappers.<SysUser>lambdaQuery()
|
|
@@ -397,7 +404,7 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
|
|
Map<String, String> subMap = new HashMap<>();
|
|
Map<String, String> subMap = new HashMap<>();
|
|
subMap.put("certStatus", OladingCertStatus.resolve(String.valueOf(existUserSub.getCertStatus())).name());
|
|
subMap.put("certStatus", OladingCertStatus.resolve(String.valueOf(existUserSub.getCertStatus())).name());
|
|
Map<String, Object> result = MapUtil.newHashMap(1);
|
|
Map<String, Object> result = MapUtil.newHashMap(1);
|
|
- result.put("OLADING", subMap);
|
|
|
|
|
|
+ result.put(userSub.getGigType().name(), subMap);
|
|
redisTemplate.opsForValue().set(key, JSONUtil.toJsonStr(result), 1, TimeUnit.MINUTES);
|
|
redisTemplate.opsForValue().set(key, JSONUtil.toJsonStr(result), 1, TimeUnit.MINUTES);
|
|
}
|
|
}
|
|
}
|
|
}
|