方法调整

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/dto/JdOrderSelectDto.java

@@ -49,4 +49,6 @@ public class JdOrderSelectDto extends BaseSelectDto {
     private String handleStatus;
 
     private String exHandle;
+
+    private String exDesc;
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdOrderDetailsServiceImpl.java

@@ -65,13 +65,16 @@ public class JdOrderDetailsServiceImpl extends ServiceImpl<JdOrderDetailsMapper,
     @Override
     public Page<JdOrderDetailsVo> jdOrderDetailExList(JdOrderSelectDto dto) {
         Page<JdOrderDetails> page = lambdaQuery()
-                .eq(JdOrderDetails::getHasEx, RunParamConstant.EXCEPTION)
+                .eq(StrUtil.isNotBlank(dto.getHasEx()), JdOrderDetails::getHasEx, dto.getHasEx())
+                .eq(StrUtil.isNotBlank(dto.getExDesc()), JdOrderDetails::getExDesc, dto.getExDesc())
+                .eq(StrUtil.isNotBlank(dto.getHandleStatus()), JdOrderDetails::getHandleStatus, dto.getHandleStatus())
+                .isNotNull(JdOrderDetails::getHandleStatus)
                 .like(ObjectUtil.isNotNull(dto.getOrderId()), JdOrderDetails::getOrderId, dto.getOrderId())
                 .eq(StrUtil.isNotBlank(dto.getHandleStatus()), JdOrderDetails::getHandleStatus, dto.getHandleStatus())
                 .eq(StrUtil.isNotBlank(dto.getExHandle()), JdOrderDetails::getExHandle, dto.getExHandle())
-                .like(StrUtil.isNotBlank(dto.getKeyword()), JdOrderDetails::getOrderId, dto.getKeyword())
-                .like(StrUtil.isNotBlank(dto.getKeyword()), JdOrderDetails::getWareId, dto.getKeyword())
-                .like(StrUtil.isNotBlank(dto.getKeyword()), JdOrderDetails::getProductId, dto.getKeyword())
+                .and(StrUtil.isNotBlank(dto.getKeyword()),q->q.like(JdOrderDetails::getOrderId, dto.getKeyword())
+                    .or().like(JdOrderDetails::getWareId, dto.getKeyword())
+                    .or().like(JdOrderDetails::getProductId, dto.getKeyword()))
                 .page(new Page<>(dto.getPageNum(), dto.getPageSize()));
 
         List<JdOrderDetails> records = page.getRecords();