|
@@ -119,6 +119,21 @@ public class CountLogic {
|
|
@Autowired
|
|
@Autowired
|
|
WebsitPurchaseAdjustmentService websitPurchaseAdjustmentService;
|
|
WebsitPurchaseAdjustmentService websitPurchaseAdjustmentService;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ WebsitPartsNewInRecordService websitPartsNewInRecordService;
|
|
|
|
+
|
|
|
|
+ @Autowired
|
|
|
|
+ WebsitPartsSalesService websitPartsSalesService;
|
|
|
|
+
|
|
|
|
+ @Autowired
|
|
|
|
+ WebsitPartsNewRefundManageService websitPartsNewRefundManageService;
|
|
|
|
+
|
|
|
|
+ @Autowired
|
|
|
|
+ WebsitPartsOldRefundManageService websitPartsOldRefundManageService;
|
|
|
|
+
|
|
|
|
+ @Autowired
|
|
|
|
+ WebsitPartsChangeSalesService websitPartsChangeSalesService;
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 概况统计
|
|
* 概况统计
|
|
*/
|
|
*/
|
|
@@ -826,12 +841,6 @@ public class CountLogic {
|
|
.in(!CollectionUtils.isEmpty(adminUser.getCompanyWechatIds()), WebsitGoods::getCompanyWechatId, adminUser.getCompanyWechatId())
|
|
.in(!CollectionUtils.isEmpty(adminUser.getCompanyWechatIds()), WebsitGoods::getCompanyWechatId, adminUser.getCompanyWechatId())
|
|
.select(WebsitGoods::getGoodsId, WebsitGoods::getStatus, WebsitGoods::getGoodsType).list();
|
|
.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(
|
|
materialPeiJianCount.setAllpGoodsNum(
|
|
Convert.toInt(websitGoods.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey())
|
|
Convert.toInt(websitGoods.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey())
|
|
).count())
|
|
).count())
|
|
@@ -850,8 +859,256 @@ public class CountLogic {
|
|
);
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
+ 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())
|
|
|
|
+ );
|
|
|
|
+
|
|
|
|
+ materialPeiJianCount.setSubmitSalesPgNum(
|
|
|
|
+ Convert.toInt(websitPartsSales.stream().filter(item -> item.getStatus().equals(PartsOrderStatusEnum.SUBMIT.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())))
|
|
|
|
+ );
|
|
|
|
+
|
|
|
|
+ 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).list();
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ materialPeiJianCount.setBcOldNum(
|
|
|
|
+ Convert.toInt(websitPartsOldRefundManages.stream().filter(item -> item.getFlag().equals(PartsOrderFlagEnum.SAVE.getKey())
|
|
|
|
+ && item.getRepairFlag().equals("INNER")
|
|
|
|
+
|
|
|
|
+ ))
|
|
|
|
+ );
|
|
|
|
+
|
|
|
|
+ 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())))
|
|
|
|
+ );
|
|
|
|
+
|
|
|
|
+ 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")
|
|
|
|
+
|
|
|
|
+ ))
|
|
|
|
+ );
|
|
|
|
+
|
|
|
|
+ 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;
|
|
}
|
|
}
|
|
}
|
|
}
|