Merge branch 'feat-20230201-zhongyiyun' into temp-pre

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mq/GigSignCertReceiver.java

@@ -179,18 +179,16 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 				.eq(SysUserSub::getDeptId, dept.getDeptId())
 				.eq(SysUserSub::getSubjectLocation, SubjectLocation.HUI_QI_YUN)
 				.eq(SysUserSub::getGigType, GigTypeEnum.HUI_QI_YUN)
-				.set(SysUserSub::getCallbackStatus, GigCallBackStatus.RETURNED)
 				.set(SysUserSub::getUpdateTime, now)
 				.set(SysUserSub::getUpdateUser, 0)
 				.set(SysUserSub::getCertRemark, JSONUtil.toJsonStr(subjectResult));
 
-		if (HUI_QI_YUN_SUCCESS_CODE.equals(code)) {
-			if (ZhongYiYunCertStatus.SIGN.equals(zhongYiYunCertStatus)) {
-				// 汇企云已签约 即对应这里的已认证
-				updateWrapper.set(SysUserSub::getCertStatus, ZhongYiYunCertStatus.CERT.getCode());
-			} else {
-				updateWrapper.set(SysUserSub::getCertStatus, zhongYiYunCertStatus.getCode());
-			}
+		if (ZhongYiYunCertStatus.SIGN.equals(zhongYiYunCertStatus)) {
+			// 汇企云已签约 即对应这里的已认证
+			updateWrapper.set(SysUserSub::getCertStatus, ZhongYiYunCertStatus.CERT.getCode());
+			updateWrapper.set(SysUserSub::getCallbackStatus, GigCallBackStatus.RETURNED);
+		} else {
+			updateWrapper.set(SysUserSub::getCertStatus, zhongYiYunCertStatus.getCode());
 		}
 
 		sysUserSubService.update(updateWrapper);

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

@@ -128,8 +128,8 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 			// 已签约对应要易已认证
 			updateUserSub.setCertStatus(ZhongYiYunCertStatus.CERT.getCode());
 		}
-		updateUserSub.setCertRemark(String.format("%s;%s", userSub.getCertRemark(), resMsg));
-		updateUserSub.setFailReason(resMsg);
+		updateUserSub.setCertRemark(String.format("%s;%s", userSub.getCertRemark(), String.format("签约回调：%s;", resMsg)));
+		updateUserSub.setFailReason(String.format("签约回调：%s;", resMsg));
 		updateUserSub.setUpdateTime(LocalDateTime.now());
 		updateUserSub.setUpdateUser(0);
 		sysUserSubService.updateById(updateUserSub);

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

@@ -527,12 +527,12 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 				.eq(SysUserExtRecord::getUserId, userId)
 				.eq(SysUserExtRecord::getDelFlag, DelEnum.NOT_DEL.val()));
 		if (userExtRecord == null) {
+			log.warn("{}用户的userExtRecord为空", userId);
 			if (!SubjectLocation.REN_LI_JIA.equals(userSignCertDTO.getSubjectLocation())
 					&& !SubjectLocation.JIANG_XI.equals(userSignCertDTO.getSubjectLocation())) {
 				// 人力家、正启之星-江西 不校验userExtRecord
 				return false;
 			}
-			log.warn("{}用户的userExtRecord为空", userId);
 		}
 		// 查询dept
 		SysDept dept = sysDeptService.getById(sysUser.getDeptId());