diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java index a31cca856..80900f656 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java @@ -1,18 +1,19 @@ package com.czg.order.entity; +import com.alibaba.fastjson2.annotation.JSONField; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; -import java.io.Serializable; -import java.math.BigDecimal; -import java.sql.Date; - -import java.io.Serial; - import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; + /** * 实体类。 * @@ -111,17 +112,40 @@ public class ShopOrderStatistic implements Serializable { * 主扫支付金额 */ private BigDecimal scanPayAmount = BigDecimal.ZERO; - private Long cashPayCount = 0L; - private BigDecimal cashPayAmount = BigDecimal.ZERO; + /** + * 现金支付笔数 + */ + private Long cashPayCount = 0L; + /** + * 现金支付金额 + */ + private BigDecimal cashPayAmount = BigDecimal.ZERO; + /** + * 充值金额 + */ + private BigDecimal rechargeAmount = BigDecimal.ZERO; + /** + * 客单价 + */ + private BigDecimal customerUnitPrice = BigDecimal.ZERO; + /** + * 翻台率 + */ + private BigDecimal tableTurnoverRate = BigDecimal.ZERO; /** * 店铺id */ private Long shopId; - /** * 创建时间 */ - private Date createDay; + @JSONField(format = "yyyy-MM-dd") + private LocalDate createDay = LocalDate.now(); + /** + * 最近一次统计时间 + */ + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime = LocalDateTime.now(); }