Merge branch 'hotfix-certstatus-20220510'

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysUserServiceImpl.java

@@ -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.entity.SysCertResultRecord;
 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.input.UserCertificationInput;
 import com.qunzhixinxi.hnqz.admin.entity.output.UserCertificationOutput;
 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.RenlijiaCertStatus;
 import com.qunzhixinxi.hnqz.admin.enums.SubjectTypeEnum;
 import com.qunzhixinxi.hnqz.admin.mapper.*;
 import com.qunzhixinxi.hnqz.admin.service.*;
@@ -125,6 +129,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 	private final SysCertResultRecordMapper sysCertResultRecordMapper;
 
+	private final SysUserSubMapper sysUserSubMapper;
+
 	/**
 	 * @Modify: start
 	 * @Version: v2021.4.16
@@ -606,6 +612,32 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		String resultMsg = msg.toString();
 
 		baseMapper.updateById(sysUser);
+
+		if (ArrayUtil.contains(input.getSubList(), String.valueOf(GigTypeEnum.REN_LI_JIA.getCode()))) {
+			// 更新人力家userSub
+			SysUserSub userSub = sysUserSubMapper.selectOne(Wrappers.<SysUserSub>lambdaQuery()
+					.eq(SysUserSub::getUserId, sysUser.getUserId())
+					.eq(SysUserSub::getGigType, GigTypeEnum.REN_LI_JIA));
+			if (userSub != null) {
+				SysUserSub updateUserSub = new SysUserSub();
+				updateUserSub.setId(userSub.getId());
+				updateUserSub.setCertStatus(Optional.ofNullable(sysUser.getRljCertStatus())
+						.orElseGet(RenlijiaCertStatus.CER_STATUS_4::getCode));
+				// 发起成功或认证成功，才修改CallbackStatus状态
+				if (sysUser.getRljCertStatus() != null
+						&& (RenlijiaCertStatus.CER_STATUS_1.getCode() == sysUser.getRljCertStatus()
+						|| RenlijiaCertStatus.CER_STATUS_3.getCode() == sysUser.getRljCertStatus())) {
+					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));
 	}