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

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

@@ -119,6 +119,21 @@ public class CountLogic {
     @Autowired
     WebsitPurchaseAdjustmentService websitPurchaseAdjustmentService;
 
+    @Autowired
+    WebsitPartsNewInRecordService websitPartsNewInRecordService;
+
+    @Autowired
+    WebsitPartsSalesService websitPartsSalesService;
+
+    @Autowired
+    WebsitPartsNewRefundManageService websitPartsNewRefundManageService;
+
+    @Autowired
+    WebsitPartsOldRefundManageService websitPartsOldRefundManageService;
+
+    @Autowired
+    WebsitPartsChangeSalesService websitPartsChangeSalesService;
+
     /**
      * 概况统计
      */
@@ -575,29 +590,44 @@ 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 ->
-                        item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())
+                        flags.contains(item.getFlag())
+
                 ).count())
         );
 
         materialCount.setWebsitCheckYesNum(
                 Convert.toInt(websitPurchaseList.stream().filter(item ->
-                        item.getIsRecheck().equals(IsYesNoEnum.YES.getKey())
+                        flags.contains(item.getFlag())
+
                 ).count())
         );
 
 
+        List<String> flagsApply = new ArrayList<>();
+        flagsApply.add(ExamineStatusEnum.SUBMIT.getKey());
+        flagsApply.add(ExamineStatusEnum.SAVE.getKey());
+
+
         materialCount.setWebsitApplySaveNum(
-                Convert.toInt(websitPurchaseList.stream().filter(item -> item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())).count())
+                Convert.toInt(websitPurchaseList.stream().filter(item ->
+                        flagsApply.contains(item.getFlag()) &&
+                        item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())).count())
         );
 
         materialCount.setWebsitApplySumbitNum(
                 Convert.toInt(websitPurchaseList.stream().filter(item ->
+                        flagsApply.contains(item.getFlag()) &&
                         item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())
                                 && item.getFlag().equals(ExamineStatusEnum.SUBMIT.getKey())
                 ).count())
@@ -607,6 +637,7 @@ public class CountLogic {
 
         materialCount.setWebsitApplyCancelNum(
                 Convert.toInt(websitPurchaseList.stream().filter(item ->
+                        flagsApply.contains(item.getFlag()) &&
                         item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())
                                 && item.getFlag().equals(PartsOrderStatusEnum.CANCEL.getKey())
                 ).count())
@@ -614,6 +645,7 @@ public class CountLogic {
 
         materialCount.setWebsitApplyOkNum(
                 Convert.toInt(websitPurchaseList.stream().filter(item ->
+                        flagsApply.contains(item.getFlag()) &&
                         item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())
                         && item.getFlag().equals(ExamineStatusEnum.OK.getKey())
                 ).count())
@@ -622,6 +654,7 @@ public class CountLogic {
 
         materialCount.setWebsitApplyFailNum(
                 Convert.toInt(websitPurchaseList.stream().filter(item ->
+                        flagsApply.contains(item.getFlag()) &&
                         item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())
                                 && item.getFlag().equals(ExamineStatusEnum.FAIL.getKey())
                 ).count())
@@ -811,6 +844,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;
@@ -826,32 +880,279 @@ public class CountLogic {
                 .in(!CollectionUtils.isEmpty(adminUser.getCompanyWechatIds()), WebsitGoods::getCompanyWechatId, adminUser.getCompanyWechatId())
                 .select(WebsitGoods::getGoodsId, WebsitGoods::getStatus, WebsitGoods::getGoodsType).list();
 
-
-        List<WebsitNormCharge> websitNormCharges = websitNormChargeService.lambdaQuery()
-                .in(!CollectionUtils.isEmpty(adminUser.getCompanyWechatIds()), WebsitNormCharge::getCompanyWechatId, adminUser.getCompanyWechatId())
-                .select(WebsitNormCharge::getNormId, WebsitNormCharge::getStatus, WebsitNormCharge::getNormType).list();
-
-
         materialPeiJianCount.setAllpGoodsNum(
-                Convert.toInt(websitGoods.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey())
+                Convert.toInt(websitGoods.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey())
                 ).count())
         );
 
         materialPeiJianCount.setOnPGoodsNum(
-                Convert.toInt(websitGoods.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey())
+                Convert.toInt(websitGoods.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey())
                         && item.getStatus().equals(StateEnum.ON.getKey())
                 ).count())
         );
 
         materialPeiJianCount.setOffPGoodsNum(
-                Convert.toInt(websitGoods.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey())
+                Convert.toInt(websitGoods.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey())
                         && item.getStatus().equals(StateEnum.OFF.getKey())
                 ).count())
         );
 
 
