diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java
index cb6a817..3cc876c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java
@@ -522,6 +522,9 @@ public class JDOrderListController extends BaseController
if (query.getModelNumber() != null && !query.getModelNumber().trim().isEmpty()) {
query.setModelNumber(query.getModelNumber().trim());
}
+ if (query.getModelNumberExclude() != null && !query.getModelNumberExclude().trim().isEmpty()) {
+ query.setModelNumberExclude(query.getModelNumberExclude().trim());
+ }
if (query.getBuyer() != null && !query.getBuyer().trim().isEmpty()) {
query.setBuyer(query.getBuyer().trim());
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/ErpGoofishOrder.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/ErpGoofishOrder.java
index 0ebfbf1..ed98cb7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/ErpGoofishOrder.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/ErpGoofishOrder.java
@@ -64,4 +64,14 @@ public class ErpGoofishOrder {
private String jdRemark;
/** 联查：本地京东单收件地址 jd_order.address（闲鱼详情常不返回明文地址） */
private String jdAddress;
+
+ // --------- 以下为列表查询扩展条件（不参与 insert/update） ---------
+ /** 运单关键字：命中详情运单号或本地运单号（模糊） */
+ private String waybillKeyword;
+ /** 开放平台 modify_time 下限（Unix 秒，含边界） */
+ private Long modifyTimeBegin;
+ /** 开放平台 modify_time 上限（Unix 秒，含边界） */
+ private Long modifyTimeEnd;
+ /** 是否已关联京东单：1 已关联 jd_order_id 非空；0 未关联；null 不限 */
+ private Integer jdLinkFilter;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/JDOrder.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/JDOrder.java
index 704e449..77ce578 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/JDOrder.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/JDOrder.java
@@ -30,6 +30,10 @@ public class JDOrder extends BaseEntity {
@Excel(name = "型号")
private String modelNumber;
+ /** 列表筛选：型号不含此子串（对应 SQL NOT LIKE %值%），不入库 */
+ @Transient
+ private String modelNumberExclude;
+
/** 链接 */
@Excel(name = "链接")
private String link;
diff --git a/ruoyi-system/src/main/resources/mapper/jarvis/ErpGoofishOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/jarvis/ErpGoofishOrderMapper.xml
index 47a60f5..ef2648f 100644
--- a/ruoyi-system/src/main/resources/mapper/jarvis/ErpGoofishOrderMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/jarvis/ErpGoofishOrderMapper.xml
@@ -71,8 +71,29 @@
and e.user_name like concat('%', #{userName}, '%')
and e.order_no like concat('%', #{orderNo}, '%')
and e.order_status = #{orderStatus}
+ and e.refund_status = #{refundStatus}
+ and e.order_type = #{orderType}
and e.ship_status = #{shipStatus}
and e.jd_order_id = #{jdOrderId}
+ and e.buyer_nick like concat('%', #{buyerNick}, '%')
+ and e.goods_title like concat('%', #{goodsTitle}, '%')
+ and e.receiver_mobile like concat('%', #{receiverMobile}, '%')
+ and e.item_id = #{itemId}
+ and e.product_id = #{productId}
+
+ and (e.detail_waybill_no like concat('%', #{waybillKeyword}, '%')
+ or e.local_waybill_no like concat('%', #{waybillKeyword}, '%'))
+
+ and o.remark like concat('%', #{jdRemark}, '%')
+ and o.third_party_order_no like concat('%', #{jdThirdPartyOrderNo}, '%')
+ and e.modify_time >= #{modifyTimeBegin}
+ and e.modify_time <= #{modifyTimeEnd}
+
+
+ and e.jd_order_id is not null
+ and e.jd_order_id is null
+
+
order by e.modify_time desc, e.id desc
diff --git a/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml
index 6d49545..38f8eec 100644
--- a/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml
@@ -67,6 +67,7 @@
and distribution_mark = #{distributionMark}
and model_number like concat('%', #{modelNumber}, '%')
+ and (model_number is null or model_number not like concat('%', #{modelNumberExclude}, '%'))
and link like concat('%', #{link}, '%')
and payment_amount = #{paymentAmount}
and rebate_amount = #{rebateAmount}
@@ -115,6 +116,7 @@
and distribution_mark = #{distributionMark}
and model_number like concat('%', #{modelNumber}, '%')
+ and (model_number is null or model_number not like concat('%', #{modelNumberExclude}, '%'))
and link like concat('%', #{link}, '%')
and payment_amount = #{paymentAmount}
and rebate_amount = #{rebateAmount}