汇总部分数据，分类逻辑更改，规格去空格

eladmin-system/src/main/java/cn/ysk/cashier/pojo/TbShopUserDuty.java

@@ -0,0 +1,80 @@
+package cn.ysk.cashier.pojo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+
+/**
+ *
+ * @author lyf
+ */
+@Entity
+@Data
+@Table(name = "tb_shop_user_duty")
+public class TbShopUserDuty implements Serializable {
+    @Id
+    @Column(name = "`id`")
+    @ApiModelProperty(value = "自增id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    @Column(name = "user_id")
+    @ApiModelProperty(value = "员工id")
+    private Integer userId;
+
+    @Column(name = "login_time")
+    @ApiModelProperty(value = "登录时间")
+    private Timestamp loginTime;
+
+    @Column(name = "order_num")
+    @ApiModelProperty(value = "订单数量")
+    private Integer orderNum;
+
+    @Column(name = "amount")
+    @ApiModelProperty(value = "总收入")
+    private BigDecimal amount;
+
+    @Column(name = "login_out_time")
+    @ApiModelProperty(value = "登出时间")
+    private Timestamp loginOutTime;
+
+    @Column(name = "user_name")
+    @ApiModelProperty(value = "员工名称")
+    private String userName;
+
+    @Column(name = "status")
+    @ApiModelProperty(value = "0:营业中，1：已交班")
+    private String status;
+
+    @Column(name = "income_amount")
+    @ApiModelProperty(value = "当班收入")
+    private BigDecimal incomeAmount;
+
+    @Column(name = "shop_id")
+    @ApiModelProperty(value = "shopId")
+    private Integer shopId;
+
+    @Column(name = "petty_cash")
+    @ApiModelProperty(value = "备用金")
+    private BigDecimal pettyCash;
+
+    @Column(name = "hand_amount")
+    @ApiModelProperty(value = "上交金额")
+    private BigDecimal handAmount;
+
+    @Column(name = "equipment")
+    @ApiModelProperty(value = "设备")
+    private String equipment;
+
+    @Column(name = "token_id")
+    @ApiModelProperty(value = "tokenId")
+    private Integer tokenId;
+
+    @Column(name = "return_amount")
+    @ApiModelProperty(value = "退单金额")
+    private BigDecimal returnAmount;
+}

eladmin-system/src/main/java/cn/ysk/cashier/pojo/TbShopUserDutyDetail.java

@@ -0,0 +1,49 @@
+package cn.ysk.cashier.pojo;
+
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author 12847
+ */
+@Entity
+@Data
+@Table(name = "tb_shop_user_duty_detail")
+public class TbShopUserDutyDetail implements Serializable {
+    @Id
+    @Column(name = "`id`")
+    @ApiModelProperty(value = "自增id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    @Column(name = "duty_id")
+    @ApiModelProperty(value = "值班ID")
+    private Integer dutyId;
+
+    @Column(name = "product_id")
+    @ApiModelProperty(value = "商品ID")
+    private Integer productId;
+
+    @Column(name = "product_name")
+    @ApiModelProperty(value = "商品名称")
+    private String productName;
+    @Column(name = "sku_id")
+    @ApiModelProperty(value = "规格ID")
+    private Integer skuId;
+
+    @Column(name = "sku_name")
+    @ApiModelProperty(value = "规格名称")
+    private Integer skuName;
+
+    @Column(name = "num")
+    @ApiModelProperty(value = "规格名称")
+    private Integer num;
+    @Column(name = "amount")
+    @ApiModelProperty(value = "商品金额小计")
+    private BigDecimal amount;
+}