需求

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

@@ -870,18 +870,18 @@ public class CountLogic {
                 .select(WebsitGoods::getGoodsId, WebsitGoods::getStatus, WebsitGoods::getGoodsType).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())
         );
@@ -919,6 +919,11 @@ public class CountLogic {
                 ).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())