需求

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/param/WorkOrderZfireParam.java

@@ -21,4 +21,7 @@ public class WorkOrderZfireParam extends ZfireParamBean {
     @ApiModelProperty("配件申请状态")
     private String partsApplyStatus;
 
+    @ApiModelProperty("查询待支付辅材订单")
+    private Boolean isWait;
+
 }

mall-server-api/src/main/java/com/gree/mall/manager/bean/worker/SettlementPgOrderVO.java

@@ -15,7 +15,7 @@ import java.util.Date;
 @Data
 public class SettlementPgOrderVO {
 
-    @ApiModelProperty(value = "所属公司 （S9219801广州，S9219807佛山）")
+    @ApiModelProperty(value = "所属公司")
     private String belongCompany;
 
     @ApiModelProperty(value = "所属公司编号")

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CommonMapper.java

@@ -223,7 +223,9 @@ public interface CommonMapper {
     public IPage<OrderBaseVO> orderBaseList(IPage page,
                                             @Param("ex") WorkOrderZfireParam zfireParamBean,
                                             @Param("adminUserType") Integer adminUserType
-            ,@Param("companyWechatId") String companyWechatId);
+            ,@Param("companyWechatId") String companyWechatId,
+            @Param("orderBaseId") List<String> orderBaseId
+                                            );
 
     /**
      * 考核项目配件列表

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

@@ -76,6 +76,7 @@ public class OrderBaseEsLogic {
 
         BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
 
+
         if (CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds())) {
             List<QueryBuilder> should = queryBuilder.should();
             if (adminUser.getType().equals(1)) {
@@ -88,6 +89,26 @@ public class OrderBaseEsLogic {
         BoolQueryBuilder queryBuilder1 = QueryBuilders.boolQuery();
         this.montage(queryBuilder1,zfireParamBean);
 
+        List<String> orderBaseId = new ArrayList<>();
+
+        if (zfireParamBean.getIsWait() != null && zfireParamBean.getIsWait()){
+            List<String> collect = workerOrderService.lambdaQuery()
+                    .eq(WorkerOrder::getPayStatus, "WAIT")
+                    .ne(WorkerOrder::getWorkerOrderId, "").select(WorkerOrder::getWorkerOrderId)
+                    .list().stream().map(WorkerOrder::getWorkerOrderId).collect(Collectors.toList());
+
+            if (CollectionUtils.isEmpty(collect))
+                return new Page<>();
+
+            orderBaseId.addAll(orderBaseId);
+
+
+        }
+
+        if (!CollectionUtils.isEmpty(orderBaseId)){
+            queryBuilder.must(QueryBuilders.termsQuery("id",orderBaseId));
+        }
+
 
 
         NativeSearchQuery build = new NativeSearchQueryBuilder()

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

@@ -110,13 +110,29 @@ public class OrderBaseLogic {
 
         }
 
+        List<String> orderBaseId = new ArrayList<>();
+
+        if (zfireParamBean.getIsWait() != null && zfireParamBean.getIsWait()){
+            List<String> collect = workerOrderService.lambdaQuery()
+                    .eq(WorkerOrder::getPayStatus, "WAIT")
+                    .ne(WorkerOrder::getWorkerOrderId, "").select(WorkerOrder::getWorkerOrderId)
+                    .list().stream().map(WorkerOrder::getWorkerOrderId).collect(Collectors.toList());
+
+            if (CollectionUtils.isEmpty(collect))
+                return new Page<>();
+
+            orderBaseId.addAll(orderBaseId);
+
+
+        }
+
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
         FieldUtils.supplyParam(zfireParamBean, OrderBaseVO.class, commonLogic.getAdminUser());
         zfireParamBean.setAdminWebsitIds(zfireParamBean.getAdminWebsitIds());
 
         IPage<OrderBaseVO> page = commonMapper.orderBaseList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()),
-                zfireParamBean, adminUser.getType(),adminUser.getType().equals(1)?adminUser.getCompanyWechatId():null);
+                zfireParamBean, adminUser.getType(),adminUser.getType().equals(1)?adminUser.getCompanyWechatId():null,orderBaseId);
 
         //服务单标识
         if (zfireParamBean.getPageSize() != -1 && page.getTotal() > 0) {

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -351,6 +351,14 @@
         <if test="ex.isYb != null and ex.isYb == true">
             and a.pg_incre_item_id !=''
         </if>
+
+        <if test="orderBaseId != null and orderBaseId.size > 0 ">
+        AND
+        a.id IN
+        <foreach item="item" index="index" collection="orderBaseId" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        </if>
         <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0 and adminUserType != null and adminUserType == 0">
             AND (
                 a.websit_id IN