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 044d32c4..278a9819 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 @@ -15,7 +15,7 @@ import java.time.LocalDate; import java.time.LocalDateTime; /** - * 实体类。 + * 实体类。 * * @author zs * @since 2025-03-07 @@ -133,14 +133,19 @@ public class ShopOrderStatistic implements Serializable { * 翻台率 */ private BigDecimal tableTurnoverRate = BigDecimal.ZERO; + /** + * 新增会员数 + */ + private Long newMemberCount = 0L; /** * 店铺id */ + @JSONField(serialize = false) private Long shopId; /** * 创建时间 */ - @JSONField(format = "yyyy-MM-dd") + @JSONField(serialize = false, format = "yyyy-MM-dd") private LocalDate createDay; /** * 最近一次统计时间 diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopOrderStatisticMapper.java b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopOrderStatisticMapper.java index 8b13ae02..7868e999 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopOrderStatisticMapper.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopOrderStatisticMapper.java @@ -13,5 +13,6 @@ import com.mybatisflex.core.BaseMapper; public interface ShopOrderStatisticMapper extends BaseMapper { ShopOrderStatistic getTradeData(DataSummaryTradeParam param); + long getNewMemberCount(DataSummaryTradeParam param); } diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DataSummaryServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DataSummaryServiceImpl.java index 267ee1da..a9b819c6 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DataSummaryServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DataSummaryServiceImpl.java @@ -50,6 +50,8 @@ public class DataSummaryServiceImpl implements DataSummaryService { } shopOrderStatistic.setCustomerUnitPrice(shopOrderStatistic.getCustomerUnitPrice().setScale(2, java.math.RoundingMode.HALF_UP)); shopOrderStatistic.setTableTurnoverRate(shopOrderStatistic.getTableTurnoverRate().setScale(2, java.math.RoundingMode.HALF_UP)); + long newMemberCount = shopOrderStatisticMapper.getNewMemberCount(param); + shopOrderStatistic.setNewMemberCount(newMemberCount); return shopOrderStatistic; } diff --git a/cash-service/order-service/src/main/resources/mapper/ShopOrderStatisticMapper.xml b/cash-service/order-service/src/main/resources/mapper/ShopOrderStatisticMapper.xml index 07528d3b..1ddf8dca 100644 --- a/cash-service/order-service/src/main/resources/mapper/ShopOrderStatisticMapper.xml +++ b/cash-service/order-service/src/main/resources/mapper/ShopOrderStatisticMapper.xml @@ -3,7 +3,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - +