1

ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/JDOrderMapper.java

@@ -46,6 +46,11 @@ public interface JDOrderMapper {
      */
     JDOrder selectJDOrderByThirdPartyOrderNo(String thirdPartyOrderNo);
 
+    /**
+     * 腾讯文档「单号」列：与订单号(order_id)或客户/第三方单号(third_party_order_no)任一完全相等则命中
+     */
+    JDOrder selectJDOrderByOrderIdOrThirdPartyOrderNo(String orderKey);
+
     /**
      * 后返备注 JSON 中含指定 uploadRecordId 的订单主键（撤销导入时用）
      */

ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IJDOrderService.java

@@ -43,6 +43,11 @@ public interface IJDOrderService {
     /** 根据第三方单号查询订单 */
     JDOrder selectJDOrderByThirdPartyOrderNo(String thirdPartyOrderNo);
 
+    /**
+     * 按订单号或客户/第三方单号（与表 jd_order.order_id、third_party_order_no 完全匹配）
+     */
+    JDOrder selectJDOrderByOrderIdOrThirdPartyOrderNo(String orderKey);
+
     /** 批量删除（根据主键ID） */
     int deleteJDOrderByIds(Long[] ids);
     

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

@@ -69,6 +69,14 @@ public class JDOrderServiceImpl implements IJDOrderService {
         return jdOrderMapper.selectJDOrderByThirdPartyOrderNo(thirdPartyOrderNo);
     }
 
+    @Override
+    public JDOrder selectJDOrderByOrderIdOrThirdPartyOrderNo(String orderKey) {
+        if (orderKey == null || orderKey.trim().isEmpty()) {
+            return null;
+        }
+        return jdOrderMapper.selectJDOrderByOrderIdOrThirdPartyOrderNo(orderKey.trim());
+    }
+
     @Override
     public int deleteJDOrderByIds(Long[] ids) {
         if (ids == null || ids.length == 0) {

ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml

@@ -262,6 +262,13 @@
         limit 1
     </select>
 
+    <select id="selectJDOrderByOrderIdOrThirdPartyOrderNo" parameterType="string" resultMap="JDOrderResult">
+        <include refid="selectJDOrderBase"/>
+        where order_id = #{orderKey} or third_party_order_no = #{orderKey}
+        order by order_time desc
+        limit 1
+    </select>
+
     <select id="selectOrderIdsByRebateRemarkUploadRecordId" parameterType="long" resultType="long">
         select id from jd_order
         where rebate_remark_json is not null