|
@@ -39,11 +39,15 @@ import com.qunzhixinxi.hnqz.admin.api.vo.MenuVO;
|
|
import com.qunzhixinxi.hnqz.admin.api.vo.UserVO;
|
|
import com.qunzhixinxi.hnqz.admin.api.vo.UserVO;
|
|
import com.qunzhixinxi.hnqz.admin.entity.SysCertResultRecord;
|
|
import com.qunzhixinxi.hnqz.admin.entity.SysCertResultRecord;
|
|
import com.qunzhixinxi.hnqz.admin.entity.SysDeptSub;
|
|
import com.qunzhixinxi.hnqz.admin.entity.SysDeptSub;
|
|
|
|
+import com.qunzhixinxi.hnqz.admin.entity.SysUserSub;
|
|
import com.qunzhixinxi.hnqz.admin.entity.dto.CommonUserDTO;
|
|
import com.qunzhixinxi.hnqz.admin.entity.dto.CommonUserDTO;
|
|
import com.qunzhixinxi.hnqz.admin.entity.input.UserCertificationInput;
|
|
import com.qunzhixinxi.hnqz.admin.entity.input.UserCertificationInput;
|
|
import com.qunzhixinxi.hnqz.admin.entity.output.UserCertificationOutput;
|
|
import com.qunzhixinxi.hnqz.admin.entity.output.UserCertificationOutput;
|
|
import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
|
|
import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
|
|
|
|
+import com.qunzhixinxi.hnqz.admin.enums.GigCallBackStatus;
|
|
|
|
+import com.qunzhixinxi.hnqz.admin.enums.GigTypeEnum;
|
|
import com.qunzhixinxi.hnqz.admin.enums.LockEnum;
|
|
import com.qunzhixinxi.hnqz.admin.enums.LockEnum;
|
|
|
|
+import com.qunzhixinxi.hnqz.admin.enums.RenlijiaCertStatus;
|
|
import com.qunzhixinxi.hnqz.admin.enums.SubjectTypeEnum;
|
|
import com.qunzhixinxi.hnqz.admin.enums.SubjectTypeEnum;
|
|
import com.qunzhixinxi.hnqz.admin.mapper.*;
|
|
import com.qunzhixinxi.hnqz.admin.mapper.*;
|
|
import com.qunzhixinxi.hnqz.admin.service.*;
|
|
import com.qunzhixinxi.hnqz.admin.service.*;
|
|
@@ -125,6 +129,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
|
|
|
private final SysCertResultRecordMapper sysCertResultRecordMapper;
|
|
private final SysCertResultRecordMapper sysCertResultRecordMapper;
|
|
|
|
|
|
|
|
+ private final SysUserSubMapper sysUserSubMapper;
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* @Modify: start
|
|
* @Modify: start
|
|
* @Version: v2021.4.16
|
|
* @Version: v2021.4.16
|
|
@@ -606,6 +612,34 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
String resultMsg = msg.toString();
|
|
String resultMsg = msg.toString();
|
|
|
|
|
|
baseMapper.updateById(sysUser);
|
|
baseMapper.updateById(sysUser);
|
|
|
|
+
|
|
|
|
+ // 更新userSub
|
|
|
|
+ for (String subType : input.getSubList()) {
|
|
|
|
+ if (!subType.equals(String.valueOf(GigTypeEnum.REN_LI_JIA.getCode()))) {
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+ GigTypeEnum gigTypeEnum = GigTypeEnum.resolve(Integer.parseInt(subType));
|
|
|
|
+ Integer certStatus = GigTypeEnum.REN_LI_JIA.equals(gigTypeEnum) ?
|
|
|
|
+ sysUser.getRljCertStatus() : sysUser.getCertStatus();
|
|
|
|
+ SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
|
|
|
|
+ .eq(SysUserSub::getUserId, sysUser.getUserId())
|
|
|
|
+ .eq(SysUserSub::getGigType, gigTypeEnum));
|
|
|
|
+ SysUserSub updateUserSub = new SysUserSub();
|
|
|
|
+ updateUserSub.setId(userSub.getId());
|
|
|
|
+ updateUserSub.setCertStatus(certStatus);
|
|
|
|
+ // 发起成功或认证成功,才修改CallbackStatus状态
|
|
|
|
+ if (RenlijiaCertStatus.CER_STATUS_1.getCode() == certStatus
|
|
|
|
+ || RenlijiaCertStatus.CER_STATUS_3.getCode() == certStatus) {
|
|
|
|
+ updateUserSub.setCallbackStatus(GigCallBackStatus.IN_PROGRESS);
|
|
|
|
+ } else {
|
|
|
|
+ updateUserSub.setCallbackStatus(GigCallBackStatus.RETURNED);
|
|
|
|
+ }
|
|
|
|
+ updateUserSub.setCertRemark(resultMsg);
|
|
|
|
+ updateUserSub.setUpdateTime(LocalDateTime.now());
|
|
|
|
+ updateUserSub.setUpdateUser(0);
|
|
|
|
+ sysUserSubMapper.updateById(updateUserSub);
|
|
|
|
+ }
|
|
|
|
+
|
|
return R.ok(null, resultMsg.substring(0, resultMsg.length() - 1));
|
|
return R.ok(null, resultMsg.substring(0, resultMsg.length() - 1));
|
|
}
|
|
}
|
|
|
|
|