商品列表 统计

eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockCountQueryCriteria.java

@@ -4,11 +4,6 @@ import cn.ysk.cashier.dto.BaseQueryDto;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 
-/**
-* @website https://eladmin.vip
-* @author lyf
-* @date 2024-01-19
-**/
 @Data
 public class TbProductStockCountQueryCriteria extends BaseQueryDto {
 
@@ -18,6 +13,8 @@ public class TbProductStockCountQueryCriteria extends BaseQueryDto {
 
     private String categoryId;
 
+    private String type;
+
     private Integer page = 0;
 
     private Integer size = 10;
@@ -39,4 +36,10 @@ public class TbProductStockCountQueryCriteria extends BaseQueryDto {
             this.categoryId = categoryId;
         }
     }
+
+    public void setType(String type) {
+        if (StringUtils.isNotBlank(type)) {
+            this.type = type;
+        }
+    }
 }

eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockDetailQueryCriteria.java

@@ -1,42 +1,14 @@
 package cn.ysk.cashier.dto.product;
 
 import lombok.Data;
+
 import java.util.List;
-import cn.ysk.cashier.annotation.Query;
-import org.apache.commons.lang3.StringUtils;
 
-/**
-* @website https://eladmin.vip
-* @author lyf
-* @date 2024-01-19
-**/
 @Data
-public class TbProductStockDetailQueryCriteria{
-
-    /** 精确 */
-//    @Query
-//    private String skuId;
-
-    /** 精确 */
-    @Query
-    private String productId;
-    @Query
-    private String shopId;
-    /** 精确 */
-//    @Query
-//    private String productName;
-
+public class TbProductStockDetailQueryCriteria extends TbProductStockCountQueryCriteria{
     private String column;
-
-    @Query(type = Query.Type.IN)
-    private List<String> type;
-    /** BETWEEN */
-    @Query(type = Query.Type.BETWEEN)
-    private List<Long> createdAt;
-//    @Query
-//    private Long createTime;
-//    @Query
-//    private Long endTime;
+    //操作类型
+    private List<String> types;
 
     private Integer page;