提交

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

@@ -107,7 +107,17 @@ public class JdOrderDetailsServiceImpl extends ServiceImpl<JdOrderDetailsMapper,
                 // 已确认
                 .ne("jo.business_status", 0)
 
-                .eq(StrUtil.isNotBlank(dto.getHandleStatus()), "jod.handle_status", dto.getHandleStatus())
+                .func(StrUtil.isNotBlank(dto.getHandleStatus()), q -> {
+                    if (dto.getHandleStatus().equals(RunParamConstant.EXCEPTION_STATE_TREATED)) {
+                        q.eq("jod.handle_status", RunParamConstant.EXCEPTION_STATE_TREATED);
+                    } else {
+                        q.and(s -> s
+                                .eq("jod.handle_status", RunParamConstant.EXCEPTION_STATE_UNTREATED)
+                                .or()
+                                .isNull("jod.handle_status")
+                        );
+                    }
+                })
                 .like(ObjectUtil.isNotNull(dto.getOrderId()), "jod.order_id", dto.getOrderId())
                 .eq(StrUtil.isNotBlank(dto.getExHandle()), "jod.ex_handle", dto.getExHandle())