需求

mall-server-api/src/main/java/com/gree/mall/manager/bean/order/JsmWorkerOrder.java

@@ -22,5 +22,8 @@ public class JsmWorkerOrder {
     @ApiModelProperty("订单号")
     private Integer pageSize;
 
+    @ApiModelProperty("手机号")
+    private String mobile;
+
 
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -2362,13 +2362,7 @@ public class OrderBaseLogic {
 
     public IPage<PgOrderBaseDetail> orderDetailJsmMini(JsmWorkerOrder jsmWorkerOrder) {
 
-        if (CollectionUtil.isEmpty(jsmWorkerOrder.getWorkerOrderIds()))
-            return null;
-
-        List<String> status = new ArrayList<>();
-        if (!StringUtil.isEmpty(jsmWorkerOrder.getStatus())){
 
-        }
 
         IPage pgOrderBases = pgOrderBaseService.lambdaQuery()
                 .isNull(!StringUtil.isEmpty(jsmWorkerOrder.getStatus()) && jsmWorkerOrder.getStatus().equals("DYY"),PgOrderBase::getAppointmentTime)
@@ -2381,7 +2375,9 @@ public class OrderBaseLogic {
 
                 .in(!StringUtil.isEmpty(jsmWorkerOrder.getStatus()) && jsmWorkerOrder.getStatus().equals("YWC"),PgOrderBase::getOrderStatus,"YWG","GCSZX","WDWG","YWGO","YJS","LRCD")
 
-                .in(!CollectionUtil.isEmpty(jsmWorkerOrder.getWorkerOrderIds()),PgOrderBase::getId, jsmWorkerOrder.getWorkerOrderIds())
+                .and(item -> item.in(!CollectionUtil.isEmpty(jsmWorkerOrder.getWorkerOrderIds()),PgOrderBase::getId, jsmWorkerOrder.getWorkerOrderIds()).or(!StringUtil.isEmpty(jsmWorkerOrder.getMobile()))
+                .eq(!StringUtil.isEmpty(jsmWorkerOrder.getMobile()),PgOrderBase::getUserMobile,jsmWorkerOrder.getMobile())
+                )
                 .page(new Page<>(jsmWorkerOrder.getPageNo(), jsmWorkerOrder.getPageSize()));
 
         List<PgOrderBaseDetail>  pgOrderBaseDetails = new ArrayList<>();