feat: 正启之星-江西税源地适配

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/SubjectLocation.java

@@ -36,7 +36,7 @@ public enum SubjectLocation {
 	LANG_CHAO("LANG_CHAO", GigTypeEnum.LANG_CHAO, "浪潮", 8),
 
 	// 正启之星-江西
-	ZHENG_QI_ZHI_XING_JIANG_XI("ZHENG_QI_ZHI_XING_JIANG_XI",  GigTypeEnum.ZHENG_QI_ZHI_XING, "正启之星-江西", 9);
+	JIANG_XI("JIANG_XI",  GigTypeEnum.ZHENG_QI_ZHI_XING, "正启之星-江西", 9);
 
 	@EnumValue
 	private final String type;

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

@@ -210,11 +210,22 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 		LocalDateTime now = LocalDateTime.now();
 		ZhengQiZhiXingCertStatus zhengQiZhiXingCertStatus = Enum.valueOf(ZhengQiZhiXingCertStatus.class, certStatus);
 
+		// 查询当前认证状态
+		List<SysUserSub> userSubList = sysUserSubService.list(Wrappers.<SysUserSub>lambdaQuery()
+				.eq(SysUserSub::getDeptId, dept.getDeptId())
+				.eq(SysUserSub::getUserId, user.getUserId())
+				.eq(SysUserSub::getCallbackStatus, GigCallBackStatus.IN_PROGRESS)
+				.eq(SysUserSub::getGigType, GigTypeEnum.ZHENG_QI_ZHI_XING));
+		if (CollUtil.isEmpty(userSubList)) {
+			return;
+		}
+
 		// 拼接更新条件
 		LambdaUpdateWrapper<SysUserSub> updateWrapper = Wrappers.<SysUserSub>lambdaUpdate()
 				.eq(SysUserSub::getUserId, user.getUserId())
 				.eq(SysUserSub::getDeptId, dept.getDeptId())
-				.eq(SysUserSub::getSubjectLocation, SubjectLocation.ZHENG_QI_ZHI_XING)
+//				.eq(SysUserSub::getSubjectLocation, SubjectLocation.ZHENG_QI_ZHI_XING)
+				.eq(SysUserSub::getCallbackStatus, GigCallBackStatus.IN_PROGRESS)
 				.eq(SysUserSub::getGigType, GigTypeEnum.ZHENG_QI_ZHI_XING)
 				.set(SysUserSub::getCallbackStatus, GigCallBackStatus.RETURNED)
 				.set(SysUserSub::getUpdateTime, now)
@@ -231,7 +242,7 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 		Map<String, Map<String, String>> resultMap = new HashMap<>(1);
 		Map<String, String> subMap = new HashMap<>(1);
 		subMap.put("certStatus", certStatus);
-		resultMap.put("ZHENG_QI_ZHI_XING", subMap);
+		resultMap.put(userSubList.get(0).getSubjectLocation().name(), subMap);
 		String key = CacheConstants.USER_SIGN_CERT_RESPONSE_KEY + user.getUserId();
 		log.info("缓存认证结果到redis：{}", JSONUtil.toJsonStr(resultMap));
 		redisTemplate.opsForValue().set(key, JSONUtil.toJsonStr(resultMap), 1, TimeUnit.MINUTES);