需求

mall-server-api/src/main/java/com/gree/mall/manager/bean/count/MaterialCount.java

@@ -196,6 +196,19 @@ public class MaterialCount {
     private Integer overWechatNum = 0;
 
 
+    @ApiModelProperty("微信支付待结算")
+    private Integer waitWechatNumOne = 0;
+
+    @ApiModelProperty("微信支付已完成")
+    private Integer okWechatNumOne = 0;
+
+    @ApiModelProperty("微信支付异常结算")
+    private Integer ycWechatNumOne = 0;
+
+    @ApiModelProperty("微信支付线下结算")
+    private Integer lineWechatNumOne = 0;
+
+
 
 
     @ApiModelProperty("线下支付待结算")

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

@@ -800,6 +800,32 @@ public class CountLogic {
         List<SettlementOrder> settlementOrders = settlementOrderService.lambdaQuery()
                 .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()), SettlementOrder::getWebsitId, adminUser.getAdminWebsitIds())
                 .select(SettlementOrder::getStatus, SettlementOrder::getPayStatus, SettlementOrder::getSettlementOrderId, SettlementOrder::getPayType).list();
+        materialCount.setWaitWechatNumOne(
+                Convert.toInt(settlementOrders.stream().filter(item -> item.getPayType().equals(PayTypeEnum.WECHAT.getKey()) &&
+                        item.getStatus().equals(ExamineStatusEnum.WAIT.getKey())
+                ).count())
+        );
+
+        materialCount.setOkWechatNumOne(
+                Convert.toInt(settlementOrders.stream().filter(item -> item.getPayType().equals(PayTypeEnum.WECHAT.getKey()) &&
+                        item.getStatus().equals(SettlementStatusNewEnum.OK.getKey())
+                ).count())
+        );
+
+        materialCount.setYcWechatNumOne(
+                Convert.toInt(settlementOrders.stream().filter(item -> item.getPayType().equals(PayTypeEnum.WECHAT.getKey()) &&
+                        item.getStatus().equals(SettlementStatusNewEnum.YC.getKey())
+                ).count())
+        );
+
+        materialCount.setLineWechatNumOne(
+                Convert.toInt(settlementOrders.stream().filter(item -> item.getPayType().equals(PayTypeEnum.WECHAT.getKey()) &&
+                        item.getStatus().equals(SettlementStatusNewEnum.LINE.getKey())
+                ).count())
+        );
+
+
+
 
 
         materialCount.setWaitWechatNum(