+        List<WebsitPartsNewInRecord> websitPartsNewInRecords = websitPartsNewInRecordService.lambdaQuery()
+                .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), WebsitPartsNewInRecord::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .select(WebsitPartsNewInRecord::getGoodsId, WebsitPartsNewInRecord::getStatus).list();
+
+        materialPeiJianCount.setCheckPNum(
+                Convert.toInt(websitPartsNewInRecords.stream().count())
+        );
+
+        materialPeiJianCount.setCheckNeverPNum(
+                Convert.toInt(websitPartsNewInRecords.stream().filter(item -> item.getStatus().equals(PartsCheckStatusEnum.WAIT_CHECK.getKey())
+                ).count())
+        );
+
+        materialPeiJianCount.setCheckYesPNum(
+                Convert.toInt(websitPartsNewInRecords.stream().filter(item -> item.getStatus().equals(PartsCheckStatusEnum.CHECKED.getKey())
+                ).count())
+        );
+
+
+        List<WebsitPartsSales> websitPartsSales = websitPartsSalesService.lambdaQuery()
+                .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()), WebsitPartsSales::getWebsitId, adminUser.getAdminWebsitIds())
+                .select(WebsitPartsSales::getPartsWebsitId, WebsitPartsSales::getStatus).list();
+
+        materialPeiJianCount.setSaveSalesPNum(
+                Convert.toInt(websitPartsSales.stream().filter(item -> item.getStatus().equals(PartsOrderStatusEnum.SAVE.getKey())).count())
+        );
+
+        materialPeiJianCount.setSubmitSalesPgNum(
+                Convert.toInt(websitPartsSales.stream().filter(item -> item.getStatus().equals(PartsOrderStatusEnum.SUBMIT.getKey())
+                ).count())
+        );
+
+        materialPeiJianCount.setPayNoTakeSalesPgNum(
+                Convert.toInt(websitPartsSales.stream().filter(item -> item.getStatus().equals(PartsOrderStatusEnum.PAYED.getKey())
+                ).count())
+        );
+
+        materialPeiJianCount.setOkTakeSalesPgNum(
+                Convert.toInt(websitPartsSales.stream().filter(item -> item.getStatus().equals(PartsOrderStatusEnum.END.getKey())
+                ).count())
+        );
+
+
+        materialPeiJianCount.setCancelTakeSalesPgNum(
+                Convert.toInt(websitPartsSales.stream().filter(item -> item.getStatus().equals(PartsOrderStatusEnum.CANCEL.getKey())
+                ).count())
+        );
+
+        materialPeiJianCount.setYcSalesPgNum(
+                Convert.toInt(websitPartsSales.stream().filter(item -> item.getStatus().equals(PartsOrderStatusEnum.EXCEPTION.getKey())
+                ).count())
+        );
+
+
+        List<WebsitPartsNewRefundManage> websitPartsNewRefundManages = websitPartsNewRefundManageService.lambdaQuery()
+                .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()), WebsitPartsNewRefundManage::getReceiveWebsitId, adminUser.getAdminWebsitIds())
+                .select(WebsitPartsNewRefundManage::getFlag, WebsitPartsNewRefundManage::getReceivePartsWebsitId).list();
+
+
+        materialPeiJianCount.setBcNewNum(
+                Convert.toInt(websitPartsNewRefundManages.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.SAVE.getKey())).count())
+        );
+
+        materialPeiJianCount.setTjNewNum(
+                Convert.toInt(websitPartsNewRefundManages.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.SUBMIT.getKey())
+                ).count())
+        );
+
+        materialPeiJianCount.setBhNewNum(
+                Convert.toInt(websitPartsNewRefundManages.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.REJECT.getKey())
+                ).count())
+        );
+
+
+        materialPeiJianCount.setTgNewNum(
+                Convert.toInt(websitPartsNewRefundManages.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.AGREE.getKey())
+                ).count())
+        );
+
+        materialPeiJianCount.setDfhNewNum(
+                Convert.toInt(websitPartsNewRefundManages.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.WAIT_REVIEW.getKey())
+                ).count())
+        );
+
+        materialPeiJianCount.setYfhkNewNum(
+                Convert.toInt(websitPartsNewRefundManages.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.REVIEWED.getKey())
+                ).count())
+        );
+
+        materialPeiJianCount.setWwfhNewNum(
+                Convert.toInt(websitPartsNewRefundManages.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.NOTREFUND.getKey())
+                ).count())
+        );
+
+        materialPeiJianCount.setYyfhNewNum(
+                Convert.toInt(websitPartsNewRefundManages.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.REFUNDED.getKey())
+                ).count())
+        );
+
+        List<WebsitPartsOldRefundManage> websitPartsOldRefundManages = websitPartsOldRefundManageService.lambdaQuery()
+                .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()), WebsitPartsOldRefundManage::getReceiveWebsitId, adminUser.getAdminWebsitIds())
+                .select(WebsitPartsOldRefundManage::getFlag, WebsitPartsOldRefundManage::getReceiveWebsitId,WebsitPartsOldRefundManage::getRepairFlag).list();
+
+
+
+        materialPeiJianCount.setBcOldNum(
+                Convert.toInt(websitPartsOldRefundManages.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.SAVE.getKey())
+                        && item.getRepairFlag().equals("INNER")
+
+                ).count())
+        );
+
+        materialPeiJianCount.setTjOldNum(
+                Convert.toInt(websitPartsOldRefundManages.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.SUBMIT.getKey())
+                        && item.getRepairFlag().equals("INNER")
+                ).count())
+        );
+
+        materialPeiJianCount.setBhOldNum(
+                Convert.toInt(websitPartsOldRefundManages.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.REJECT.getKey())
+                        && item.getRepairFlag().equals("INNER")
+                ).count())
+        );
+
+
+        materialPeiJianCount.setTgOldNum(
+                Convert.toInt(websitPartsOldRefundManages.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.AGREE.getKey())
+                        && item.getRepairFlag().equals("INNER")
+                ).count())
+        );
+
+        materialPeiJianCount.setDfhOldNum(
+                Convert.toInt(websitPartsOldRefundManages.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.WAIT_REVIEW.getKey())
+                        && item.getRepairFlag().equals("INNER")
+                ).count())
+        );
+
+        materialPeiJianCount.setYfhkOldNum(
+                Convert.toInt(websitPartsOldRefundManages.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.REVIEWED.getKey())
+                        && item.getRepairFlag().equals("INNER")
+                ).count())
+        );
+
+        materialPeiJianCount.setWwfhOldNum(
+                Convert.toInt(websitPartsOldRefundManages.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.NOTREFUND.getKey())
+                        && item.getRepairFlag().equals("INNER")
+                ).count())
+        );
+
+        materialPeiJianCount.setYyfhOldNum(
+                Convert.toInt(websitPartsOldRefundManages.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.REFUNDED.getKey())
+                        && item.getRepairFlag().equals("INNER")
+                ).count())
+        );
+
+
+        List<WebsitPartsChangeSales> websitPartsChangeSales = websitPartsChangeSalesService.lambdaQuery()
+                .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()), WebsitPartsChangeSales::getWebsitId, adminUser.getAdminWebsitIds())
+                .select(WebsitPartsChangeSales::getFlag, WebsitPartsChangeSales::getSalesId).list();
+
+
+        materialPeiJianCount.setBcNewSaleNum(
+                Convert.toInt(websitPartsChangeSales.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.SAVE.getKey())).count())
+        );
+
+        materialPeiJianCount.setTjNewSaleNum(
+                Convert.toInt(websitPartsChangeSales.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.SUBMIT.getKey())
+                ).count())
+        );
+
+        materialPeiJianCount.setBhNewSaleNum(
+                Convert.toInt(websitPartsChangeSales.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.REJECT.getKey())
+                ).count())
+        );
+
+
+        materialPeiJianCount.setTgNewSaleNum(
+                Convert.toInt(websitPartsChangeSales.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.AGREE.getKey())
+                ).count())
+        );
+
+        materialPeiJianCount.setDfhNewSaleNum(
+                Convert.toInt(websitPartsChangeSales.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.WAIT_REVIEW.getKey())
+                ).count())
+        );
+
+        materialPeiJianCount.setYfhkNewSaleNum(
+                Convert.toInt(websitPartsChangeSales.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.REVIEWED.getKey())
+                ).count())
+        );
+
+        materialPeiJianCount.setWwfhNewSaleNum(
+                Convert.toInt(websitPartsChangeSales.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.NOTREFUND.getKey())
+                ).count())
+        );
+
+        materialPeiJianCount.setYyfhNewSaleNum(
+                Convert.toInt(websitPartsChangeSales.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.REFUNDED.getKey())
+                ).count())
+        );
+
+
+
+
+        materialPeiJianCount.setBcNewInnerNum(
+                Convert.toInt(websitPartsOldRefundManages.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.SAVE.getKey())
+                        && item.getRepairFlag().equals("OUTSIDE")
+
+                ).count())
+        );
+
+        materialPeiJianCount.setTjNewInnerNum(
+                Convert.toInt(websitPartsOldRefundManages.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.SUBMIT.getKey())
+                        && item.getRepairFlag().equals("OUTSIDE")
+                ).count())
+        );
+
+        materialPeiJianCount.setBhNewInnerNum(
+                Convert.toInt(websitPartsOldRefundManages.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.REJECT.getKey())
+                        && item.getRepairFlag().equals("OUTSIDE")
+                ).count())
+        );
+
+
+        materialPeiJianCount.setTgNewInnerNum(
+                Convert.toInt(websitPartsOldRefundManages.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.AGREE.getKey())
+                        && item.getRepairFlag().equals("OUTSIDE")
+                ).count())
+        );
+
+        materialPeiJianCount.setDfhNewInnerNum(
+                Convert.toInt(websitPartsOldRefundManages.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.WAIT_REVIEW.getKey())
+                        && item.getRepairFlag().equals("OUTSIDE")
+                ).count())
+        );
+
+        materialPeiJianCount.setYfhkNewInnerNum(
+                Convert.toInt(websitPartsOldRefundManages.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.REVIEWED.getKey())
+                        && item.getRepairFlag().equals("OUTSIDE")
+                ).count())
+        );
+
+        materialPeiJianCount.setWwfhNewInnerNum(
+                Convert.toInt(websitPartsOldRefundManages.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.NOTREFUND.getKey())
+                        && item.getRepairFlag().equals("OUTSIDE")
+                ).count())
+        );
+
+        materialPeiJianCount.setYyfhNewInnerNum(
+                Convert.toInt(websitPartsOldRefundManages.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.REFUNDED.getKey())
+                        && item.getRepairFlag().equals("OUTSIDE")
+                ).count())
+        );
 
 
-        return new MaterialPeiJianCount();
+        return materialPeiJianCount;
     }
 }