需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/count/CountLogic.java

@@ -590,18 +590,25 @@ public class CountLogic {
                 .select(WebsitPurchase::getIsRecheck, WebsitPurchase::getPurchaseId,WebsitPurchase::getFlag).list();
 
 
+        List<String> flags = new ArrayList<>();
+        flags.add(ExamineStatusEnum.SUBMIT.getKey());
+        flags.add(ExamineStatusEnum.OK.getKey());
+
         materialCount.setWebsitCheckNum(
-                Convert.toInt(websitPurchaseList.stream().count())
+                Convert.toInt(websitPurchaseList.stream().filter(item -> flags.contains(item.getFlag()
+                )).count())
         );
 
         materialCount.setWebsitCheckNeverNum(
                 Convert.toInt(websitPurchaseList.stream().filter(item ->
+                        flags.contains(item.getFlag()) &&
                         item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())
                 ).count())
         );
 
         materialCount.setWebsitCheckYesNum(
                 Convert.toInt(websitPurchaseList.stream().filter(item ->
+                        flags.contains(item.getFlag()) &&
                         item.getIsRecheck().equals(IsYesNoEnum.YES.getKey())
                 ).count())
         );
@@ -826,6 +833,27 @@ public class CountLogic {
                 ).count())
         );
 
+        List<WebsitPurchaseRet> websitPurchaseRets = websitPurchaseRetService.lambdaQuery()
+                .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()), WebsitPurchaseRet::getWebsitId, adminUser.getAdminWebsitIds())
+                .select(WebsitPurchaseRet::getFlag, WebsitPurchaseRet::getPurchaseId, WebsitPurchaseRet::getGoodsType).list();
+
+        materialCount.setSavePurchaseRetNum(
+                Convert.toInt(websitPurchaseRets.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey()) &&
+                        item.getFlag().equals(ExamineStatusEnum.SAVE.getKey())
+                ).count())
+        );
+
+        materialCount.setOkPurchaseRetNum(
+                Convert.toInt(websitPurchaseRets.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey()) &&
+                        item.getFlag().equals(ExamineStatusEnum.OK.getKey())
+                ).count())
+        );
+
+        materialCount.setFailPurchaseRetNum(
+                Convert.toInt(websitPurchaseRets.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey()) &&
+                        item.getFlag().equals(ExamineStatusEnum.FAIL.getKey())
+                ).count())
+        );
 
 
         return materialCount;