Merge branch 'feat-20220718-oladinghenan' into temp-pre

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserController.java

@@ -1498,6 +1498,9 @@ public class SysUserController {
 							case JIN_YUAN:
 								userSubVO.setCertStatus(OladingCertStatus.resolve(String.valueOf(sysUserSub.getCertStatus())).name());
 								break;
+							case XIN_TAI_ZI:
+								userSubVO.setCertStatus(OladingCertStatus.resolve(String.valueOf(sysUserSub.getCertStatus())).name());
+								break;
 							default:
 						}
 						certList.add(userSubVO);
@@ -1525,6 +1528,9 @@ public class SysUserController {
 											case JIN_YUAN:
 												certStatuName = OladingCertStatus.resolve(String.valueOf(sysUserSub.getCertStatus())).getMessage();
 												break;
+											case XIN_TAI_ZI:
+												certStatuName = OladingCertStatus.resolve(String.valueOf(sysUserSub.getCertStatus())).getMessage();
+												break;
 											default:
 												certStatuName = "";
 										}
@@ -1552,6 +1558,10 @@ public class SysUserController {
 						certStatusNameList.add(StrUtil.isBlank(certStatusMap.get(GigTypeEnum.JIN_YUAN)) ?
 								OladingCertStatus.UN_SIGNED.getMessage() : certStatusMap.get(GigTypeEnum.JIN_YUAN));
 					}
+					if (subTypeList.contains(String.valueOf(GigTypeEnum.XIN_TAI_ZI.getCode()))) {
+						certStatusNameList.add(StrUtil.isBlank(certStatusMap.get(GigTypeEnum.XIN_TAI_ZI)) ?
+								OladingCertStatus.UN_SIGNED.getMessage() : certStatusMap.get(GigTypeEnum.XIN_TAI_ZI));
+					}
 					userVO.setCertStatusArr(certStatusNameList.toArray(new String[0]));
 				}
 			}

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

@@ -284,13 +284,16 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 				this.oladingChannelHandler(user, dept, subjectResult, Enum.valueOf(GigTypeEnum.class, String.valueOf(o)))));
 
 		// 结果放到redis
-		Map<String, Object> resultMap = new HashMap<>(3);
+		Map<String, Map<String, String>> resultMap = new HashMap<>(3);
 		if (gigTypeArray.size() > 1) {
 			// 同时发起的情况，且是前一个渠道（按照redis存的渠道顺序发送）的状态已返回，则刷新状态到redis
+			List<GigTypeEnum> gigTypeEnumList = gigTypeArray.stream()
+					.map(o -> Enum.valueOf(GigTypeEnum.class, String.valueOf(o)))
+					.collect(Collectors.toList());
 			List<SysUserSub> subList = sysUserSubService.list(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, user.getUserId())
 					.eq(SysUserSub::getDeptId, dept.getDeptId())
-					.in(SysUserSub::getGigType, gigTypeArray));
+					.in(SysUserSub::getGigType, gigTypeEnumList));
 			Map<String, Map<String, String>> dbResultMap = subList.stream()
 					.collect(Collectors.toMap(sysUserSub -> sysUserSub.getGigType().name(),
 							sysUserSub -> MapUtil.builder("certStatus",
@@ -308,11 +311,11 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 		if (gigTypeArray.size() > 1) {
 			String firstChannel = String.valueOf(gigTypeArray.get(0));
 			// 查询阿拉丁第一个渠道的认证状态
-			Map<String, String> certStatusMap = certResultMap.get(firstChannel);
-			// 查询阿拉钉第一个未发起认证的渠道
+			Map<String, String> certStatusMap = resultMap.get(firstChannel);
+			// 查询阿拉钉第一个未签约的渠道
 			String toSendChannel = "";
-			for (Map.Entry<String, Map<String, String>> entry : certResultMap.entrySet()) {
-				if (CollUtil.isEmpty(entry.getValue())) {
+			for (Map.Entry<String, Map<String, String>> entry : resultMap.entrySet()) {
+				if (OladingCertStatus.UN_SIGNED.name().equals(entry.getValue().get("certStatus"))) {
 					toSendChannel = entry.getKey();
 					break;
 				}

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

@@ -145,6 +145,10 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 						// 渠道是金园，则展示阿拉钉的状态
 						userSubVO.setCertStatus(OladingCertStatus.resolve(String.valueOf(sysUserSub.getCertStatus())).name());
 						break;
+					case XIN_TAI_ZI:
+						// 渠道是河南薪泰梓，则展示阿拉钉的状态
+						userSubVO.setCertStatus(OladingCertStatus.resolve(String.valueOf(sysUserSub.getCertStatus())).name());
+						break;
 					default:
 				}