From a2b546f85d5fe0daad3938ae35ff279af3f391ab Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 24 Nov 2025 13:47:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/order/param/DataSummaryTradeParam.java    | 15 +++++++--------
 .../impl/ShopOrderStatisticServiceImpl.java       |  8 ++++----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryTradeParam.java b/cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryTradeParam.java
index b44146fa2..f102669cd 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryTradeParam.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryTradeParam.java
@@ -1,6 +1,5 @@
 package com.czg.order.param;
 
-import com.czg.validator.group.DefaultGroup;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
@@ -33,13 +32,13 @@ public class DataSummaryTradeParam implements Serializable {
     private LocalDate endDate;
     /**
      *  时间范围类型
-     *  TODAY,       今天
-     *  YESTERDAY,   昨天
-     *  LAST_7_DAYS, 最近7天
-     *  LAST_30_DAYS,最近30天
-     *  THIS_WEEK,   本周
-     *  THIS_MONTH   本月
-     *  CUSTOM       自定义时间范围
+     *  today,       今天
+     *  yesterday,   昨天
+     *  last_7_days, 最近7天
+     *  last_30_days,最近30天
+     *  this_week,   本周
+     *  this_month   本月
+     *  custom       自定义时间范围
      */
     @NotBlank(message = "时间范围类型不能为空")
     private String rangeType;
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 5e2ce2de3..9f848067d 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
@@ -12,13 +12,13 @@ import com.czg.service.order.mapper.ShopOrderStatisticMapper;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;
-import java.util.*;
+import java.util.List;
+import java.util.Objects;
 
 
 /**
@@ -190,9 +190,9 @@ public class ShopOrderStatisticServiceImpl extends ServiceImpl<ShopOrderStatisti
         result.setNetProfitRate(result.getProfitRate());
         result.setNetProfitAmount(result.getProfitAmount());
         //客单价 实付金额(包括线上支付 包含现金支付 包含会员支付 包含挂账)/就餐人数
-        if (result.getCustomerCount() > 0) {
+        if (result.getCustomerCount() != null && result.getCustomerCount() > 0) {
             result.setAvgPayAmount(result.getPayAmount().divide(new BigDecimal(result.getCustomerCount()), 2, RoundingMode.HALF_DOWN));
-        }else {
+        } else {
             result.setAvgPayAmount(result.getPayAmount());
         }
         //翻台率 （订单数-桌台数）/桌台数*100%