Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -1232,7 +1232,7 @@ public class PayOrderLogic {
         workerOrder.setOpenId(currentCompanyWechat.getUser().getMiniOpenId());
 
         if (StringUtil.isEmpty(workerOrder.getOpenId())){
-            throw new RemoteServiceException("用户身份Oppid获得失败，请重新进入小程序，授权用户信息，发起支付");
+            throw new RemoteServiceException("师傅身份Oppid获得失败，请重新进入小程序，授权用户信息，发起支付");
         }
 
         if (!StringUtil.isEmpty(orderIdNew)) {

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

@@ -560,7 +560,37 @@ public class OrderBaseEsLogic {
 
         maps.add(PJYQX);
 
+        List<String> orderBaseId = new ArrayList<>();
+
+        HashMap<String, Object> DZF = new HashMap<>();
+        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)) {
 
+            orderBaseId.addAll(collect);
+            //待支付
+            NativeSearchQuery searchQueryDZF = new NativeSearchQueryBuilder()
+                    .withQuery(queryBuilder)
+                    .withPageable(PageRequest.of(1, 1))
+                    .addAggregation(this.getAggs(AggregationBuilders.filter("DJD", QueryBuilders.boolQuery()
+                            .must(QueryBuilders.termsQuery("id",orderBaseId))
+                    )))
+                    .build();
+            SearchHits responseDZF = elasticsearchRestTemplate.search(searchQueryDZF, OrderBaseEs.class);
+            DZF.put("total",this.getWorkerOrderCountResult(responseDZF.getAggregations(),"DZF"));
+            DZF.put("orderStatus","DZF");
+
+            maps.add(DZF);
+
+        }else {
+
+            DZF.put("total",this.getWorkerOrderCountResult(responsePJYQX.getAggregations(),"DZF"));
+            DZF.put("orderStatus","DZF");
+
+            maps.add(DZF);
+        }
 
         return maps;
     }