需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/order/OrderCount.java

@@ -6,15 +6,15 @@ import lombok.Data;
 @Data
 public class OrderCount {
 
-    @ApiModelProperty("结算状态")
+    @ApiModelProperty("全部")
     private Integer qb;
 
-    @ApiModelProperty("结算状态")
+    @ApiModelProperty("待支付")
     private Integer dzf;
 
-    @ApiModelProperty("结算状态")
+    @ApiModelProperty("已支付")
     private Integer yzf;
 
-    @ApiModelProperty("结算状态")
+    @ApiModelProperty("已取消")
     private Integer yqx;
 }

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

@@ -247,8 +247,12 @@ public class OrderBaseLogic {
                                 .like(PgOrderBase::getUserMobile,keyword).or()
                                 .like(PgOrderBase::getAddress,keyword))
                 .and(CollectionUtils.isNotEmpty(orderStatusList),item -> item.in(CollectionUtils.isNotEmpty(orderStatusList), PgOrderBase::getOrderStatus, orderStatusList)
-                .or(CollectionUtils.isNotEmpty(orderStatusList) && orderStatusList.contains("DJD"))
-                                .eq(CollectionUtils.isNotEmpty(orderStatusList) && orderStatusList.contains("DJD"),PgOrderBase::getIsMeet,false)
+                        .eq(CollectionUtils.isNotEmpty(orderStatusList) && orderStatusList.contains("DJD"),PgOrderBase::getIsImportExcel,false)
+                .or(CollectionUtils.isNotEmpty(orderStatusList) && orderStatusList.contains("DJD"),item1 -> item1
+                        .eq(CollectionUtils.isNotEmpty(orderStatusList) && orderStatusList.contains("DJD"),PgOrderBase::getIsMeet,false)
+                        .eq(PgOrderBase::getIsImportExcel,true)
+                )
+
                 )
                 .eq(StringUtils.equals(orderStatus, OrderBaseStatusEnum.YCD.getKey()),PgOrderBase::getIsException,true)
                 .between(!StringUtils.equals(orderStatus, OrderBaseStatusEnum.YWG.getKey())

mall-miniapp-service/src/main/resources/mapper/workorder/OrderBaseCMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="countOrderStatus" resultType="com.gree.mall.miniapp.bean.workorder.CountOrderStatusBean">
          select
-            count(DISTINCT if((is_import_excel = false and a.order_status='DJD') or (is_import_excel = false and a.is_meet = false) ,a.id,null)) 'djd',
+            count(DISTINCT if((is_import_excel = false and a.order_status='DJD') or (is_import_excel = true and a.is_meet = false) ,a.id,null)) 'djd',
             count(DISTINCT if(a.order_status in ('FWZ','GCSZT','BFWG','DSM','YZP'),a.id,null)) 'fwz',
             count(DISTINCT if(a.is_exception=1,a.id,null)) 'ycd',
             count(DISTINCT if(a.order_status='DQD',a.id,null)) 'dqd',