From d7a8d6edc5b0d0865d3ba15ec6cdf77a7710879f Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 1 Dec 2025 11:49:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E6=9C=AC=E4=BB=B7=E6=8A=98=E7=BA=BF?= =?UTF-8?q?=E5=9B=BE=20=E5=88=A9=E6=B6=A6=E7=8E=87=E6=9F=B1=E7=8A=B6?= =?UTF-8?q?=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/DataSummaryController.java | 40 ++++- .../service/ShopOrderStatisticService.java | 12 ++ .../com/czg/order/vo/CostLineChartVO.java | 73 +++++++++ .../java/com/czg/order/vo/CountPayTypeVo.java | 15 ++ .../java/com/czg/order/vo/ProfitRateVO.java | 79 ++++++++++ .../mapper/ShopOrderStatisticMapper.java | 27 ++++ .../impl/ShopOrderStatisticServiceImpl.java | 139 +++++++++++++----- 7 files changed, 349 insertions(+), 36 deletions(-) create mode 100644 cash-common/cash-common-service/src/main/java/com/czg/order/vo/CostLineChartVO.java create mode 100644 cash-common/cash-common-service/src/main/java/com/czg/order/vo/ProfitRateVO.java diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/DataSummaryController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/DataSummaryController.java index a3e9a829d..1bd970ad7 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/admin/DataSummaryController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/DataSummaryController.java @@ -6,7 +6,9 @@ import com.czg.order.entity.ShopProdStatistic; import com.czg.order.param.DataSummaryTradeParam; import com.czg.order.service.ShopOrderStatisticService; import com.czg.order.service.ShopProdStatisticService; +import com.czg.order.vo.CostLineChartVO; import com.czg.order.vo.CountPayTypeVo; +import com.czg.order.vo.ProfitRateVO; import com.czg.order.vo.TotalVo; import com.czg.resp.CzgResult; import com.czg.sa.StpKit; @@ -71,7 +73,7 @@ public class DataSummaryController { } /** - * 销售趋势柱状图 左下 + * 销售趋势柱状图 左下1 * * @param day 天数 * @param shopId 店铺id @@ -88,7 +90,7 @@ public class DataSummaryController { } /** - * 支付占比饼图 左下 + * 支付占比饼图 左下2 * * @param day 天数 * @param shopId 店铺id @@ -102,4 +104,38 @@ public class DataSummaryController { List data = orderStatisticService.getSummaryPayTypeData(shopId, day); return CzgResult.success(data); } + + /** + * 毛利率/净利率 柱状图 左下下 + * 利润率柱状图 + * @param day 天数 + * @param shopId 店铺id + */ + @GetMapping("profitRateBarChart") + @SaAdminCheckPermission(value = "dataSummary:profitRateBarChart", name = "毛利率/净利率柱状图 左下下") + public CzgResult> profitRateBarChart(@RequestParam Integer day, @RequestParam(required = false) Long shopId) { + AssertUtil.isNull(day, "天数不能为空"); + if (shopId == null) { + shopId = StpKit.USER.getShopId(); + } + List data = orderStatisticService.profitRateBarChart(shopId, day); + return CzgResult.success(data); + } + + /** + * 成本折线图 右下下 + * @param day 天数 + * @param shopId 店铺id + */ + @GetMapping("costLineChart") + @SaAdminCheckPermission(value = "dataSummary:costLineChart", name = "成本折线图 右下下") + public CzgResult> costLineChart(@RequestParam Integer day, @RequestParam(required = false) Long shopId) { + AssertUtil.isNull(day, "天数不能为空"); + if (shopId == null) { + shopId = StpKit.USER.getShopId(); + } + List data = orderStatisticService.costLineChart(shopId, day); + return CzgResult.success(data); + } + } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/service/ShopOrderStatisticService.java b/cash-common/cash-common-service/src/main/java/com/czg/order/service/ShopOrderStatisticService.java index 25dbcec37..7cfef6516 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/service/ShopOrderStatisticService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/service/ShopOrderStatisticService.java @@ -1,6 +1,8 @@ package com.czg.order.service; +import com.czg.order.vo.CostLineChartVO; import com.czg.order.vo.CountPayTypeVo; +import com.czg.order.vo.ProfitRateVO; import com.czg.order.vo.TotalVo; import com.mybatisflex.core.service.IService; import com.czg.order.entity.ShopOrderStatistic; @@ -40,6 +42,16 @@ public interface ShopOrderStatisticService extends IService * 获取支付方式数据 */ List getSummaryPayTypeData(Long shopId, Integer day); + /** + * 利润率折线图 + */ + List profitRateBarChart(Long shopId, Integer day); + + /** + * 成本折线图 + */ + List costLineChart(Long shopId, Integer day); + diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/CostLineChartVO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/CostLineChartVO.java new file mode 100644 index 000000000..d0c858a89 --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/CostLineChartVO.java @@ -0,0 +1,73 @@ +package com.czg.order.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDate; +import java.util.*; + +/** + * 成本折线图 左下下 + * + * @author ww + */ +@Data +@NoArgsConstructor +public class CostLineChartVO implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 成本价 + */ + private BigDecimal productCostAmount; + /** + * 日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate tradeDay; + + + public CostLineChartVO(LocalDate tradeDay) { + this.tradeDay = tradeDay; + } + + /** + * 合并实时数据和历史数据，并填充缺失的日期 + */ + public static List mergeAndFillData(CostLineChartVO onlineData, List historyData, + LocalDate startDate, LocalDate endDate) { + // 创建日期到数据的映射，方便查找 + Map dataMap = new HashMap<>(); + + // 将历史数据放入映射 + for (CostLineChartVO vo : historyData) { + if (vo.getTradeDay() != null) { + dataMap.put(vo.getTradeDay(), vo); + } + } + dataMap.put(onlineData.getTradeDay(), onlineData); + + List result = new ArrayList<>(); + LocalDate currentDay = startDate; + + while (!currentDay.isAfter(endDate)) { + if (dataMap.containsKey(currentDay)) { + result.add(dataMap.get(currentDay)); + } else { + // 创建空的TotalVo填充缺失的日期 + CostLineChartVO emptyVo = new CostLineChartVO(currentDay); + result.add(emptyVo); + } + currentDay = currentDay.plusDays(1); + } + // 按日期排序确保顺序正确 + result.sort(Comparator.comparing(CostLineChartVO::getTradeDay)); + return result; + } +} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/CountPayTypeVo.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/CountPayTypeVo.java index 20dde894c..2d4172091 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/CountPayTypeVo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/CountPayTypeVo.java @@ -40,6 +40,21 @@ public class CountPayTypeVo { PAY_TYPE_MAPPING.put("creditPay", "挂账支付"); } + /** + * 实时数据 + */ + public static List realTimeDataByDay(Map realTimeData) { + List result = new ArrayList<>(); + for (Map.Entry entry : PAY_TYPE_MAPPING.entrySet()) { + String payCode = entry.getKey(); + String payName = entry.getValue(); + + BigDecimal totalCount = getSafeValue(realTimeData, payCode); + result.add(new CountPayTypeVo(totalCount.intValue(), payName)); + } + + return result; + } /** * 合并实时数据和历史统计数据 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/ProfitRateVO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/ProfitRateVO.java new file mode 100644 index 000000000..ca8c9cbef --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/ProfitRateVO.java @@ -0,0 +1,79 @@ +package com.czg.order.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDate; +import java.util.*; + + +/** + * 毛利率/净利率 柱状图 左下下 + * 利润率柱状图 + * + * @author ww + */ +@Data +@NoArgsConstructor +public class ProfitRateVO implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 毛利率 + */ + private BigDecimal profitRate; + /** + * 净利润率 + */ + private BigDecimal netProfitRate; + /** + * 日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate tradeDay; + + + public ProfitRateVO(LocalDate tradeDay) { + this.tradeDay = tradeDay; + } + + /** + * 合并实时数据和历史数据，并填充缺失的日期 + */ + public static List mergeAndFillData(ProfitRateVO onlineData, List historyData, + LocalDate startDate, LocalDate endDate) { + // 创建日期到数据的映射，方便查找 + Map dataMap = new HashMap<>(); + + // 将历史数据放入映射 + for (ProfitRateVO vo : historyData) { + if (vo.getTradeDay() != null) { + dataMap.put(vo.getTradeDay(), vo); + } + } + dataMap.put(onlineData.getTradeDay(), onlineData); + + List result = new ArrayList<>(); + LocalDate currentDay = startDate; + + while (!currentDay.isAfter(endDate)) { + if (dataMap.containsKey(currentDay)) { + result.add(dataMap.get(currentDay)); + } else { + // 创建空的TotalVo填充缺失的日期 + ProfitRateVO emptyVo = new ProfitRateVO(currentDay); + result.add(emptyVo); + } + currentDay = currentDay.plusDays(1); + } + // 按日期排序确保顺序正确 + result.sort(Comparator.comparing(ProfitRateVO::getTradeDay)); + return result; + } +} 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 d0d6fca9e..feba7705a 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 @@ -1,7 +1,9 @@ package com.czg.service.order.mapper; import com.czg.order.entity.ShopOrderStatistic; +import com.czg.order.vo.CostLineChartVO; import com.czg.order.vo.ProductCostAmountVO; +import com.czg.order.vo.ProfitRateVO; import com.czg.order.vo.TotalVo; import com.mybatisflex.core.BaseMapper; import org.apache.ibatis.annotations.Select; @@ -141,6 +143,31 @@ public interface ShopOrderStatisticMapper extends BaseMapper Map getPayTypeDateRangeRaw(Long shopId, LocalDate start, LocalDate end); + @Select("SELECT" + + " profit_rate as profitRate, " + + " net_profit_rate as netProfitRate, " + + " statistic_date as tradeDay" + + " FROM" + + " tb_shop_order_statistic " + + " WHERE" + + " shop_id = #{shopId} " + + "and statistic_date >= #{start} " + + "and statistic_date <= #{end} ") + List profitRateBarChart(Long shopId, LocalDate start, LocalDate end); + + + @Select("SELECT" + + " product_cost_amount as productCostAmount, " + + " statistic_date as tradeDay" + + " FROM" + + " tb_shop_order_statistic " + + " WHERE" + + " shop_id = #{shopId} " + + "and statistic_date >= #{start} " + + "and statistic_date <= #{end} ") + List costLineChart(Long shopId, LocalDate start, LocalDate end); + + //*********************以下为日常统计******************************************************************************** diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java index 09e43696b..198759919 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java @@ -6,9 +6,7 @@ import cn.hutool.core.collection.CollUtil; import com.czg.exception.CzgException; import com.czg.order.entity.ShopOrderStatistic; import com.czg.order.service.ShopOrderStatisticService; -import com.czg.order.vo.CountPayTypeVo; -import com.czg.order.vo.ProductCostAmountVO; -import com.czg.order.vo.TotalVo; +import com.czg.order.vo.*; import com.czg.service.order.mapper.ShopOrderStatisticMapper; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; @@ -65,23 +63,56 @@ public class ShopOrderStatisticServiceImpl extends ServiceImpl getDateAmount(Long shopId, Integer day) { LocalDate currentDate = LocalDate.now(); - LocalDate startDate = currentDate; - if (day == 7) { - startDate = currentDate.minusDays(6); - } else if (day == 30) { - startDate = currentDate.minusDays(29); - } + LocalDate startDate; TotalVo onlineDataAmount = mapper.getOnlineDataAmount(shopId, currentDate); if (onlineDataAmount == null) { onlineDataAmount = new TotalVo(currentDate); } + if (day <= 1) { + return List.of(onlineDataAmount); + }else { + startDate = currentDate.minusDays(day - 1); + } List statDateRange = mapper.getStatDateRange(shopId, startDate, currentDate); - return TotalVo.mergeAndFillData(onlineDataAmount, statDateRange, startDate, currentDate); } @Override public List getSummaryPayTypeData(Long shopId, Integer day) { + LocalDate currentDate = LocalDate.now(); + LocalDate startDate; + if (day <= 1) { + Map onlinePayTypeDate = mapper.getOnlinePayTypeDate(shopId, currentDate); + return CountPayTypeVo.realTimeDataByDay(onlinePayTypeDate); + }else { + startDate = currentDate.minusDays(day - 1); + } + return CountPayTypeVo.mergePayTypeData( + mapper.getOnlinePayTypeDate(shopId, currentDate), + mapper.getPayTypeDateRangeRaw(shopId, startDate, currentDate)); + } + + @Override + public List profitRateBarChart(Long shopId, Integer day) { + LocalDate currentDate = LocalDate.now(); + LocalDate startDate; + ShopOrderStatistic onlineDataAmount = getRealTimeDataByDay(shopId, currentDate); + ProfitRateVO onlineProfitRateBarChart = new ProfitRateVO(currentDate); + if (onlineDataAmount != null) { + onlineProfitRateBarChart.setProfitRate(onlineDataAmount.getProfitRate()); + onlineProfitRateBarChart.setNetProfitRate(onlineDataAmount.getNetProfitRate()); + } + if (day <= 1) { + return List.of(onlineProfitRateBarChart); + }else { + startDate = currentDate.minusDays(day - 1); + } + List statDateRange = mapper.profitRateBarChart(shopId, startDate, currentDate); + return ProfitRateVO.mergeAndFillData(onlineProfitRateBarChart, statDateRange, startDate, currentDate); + } + + @Override + public List costLineChart(Long shopId, Integer day) { LocalDate currentDate = LocalDate.now(); LocalDate startDate = currentDate; if (day == 7) { @@ -89,11 +120,17 @@ public class ShopOrderStatisticServiceImpl extends ServiceImpl statDateRange = mapper.costLineChart(shopId, startDate, currentDate); + return CostLineChartVO.mergeAndFillData(onlineCostLineChart, statDateRange, startDate, currentDate); } + + //u--------------------------------------------------_--------------------------------------------------------- + @Override public void statisticAndInsert(Long shopId, LocalDate day) { ShopOrderStatistic realTimeData = getRealTimeDataByDay(shopId, day); @@ -185,7 +222,7 @@ public class ShopOrderStatisticServiceImpl extends ServiceImpl 0) { - BigDecimal profitRate = result.getProfitAmount().divide(result.getPayAmount(), 4, RoundingMode.HALF_DOWN).multiply(BigDecimal.valueOf(100)); - result.setProfitRate(profitRate); - } else { - result.setProfitRate(BigDecimal.ZERO); + profitRate = profitAmount.divide(result.getPayAmount(), 4, RoundingMode.HALF_DOWN) + .multiply(BigDecimal.valueOf(100)); } - //净利润 净利率 目前和 毛利润 毛利率 一致 - result.setNetProfitRate(result.getProfitRate()); - result.setNetProfitAmount(result.getProfitAmount()); - //客单价 实付金额(包括线上支付 包含现金支付 包含会员支付 包含挂账)/就餐人数 + result.setProfitRate(profitRate); + + // 净利润、净利率目前和毛利润、毛利率一致 + result.setNetProfitAmount(profitAmount); + result.setNetProfitRate(profitRate); + } + + /** + * 计算客单价 + * 客单价 = 实付金额 / 就餐人数（就餐人数为0时直接使用实付金额） + */ + private void calculateAvgPayAmount(ShopOrderStatistic result) { + BigDecimal avgPayAmount; + // 校验就餐人数有效性 if (result.getCustomerCount() != null && result.getCustomerCount() > 0) { - result.setAvgPayAmount(result.getPayAmount().divide(new BigDecimal(result.getCustomerCount()), 2, RoundingMode.HALF_DOWN)); + avgPayAmount = result.getPayAmount().divide( + new BigDecimal(result.getCustomerCount()), 2, RoundingMode.HALF_DOWN + ); } else { - result.setAvgPayAmount(result.getPayAmount()); + avgPayAmount = result.getPayAmount(); } - //翻台率 （订单数-桌台数）/桌台数*100% + result.setAvgPayAmount(avgPayAmount); + } + + /** + * 计算翻台率 + * 翻台率 = （订单数-桌台数）/桌台数*100%（差值≤0时翻台率为0） + */ + private void calculateTurnoverRate(ShopOrderStatistic result) { + BigDecimal turnoverRate = BigDecimal.ZERO; + + // 校验桌台数有效性 if (result.getTableCount() != null && result.getTableCount() > 0) { long orderTableDifference = result.getOrderCount() - result.getTableCount(); - BigDecimal turnoverRate = BigDecimal.ZERO; + // 仅当差值大于0时计算翻台率 if (orderTableDifference > 0) { - turnoverRate = new BigDecimal(orderTableDifference).divide(new BigDecimal(result.getTableCount()), 2, RoundingMode.HALF_DOWN); + turnoverRate = new BigDecimal(orderTableDifference) + .divide(new BigDecimal(result.getTableCount()), 2, RoundingMode.HALF_DOWN); } - result.setTurnoverRate(turnoverRate); - } else { - result.setTurnoverRate(BigDecimal.ZERO); } + result.setTurnoverRate(turnoverRate); }