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 3ee9f79..7fc1cbe 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 @@ -103,7 +103,10 @@ public class JDOrderListController extends BaseController if ("true".equalsIgnoreCase(request.getParameter("hasRebateRemark"))) { query.getParams().put("hasRebateRemark", true); } - + if ("true".equalsIgnoreCase(request.getParameter("rebateWithoutUploadLink"))) { + query.getParams().put("rebateWithoutUploadLink", true); + } + java.util.List list; if (orderBy != null && !orderBy.isEmpty()) { // 设置排序参数 @@ -487,7 +490,18 @@ public class JDOrderListController extends BaseController if (orderSearch != null && !orderSearch.trim().isEmpty()) { query.getParams().put("orderSearch", orderSearch.trim()); } - + + String rebateRemarkAbnormal = request.getParameter("rebateRemarkHasAbnormal"); + if (rebateRemarkAbnormal != null && !rebateRemarkAbnormal.isEmpty()) { + query.setRebateRemarkHasAbnormal(Integer.valueOf(rebateRemarkAbnormal)); + } + if ("true".equalsIgnoreCase(request.getParameter("hasRebateRemark"))) { + query.getParams().put("hasRebateRemark", true); + } + if ("true".equalsIgnoreCase(request.getParameter("rebateWithoutUploadLink"))) { + query.getParams().put("rebateWithoutUploadLink", true); + } + // 处理其他查询参数 if (query.getRemark() != null && !query.getRemark().trim().isEmpty()) { query.setRemark(query.getRemark().trim()); diff --git a/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml index 06795cc..d10ed11 100644 --- a/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml @@ -85,6 +85,13 @@ and rebate_remark_json is not null and char_length(trim(rebate_remark_json)) > 2 + + and ( + rebate_remark_json is null + or char_length(trim(rebate_remark_json)) <= 2 + or rebate_remark_json not like '%"uploadRecordId"%' + ) + and date(order_time) >= #{params.beginTime} @@ -126,6 +133,13 @@ and rebate_remark_json is not null and char_length(trim(rebate_remark_json)) > 2 + + and ( + rebate_remark_json is null + or char_length(trim(rebate_remark_json)) <= 2 + or rebate_remark_json not like '%"uploadRecordId"%' + ) + and date(order_time) >= #{params.beginTime}