需求

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

@@ -502,6 +502,7 @@ public class PayOrderLogic {
                         salesCustomerPartsItemBean.setOldPartsNumber(workerOrderItem.getOldPartsNumber());
                         salesCustomerPartsItemBean.setPartsNumber(workerOrderItem.getGoodsCode());
                         salesCustomerPartsItemBean.setQty(workerOrderItem.getNum());
+                        salesCustomerPartsItemBean.setWorkerOrderItemId(workerOrderItem.getId());
 
                         salesCustomerPartsItemBeans.add(salesCustomerPartsItemBean);
 
@@ -539,6 +540,7 @@ public class PayOrderLogic {
                         salesCustomerPartsItemBean.setOldPartsNumber(workerOrderItem.getOldPartsNumber());
                         salesCustomerPartsItemBean.setPartsNumber(workerOrderItem.getGoodsCode());
                         salesCustomerPartsItemBean.setQty(workerOrderItem.getNum());
+                        salesCustomerPartsItemBean.setWorkerOrderItemId(workerOrderItem.getId());
 
                         salesCustomerPartsItemBeans.add(salesCustomerPartsItemBean);
 

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

@@ -116,6 +116,9 @@ public class CountLogic {
     @Autowired
     WebsitVenderGoodsService websitVenderGoodsService;
 
+    @Autowired
+    WebsitPurchaseAdjustmentService websitPurchaseAdjustmentService;
+
     /**
      * 概况统计
      */
@@ -589,6 +592,142 @@ public class CountLogic {
         );
 
 
+        materialCount.setWebsitApplySaveNum(
+                Convert.toInt(websitPurchaseList.stream().filter(item -> item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())).count())
+        );
+
+        materialCount.setWebsitApplySumbitNum(
+                Convert.toInt(websitPurchaseList.stream().filter(item ->
+                        item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())
+                                && item.getFlag().equals(ExamineStatusEnum.SUBMIT.getKey())
+                ).count())
+        );
+
+
+
+        materialCount.setWebsitApplyCancelNum(
+                Convert.toInt(websitPurchaseList.stream().filter(item ->
+                        item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())
+                                && item.getFlag().equals(PartsOrderStatusEnum.CANCEL.getKey())
+                ).count())
+        );
+
+        materialCount.setWebsitApplyOkNum(
+                Convert.toInt(websitPurchaseList.stream().filter(item ->
+                        item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())
+                        && item.getFlag().equals(ExamineStatusEnum.OK.getKey())
+                ).count())
+        );
+
+
+        materialCount.setWebsitApplyFailNum(
+                Convert.toInt(websitPurchaseList.stream().filter(item ->
+                        item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())
+                                && item.getFlag().equals(ExamineStatusEnum.FAIL.getKey())
+                ).count())
+        );
+
+
+        materialCount.setWebsitOrderSaveNum(
+                Convert.toInt(websitPurchaseList.stream().filter(item -> item.getIsRecheck().equals(IsYesNoEnum.YES.getKey())).count())
+        );
+
+        materialCount.setWebsitOrderSumbitNum(
+                Convert.toInt(websitPurchaseList.stream().filter(item ->
+                        item.getIsRecheck().equals(IsYesNoEnum.YES.getKey())
+                                && item.getFlag().equals(ExamineStatusEnum.SUBMIT.getKey())
+                ).count())
+        );
+
+
+
+        materialCount.setWebsitOrderCancelNum(
+                Convert.toInt(websitPurchaseList.stream().filter(item ->
+                        item.getIsRecheck().equals(IsYesNoEnum.YES.getKey())
+                                && item.getFlag().equals(PartsOrderStatusEnum.CANCEL.getKey())
+                ).count())
+        );
+
+        materialCount.setWebsitOrderOkNum(
+                Convert.toInt(websitPurchaseList.stream().filter(item ->
+                        item.getIsRecheck().equals(IsYesNoEnum.YES.getKey())
+                                && item.getFlag().equals(ExamineStatusEnum.OK.getKey())
+                ).count())
+        );
+
+
+        materialCount.setWebsitOrderFailNum(
+                Convert.toInt(websitPurchaseList.stream().filter(item ->
+                        item.getIsRecheck().equals(IsYesNoEnum.YES.getKey())
+                                && item.getFlag().equals(ExamineStatusEnum.FAIL.getKey())
+                ).count())
+        );
+
+
+        List<WebsitPurchaseAdjustment> websitPurchaseAdjustments = websitPurchaseAdjustmentService.lambdaQuery()
+                .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), WebsitPurchaseAdjustment::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .select(WebsitPurchaseAdjustment::getFlag, WebsitPurchaseAdjustment::getPurchaseAdjustmentId).list();
+
+        materialCount.setWebsitAdjustmentSaveNum(
+                Convert.toInt(websitPurchaseAdjustments.stream().filter(item -> item.getFlag().equals(ExamineStatusEnum.SAVE.getKey())).count())
+        );
+
+        materialCount.setWebsitAdjustmentSumbitNum(
+                Convert.toInt(websitPurchaseAdjustments.stream().filter(item ->
+                                 item.getFlag().equals(ExamineStatusEnum.SUBMIT.getKey())
+                ).count())
+        );
+
+
+        materialCount.setWebsitAdjustmentCancelNum(
+                Convert.toInt(websitPurchaseAdjustments.stream().filter(item ->
+                        item.getFlag().equals(PartsOrderStatusEnum.CANCEL.getKey())
+                ).count())
+        );
+
+        materialCount.setWebsitAdjustmentOkNum(
+                Convert.toInt(websitPurchaseAdjustments.stream().filter(item ->
+                        item.getFlag().equals(ExamineStatusEnum.OK.getKey())
+                ).count())
+        );
+
+
+        materialCount.setWebsitAdjustmentFailNum(
+                Convert.toInt(websitPurchaseAdjustments.stream().filter(item ->
+                        item.getFlag().equals(ExamineStatusEnum.FAIL.getKey())
+                ).count())
+        );
+
+        List<SettlementOrder> settlementOrderList = settlementOrderService.lambdaQuery()
+                .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()), SettlementOrder::getWebsitId, adminUser.getAdminWebsitIds())
+                .select(SettlementOrder::getStatus, SettlementOrder::getSettlementOrderId).list();
+
+
+
+        materialCount.setSettlementOrderWait(
+                Convert.toInt(settlementOrderList.stream().filter(item ->
+                        item.getStatus().equals(ExamineStatusEnum.WAIT.getKey())
+                ).count())
+        );
+        materialCount.setSettlementOrderOk(
+                Convert.toInt(settlementOrderList.stream().filter(item ->
+                        item.getStatus().equals(SettlementStatusNewEnum.OK.getKey())
+                ).count())
+        );
+        materialCount.setSettlementOrderYc(
+                Convert.toInt(settlementOrderList.stream().filter(item ->
+                        item.getStatus().equals(SettlementStatusNewEnum.YC.getKey())
+                ).count())
+        );
+        materialCount.setSettlementOrderLine(
+                Convert.toInt(settlementOrderList.stream().filter(item ->
+                        item.getStatus().equals(SettlementStatusNewEnum.LINE.getKey())
+                ).count())
+        );
+
+
+
+
         List<WebsitPriceUpd> websitPriceUpds = websitPriceUpdService.lambdaQuery()
                 .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()), WebsitPriceUpd::getWebsitId, adminUser.getAdminWebsitIds())
                 .select(WebsitPriceUpd::getFlag, WebsitPriceUpd::getSheetId, WebsitPriceUpd::getGoodsType).list();
@@ -679,6 +818,40 @@ public class CountLogic {
 
     public MaterialPeiJianCount MaterialPeiJianCount(HttpServletRequest request) {
 
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+
+        MaterialPeiJianCount materialPeiJianCount = new MaterialPeiJianCount();
+
+        List<WebsitGoods> websitGoods = websitGoodsService.lambdaQuery()
+                .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())
+                ).count())
+        );
+
+        materialPeiJianCount.setOnPGoodsNum(
+                Convert.toInt(websitGoods.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey())
+                        && item.getStatus().equals(StateEnum.ON.getKey())
+                ).count())
+        );
+
+        materialPeiJianCount.setOffPGoodsNum(
+                Convert.toInt(websitGoods.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey())
+                        && item.getStatus().equals(StateEnum.OFF.getKey())
+                ).count())
+        );
+
+
+
+
         return new MaterialPeiJianCount();
     }
 }