1

ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java

@@ -1376,13 +1376,28 @@ public class InstructionServiceImpl implements IInstructionService {
             }
         }
 
-        // 按 remark 判断新增/更新
+        // 判断新增/更新
-        JDOrder exists = jdOrderService.selectJDOrderByRemark(order.getRemark());
+        JDOrder exists = null;
-        if (exists != null) {
+        
-            order.setId(exists.getId());
+        // 控制台入口：如果订单号不为空，优先根据订单号查找已存在的订单（用于刷新数据）
-            jdOrderService.updateJDOrder(order);
+        if (isFromConsole && !isEmpty(order.getOrderId())) {
-        } else {
+            exists = jdOrderService.selectJDOrderByOrderId(order.getOrderId());
-            jdOrderService.insertJDOrder(order);
+            if (exists != null) {
+                // 根据订单号找到已存在的订单，更新该订单（刷新数据）
+                order.setId(exists.getId());
+                jdOrderService.updateJDOrder(order);
+            }
+        }
+        
+        // 如果没有通过订单号找到，则按 remark 判断新增/更新
+        if (exists == null) {
+            exists = jdOrderService.selectJDOrderByRemark(order.getRemark());
+            if (exists != null) {
+                order.setId(exists.getId());
+                jdOrderService.updateJDOrder(order);
+            } else {
+                jdOrderService.insertJDOrder(order);
+            }
         }
 
         // H-TF订单触发延迟推送机制