fix: 阿拉钉同时发起修复

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

@@ -348,6 +348,7 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 		String uploadTaxPayerAgreementStatus = subjectResult.getStr("uploadTaxPayerAgreementStatus");
 		LocalDateTime now = LocalDateTime.now();
 		Map<String, String> certStatusMap = new HashMap<>();
+		certStatusMap.put("certStatus", OladingCertStatus.UN_SIGNED.name());
 
 		// 查询当前认证状态
 		SysUserSub userSub = sysUserSubService.getOne(Wrappers.<SysUserSub>lambdaQuery()
@@ -356,7 +357,7 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 				.eq(SysUserSub::getCallbackStatus, GigCallBackStatus.IN_PROGRESS)
 				.eq(SysUserSub::getGigType, gigType));
 		if (userSub == null) {
-			return null;
+			return certStatusMap;
 		}
 
 		// 拼接更新条件

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

@@ -52,6 +52,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -309,7 +310,9 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 							CollUtil.toList(GigTypeEnum.OLADING, GigTypeEnum.JIN_YUAN, GigTypeEnum.XIN_TAI_ZI));
 
 			// 封装请求数据
-			userSubList.stream().filter(sysUserSub -> {
+			userSubList.stream()
+					.sorted(Comparator.comparing(sysUserSub -> sysUserSub.getGigType().getCode()))
+					.filter(sysUserSub -> {
 				// 过滤掉认证成功的数据
 				if (GigTypeEnum.TAX_HELPOR.equals(sysUserSub.getGigType())
 						&& TaxHelperCertStatus.CHECKED_UNBIND.getCode() != sysUserSub.getCertStatus()