czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

空指针

Browse Source
This commit is contained in:
wangw
2025-11-24 13:47:29 +08:00
parent 48db740279
commit a2b546f85d
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryTradeParam.java
View File

@@ -1,6 +1,5 @@
package com.czg.order.param; package com.czg.order.param;
import com.czg.validator.group.DefaultGroup;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
@@ -33,13 +32,13 @@ public class DataSummaryTradeParam implements Serializable {
private LocalDate endDate; private LocalDate endDate;
/** /**
* 时间范围类型 * 时间范围类型
* TODAY, 今天 * today, 今天
* YESTERDAY, 昨天 * yesterday, 昨天
* LAST_7_DAYS, 最近7天 * last_7_days, 最近7天
* LAST_30_DAYS,最近30天 * last_30_days,最近30天
* THIS_WEEK, 本周 * this_week, 本周
* THIS_MONTH 本月 * this_month 本月
* CUSTOM 自定义时间范围 * custom 自定义时间范围
*/ */
@NotBlank(message = "时间范围类型不能为空") @NotBlank(message = "时间范围类型不能为空")
private String rangeType; private String rangeType;

6
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java
View File

@@ -12,13 +12,13 @@ import com.czg.service.order.mapper.ShopOrderStatisticMapper;
import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl; import com.mybatisflex.spring.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.*; import java.util.List;
import java.util.Objects;
/** /**
@@ -190,7 +190,7 @@ public class ShopOrderStatisticServiceImpl extends ServiceImpl<ShopOrderStatisti
result.setNetProfitRate(result.getProfitRate()); result.setNetProfitRate(result.getProfitRate());
result.setNetProfitAmount(result.getProfitAmount()); 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)); result.setAvgPayAmount(result.getPayAmount().divide(new BigDecimal(result.getCustomerCount()), 2, RoundingMode.HALF_DOWN));
} else { } else {
result.setAvgPayAmount(result.getPayAmount()); result.setAvgPayAmount(result.getPayAmount());