数据报表 按分类和商品名称筛选

统计增加 按现金支付统计
用户列表返回数据更新

eladmin-system/src/main/java/cn/ysk/cashier/vo/ShopUserInfoVo.java

@@ -18,34 +18,48 @@ package cn.ysk.cashier.vo;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
-/**
-* @author Zheng Jie
-* @date 2019-6-10 16:32:18
-*/
 @Data
 public class ShopUserInfoVo implements Serializable {
     private Integer id;
-
-    private Integer isVip;
-
-    private String nickName;
-
     private String headImg;
+    private String nickName;
+    private Object sex;
+    private BigDecimal amount;
 
+    private Integer totalScore;
     private String telephone;
+    private String birthDay;
+    private Integer isVip;
+    private long createAt;
+    private long lastLoginAt;
 
-    private Long updatedAt;
-
-    public ShopUserInfoVo() {
+    public Object getSex() {
+        return sex;
     }
 
-    public ShopUserInfoVo(Integer id, Integer isVip, String nickName, String headImg, String telephone, Long updatedAt) {
+    public void setSex(Object sex) {
+        if (sex == null) {
+            this.sex="未知";
+        }else if(sex.equals(1)){
+            this.sex = "男";
+        }else if(sex.equals(0)){
+            this.sex = "女";
+        }
+    }
+
+    public ShopUserInfoVo(Integer id, String headImg, String nickName, Object sex, BigDecimal amount, Integer totalScore, String telephone, String birthDay, Integer isVip, long createAt, long lastLoginAt) {
         this.id = id;
-        this.isVip = isVip;
-        this.nickName = nickName;
         this.headImg = headImg;
+        this.nickName = nickName;
+        setSex(sex);
+        this.amount = amount;
+        this.totalScore = totalScore;
         this.telephone = telephone;
-        this.updatedAt = updatedAt;
+        this.birthDay = birthDay;
+        this.isVip = isVip;
+        this.createAt = createAt;
+        this.lastLoginAt = lastLoginAt;
     }
 }

eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderSalesCountByDayVo.java

@@ -5,7 +5,7 @@ public class TbOrderSalesCountByDayVo {
 
     private String productName;
     private String productSkuName;
-
+    private String cateName;
     private Long salesNum;
     private Long refNum;
     private Long num;
@@ -26,6 +26,14 @@ public class TbOrderSalesCountByDayVo {
         this.productSkuName = productSkuName;
     }
 
+    public String getCateName() {
+        return cateName;
+    }
+
+    public void setCateName(String cateName) {
+        this.cateName = cateName;
+    }
+
     public Long getSalesNum() {
         return salesNum;
     }
@@ -57,4 +65,13 @@ public class TbOrderSalesCountByDayVo {
         this.refNum = refNum;
         this.num = num;
     }
+
+    public TbOrderSalesCountByDayVo(String productName, String productSkuName,String cateName, Long salesNum, Long refNum, Long num) {
+        this.productName = productName;
+        this.productSkuName = productSkuName;
+        this.cateName = cateName;
+        this.salesNum = salesNum;
+        this.refNum = refNum;
+        this.num = num;
+    }
 }