1

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());
             }

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;
 }

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;

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

@@ -71,8 +71,29 @@
             <if test="userName != null and userName != ''">and e.user_name like concat('%', #{userName}, '%')</if>
             <if test="orderNo != null and orderNo != ''">and e.order_no like concat('%', #{orderNo}, '%')</if>
             <if test="orderStatus != null">and e.order_status = #{orderStatus}</if>
+            <if test="refundStatus != null">and e.refund_status = #{refundStatus}</if>
+            <if test="orderType != null">and e.order_type = #{orderType}</if>
             <if test="shipStatus != null">and e.ship_status = #{shipStatus}</if>
             <if test="jdOrderId != null">and e.jd_order_id = #{jdOrderId}</if>
+            <if test="buyerNick != null and buyerNick != ''">and e.buyer_nick like concat('%', #{buyerNick}, '%')</if>
+            <if test="goodsTitle != null and goodsTitle != ''">and e.goods_title like concat('%', #{goodsTitle}, '%')</if>
+            <if test="receiverMobile != null and receiverMobile != ''">and e.receiver_mobile like concat('%', #{receiverMobile}, '%')</if>
+            <if test="itemId != null">and e.item_id = #{itemId}</if>
+            <if test="productId != null">and e.product_id = #{productId}</if>
+            <if test="waybillKeyword != null and waybillKeyword != ''">
+                and (e.detail_waybill_no like concat('%', #{waybillKeyword}, '%')
+                or e.local_waybill_no like concat('%', #{waybillKeyword}, '%'))
+            </if>
+            <if test="jdRemark != null and jdRemark != ''">and o.remark like concat('%', #{jdRemark}, '%')</if>
+            <if test="jdThirdPartyOrderNo != null and jdThirdPartyOrderNo != ''">and o.third_party_order_no like concat('%', #{jdThirdPartyOrderNo}, '%')</if>
+            <if test="modifyTimeBegin != null">and e.modify_time &gt;= #{modifyTimeBegin}</if>
+            <if test="modifyTimeEnd != null">and e.modify_time &lt;= #{modifyTimeEnd}</if>
+            <if test="jdLinkFilter != null">
+                <choose>
+                    <when test="jdLinkFilter == 1">and e.jd_order_id is not null</when>
+                    <when test="jdLinkFilter == 0">and e.jd_order_id is null</when>
+                </choose>
+            </if>
         </where>
         order by e.modify_time desc, e.id desc
     </select>

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

@@ -67,6 +67,7 @@
             </if>
             <if test="distributionMark != null and distributionMark != ''"> and distribution_mark = #{distributionMark}</if>
             <if test="modelNumber != null and modelNumber != ''"> and model_number like concat('%', #{modelNumber}, '%')</if>
+            <if test="modelNumberExclude != null and modelNumberExclude != ''"> and (model_number is null or model_number not like concat('%', #{modelNumberExclude}, '%'))</if>
             <if test="link != null and link != ''"> and link like concat('%', #{link}, '%')</if>
             <if test="paymentAmount != null"> and payment_amount = #{paymentAmount}</if>
             <if test="rebateAmount != null"> and rebate_amount = #{rebateAmount}</if>
@@ -115,6 +116,7 @@
             </if>
             <if test="distributionMark != null and distributionMark != ''"> and distribution_mark = #{distributionMark}</if>
             <if test="modelNumber != null and modelNumber != ''"> and model_number like concat('%', #{modelNumber}, '%')</if>
+            <if test="modelNumberExclude != null and modelNumberExclude != ''"> and (model_number is null or model_number not like concat('%', #{modelNumberExclude}, '%'))</if>
             <if test="link != null and link != ''"> and link like concat('%', #{link}, '%')</if>
             <if test="paymentAmount != null"> and payment_amount = #{paymentAmount}</if>
             <if test="rebateAmount != null"> and rebate_amount = #{rebateAmount}</if>