fix: 福建企赋回调修改

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/constant/CacheConstants.java

@@ -138,9 +138,14 @@ public interface CacheConstants {
 	String HUI_QI_YUN_NOTIFY_KEY = "HUI:QI:YUN:NOTIFY:KEY:";
 
 	/**
-	 * 福建企赋异步结果回调key
+	 * 福建企赋签约异步结果回调key
 	 */
-	String QI_FU_NOTIFY_KEY = "QI:FU:NOTIFY:KEY:";
+	String QI_FU_SIGN_NOTIFY_KEY = "ZHONG:YI:YUN:SIGN:NOTIFY:KEY:";
+
+	/**
+	 * 福建企赋结算异步结果回调key
+	 */
+	String QI_FU_SETTLE_NOTIFY_KEY = "ZHONG:YI:YUN:SETTLE:NOTIFY:KEY:";
 
 	/**
 	 * 众蚁云签约异步结果回调key

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

@@ -101,7 +101,7 @@ public class GigThirdApiController {
 		// 请求序号
 		String reqId = bodyJson.getStr("reqId");
 
-		String redisKey = String.format("%s_%s", CacheConstants.ZHONG_YI_YUN_SETTLE_NOTIFY_KEY, reqId);
+		String redisKey = String.format("%s_%s", CacheConstants.QI_FU_SETTLE_NOTIFY_KEY, reqId);
 		Boolean absent = redisTemplate.opsForValue().setIfAbsent(redisKey, reqId, 30, TimeUnit.MINUTES);
 		if (Boolean.FALSE.equals(absent)) {
 			log.warn("存在在途操作reqId={}", reqId);
@@ -141,7 +141,7 @@ public class GigThirdApiController {
 		// 请求序号
 		String reqId = bodyJson.getStr("reqId");
 
-		String redisKey = String.format("%s_%s", CacheConstants.ZHONG_YI_YUN_SIGN_NOTIFY_KEY, reqId);
+		String redisKey = String.format("%s_%s", CacheConstants.QI_FU_SIGN_NOTIFY_KEY, reqId);
 		Boolean absent = redisTemplate.opsForValue().setIfAbsent(redisKey, reqId, 30, TimeUnit.MINUTES);
 		if (Boolean.FALSE.equals(absent)) {
 			log.warn("存在在途操作reqId={}", reqId);
@@ -161,9 +161,9 @@ public class GigThirdApiController {
 			SysDeptSub deptSub = sysDeptSubService.getOne(Wrappers.<SysDeptSub>lambdaQuery()
 					.likeRight(SysDeptSub::getAppId, merId)
 					.eq(SysDeptSub::getEnableFlag, "1")
-					.eq(SysDeptSub::getSubjectLocation, SubjectLocation.ZHONG_YI_YUN));
+					.eq(SysDeptSub::getSubjectLocation, SubjectLocation.QI_FU));
 			if (deptSub == null || StrUtil.isBlank(deptSub.getAppId())) {
-				log.warn("未配置众蚁云deptSub merId={}", merId);
+				log.warn("未配置福建企赋deptSub merId={}", merId);
 				return "fail";
 			}
 
@@ -176,7 +176,7 @@ public class GigThirdApiController {
 			newBodyJson.set("name", ZhongyiyunUtils.decrypt(name, desKey));
 			newBodyJson.set("remark3", ZhongyiyunUtils.decrypt(remark3, desKey));
 		} catch (Exception e) {
-			log.error("众蚁云签约回调参数异常", e);
+			log.error("福建企赋签约回调参数异常", e);
 			return "fail";
 		} finally {
 			// 请求记录到数据库