需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/websit/SettlementOrderLogic.java

@@ -825,6 +825,9 @@ public class SettlementOrderLogic {
 
         List<String> orderBaseIds = pgOrderBases.stream().map(PgOrderBase::getId).collect(Collectors.toList());
 
+        if (CollectionUtils.isEmpty(orderBaseIds))
+            return settlementOrderLogicVOIPage;
+
         List<WorkerOrder> workerOrders = workerOrderService.lambdaQuery()
                 .in(WorkerOrder::getWorkerOrderId, orderBaseIds)
                 .eq(WorkerOrder::getPayStatus,"PAID")
@@ -862,10 +865,13 @@ public class SettlementOrderLogic {
             List<PgOrderBase> pgOrderBaseList1 = pgOrderBases.stream().filter(item -> orderWorkerIds.contains(item.getId()))
                     .collect(Collectors.toList());
 
-            record.setDzzfs(pgOrderBaseList1.size());
-            int sum = pgOrderBaseList1.stream().mapToInt(PgOrderBase::getTotalNum).sum();
+            if (CollectionUtils.isEmpty(orderBaseIdWorker)) {
+
+                record.setDzzfs(pgOrderBaseList1.size());
+                int sum = pgOrderBaseList1.stream().mapToInt(PgOrderBase::getTotalNum).sum();
 
-            record.setDzzfsbts(sum);
+                record.setDzzfsbts(sum);
+            }
 
             BigDecimal bigDecimal = workerOrderList.stream().map(WorkerOrder::getWorkerAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
 

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

@@ -48,6 +48,15 @@ public class OrderBaseCountLogic {
                         v -> v.in(PgOrderBase::getWebsitId,adminUser.getAdminWebsitIds()).or().in(PgOrderBase::getCreateWebsitId,adminUser.getAdminWebsitIds()))
                 .list();
 
+        List<PgOrderBase> pgOrderBaseListOver = pgOrderBaseService.lambdaQuery()
+                .select(PgOrderBase::getOrderType, PgOrderBase::getOrderTypeText, PgOrderBase::getCreateTime, PgOrderBase::getId
+                        , PgOrderBase::getOrderStatus,PgOrderBase::getAppointmentTime)
+                .between(PgOrderBase::getOverDate, DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), -8)), new Date())
+                .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()),PgOrderBase::getCompanyWechatId,adminUser.getCompanyWechatId())
+                .and(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()),
+                        v -> v.in(PgOrderBase::getWebsitId,adminUser.getAdminWebsitIds()).or().in(PgOrderBase::getCreateWebsitId,adminUser.getAdminWebsitIds()))
+                .list();
+
         Map<String,List<Integer>> qtddqs = new HashMap<>();
 
         List<Integer> xzgdList = new ArrayList<>();
@@ -77,8 +86,8 @@ public class OrderBaseCountLogic {
                     item.getCreateTime().after(DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), (day))))
             ).collect(Collectors.toList()).size();
             xzgdList.add(xzgd);
-            int wgd = pgOrderBaseList.stream().filter(item -> item.getCreateTime().before(DateUtil.endOfDay(DateUtil.offsetDay(new Date(), (day)))) &&
-                    item.getCreateTime().after(DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), (day))))
+            int wgd = pgOrderBaseListOver.stream().filter(item -> item.getOverDate().before(DateUtil.endOfDay(DateUtil.offsetDay(new Date(), (day)))) &&
+                    item.getOverDate().after(DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), (day))))
                     && orderStatus.contains(item.getOrderStatus())
 
             ).collect(Collectors.toList()).size();