From 8f9e9aadb79db1ad349e4988a2e302b02c3b962b Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 30 四月 2026 16:00:34 +0800
Subject: [PATCH] #上报 过滤

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CloudWmsNotifySchedule.java |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CloudWmsNotifySchedule.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CloudWmsNotifySchedule.java
index 471dd8a..56defcf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CloudWmsNotifySchedule.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CloudWmsNotifySchedule.java
@@ -109,11 +109,9 @@
             responseJson = String.valueOf(res);
         }
         Object codeObj = res != null ? res.get("code") : null;
-        boolean success = Integer.valueOf(200).equals(codeObj);
-        int status = success ? cloudWmsNotifyLogService.getNotifyStatusSuccess() : cloudWmsNotifyLogService.getNotifyStatusPending();
-        if (!success && !isInfiniteRetry(effectiveMaxRetry) && nextRetry >= effectiveMaxRetry) {
-            status = cloudWmsNotifyLogService.getNotifyStatusFail();
-        }
+        Object statusObj = res != null ? res.get("status") : null;
+        boolean success = Integer.valueOf(200).equals(codeObj) || Integer.valueOf(200).equals(statusObj);
+        int status = success ? cloudWmsNotifyLogService.getNotifyStatusSuccess() : cloudWmsNotifyLogService.getNotifyStatusFail();
         logRecord.setLastRequestBody(requestBody);
         logRecord.setLastResponseBody(responseJson);
         logRecord.setLastNotifyTime(now);
@@ -131,9 +129,10 @@
         logRecord.setLastNotifyTime(now);
         logRecord.setRetryCount(nextRetry);
         // logRecord.setNotifyStatus(nextRetry >= effectiveMaxRetry ? cloudWmsNotifyLogService.getNotifyStatusFail() : cloudWmsNotifyLogService.getNotifyStatusPending());
-        logRecord.setNotifyStatus(!isInfiniteRetry(effectiveMaxRetry) && nextRetry >= effectiveMaxRetry
+        int status = !isInfiniteRetry(effectiveMaxRetry) && nextRetry >= effectiveMaxRetry
                 ? cloudWmsNotifyLogService.getNotifyStatusFail()
-                : cloudWmsNotifyLogService.getNotifyStatusPending());
+                : cloudWmsNotifyLogService.getNotifyStatusPending();
+        logRecord.setNotifyStatus(status);
         logRecord.setUpdateTime(now);
         cloudWmsNotifyLogService.updateById(logRecord);
         log.warn("浜戜粨涓婃姤澶辫触锛宨d={}锛宐izRef={}锛宎ttempt={}锛宯otifyStatus={}锛宔rror={}",

--
Gitblit v1.9.1