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:32:18 +08:00
parent 8512c4a6ee
commit 48db740279
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cash-api/order-server/src/main/java/com/czg/controller/admin/DataSummaryController.java
View File

@@ -17,6 +17,7 @@ import com.czg.validator.ValidatorUtil;
import com.czg.validator.group.DefaultGroup; import com.czg.validator.group.DefaultGroup;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
@@ -49,12 +50,11 @@ public class DataSummaryController {
@GetMapping("trade") @GetMapping("trade")
@OperationLog("营业板块-上半部分") @OperationLog("营业板块-上半部分")
@SaAdminCheckPermission(value = "dataSummary:trade", name = "营业板块-上半部分") @SaAdminCheckPermission(value = "dataSummary:trade", name = "营业板块-上半部分")
public CzgResult<ShopOrderStatistic> getTradeData(DataSummaryTradeParam param) { public CzgResult<ShopOrderStatistic> getTradeData(@Validated DataSummaryTradeParam param) {
Boolean hasKey = redisService.hasKey("task:statistic:date:"); Boolean hasKey = redisService.hasKey("task:statistic:date:");
if (hasKey) { if (hasKey) {
return CzgResult.failure("数据统计任务正在运行中，请稍后再试"); return CzgResult.failure("数据统计任务正在运行中，请稍后再试");
} }
ValidatorUtil.validateEntity(param, DefaultGroup.class);
Long shopId = StpKit.USER.getShopId(); Long shopId = StpKit.USER.getShopId();
if (param.getShopId() == null) { if (param.getShopId() == null) {
param.setShopId(shopId); param.setShopId(shopId);
@@ -69,8 +69,7 @@ public class DataSummaryController {
@GetMapping("productSaleDate") @GetMapping("productSaleDate")
@OperationLog("商品销售-右下") @OperationLog("商品销售-右下")
@SaAdminCheckPermission(value = "dataSummary:productSaleData", name = "商品销售-右下") @SaAdminCheckPermission(value = "dataSummary:productSaleData", name = "商品销售-右下")
public CzgResult<List<ShopProdStatistic>> getProductSaleData(DataSummaryTradeParam param) { public CzgResult<List<ShopProdStatistic>> getProductSaleData(@Validated DataSummaryTradeParam param) {
ValidatorUtil.validateEntity(param, DefaultGroup.class);
Long shopId = StpKit.USER.getShopId(); Long shopId = StpKit.USER.getShopId();
if (param.getShopId() == null) { if (param.getShopId() == null) {
param.setShopId(shopId); param.setShopId(shopId);

5
cash-api/order-server/src/main/java/com/czg/controller/admin/TableSummaryController.java
View File

@@ -14,6 +14,7 @@ import com.czg.sa.StpKit;
import com.pig4cloud.plugin.excel.annotation.ResponseExcel; import com.pig4cloud.plugin.excel.annotation.ResponseExcel;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@@ -41,7 +42,7 @@ public class TableSummaryController {
@GetMapping("list") @GetMapping("list")
@OperationLog("统计") @OperationLog("统计")
//@SaAdminCheckPermission("tableSummary:list") //@SaAdminCheckPermission("tableSummary:list")
public CzgResult<List<ShopTableOrderStatistic>> summaryList(DataSummaryTradeParam param) { public CzgResult<List<ShopTableOrderStatistic>> summaryList(@Validated DataSummaryTradeParam param) {
Long shopId = StpKit.USER.getShopId(); Long shopId = StpKit.USER.getShopId();
if (param.getShopId() == null) { if (param.getShopId() == null) {
param.setShopId(shopId); param.setShopId(shopId);
@@ -58,7 +59,7 @@ public class TableSummaryController {
@OperationLog("导出") @OperationLog("导出")
//@SaAdminCheckPermission("tableSummary:export") //@SaAdminCheckPermission("tableSummary:export")
public List<TableSummaryExportVo> summaryExport(TableSummaryParam param) { public List<TableSummaryExportVo> summaryExport(TableSummaryParam param) {
Long shopId = StpKit.USER.getShopId(0L); Long shopId = StpKit.USER.getShopId();
if (param.getShopId() == null) { if (param.getShopId() == null) {
param.setShopId(shopId); param.setShopId(shopId);
} }

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

@@ -2,6 +2,7 @@ package com.czg.order.param;
import com.czg.validator.group.DefaultGroup; import com.czg.validator.group.DefaultGroup;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import java.io.Serial; import java.io.Serial;
@@ -23,12 +24,12 @@ public class DataSummaryTradeParam implements Serializable {
/** /**
* 开始时间 格式：yyyy-MM-dd * 开始时间 格式：yyyy-MM-dd
*/ */
@NotBlank(message = "开始日期不能为空", groups = DefaultGroup.class) @NotNull(message = "开始日期不能为空")
private LocalDate beginDate; private LocalDate beginDate;
/** /**
* 结束时间 格式：yyyy-MM-dd * 结束时间 格式：yyyy-MM-dd
*/ */
@NotBlank(message = "结束日期不能为空", groups = DefaultGroup.class) @NotNull(message = "结束日期不能为空")
private LocalDate endDate; private LocalDate endDate;
/** /**
* 时间范围类型 * 时间范围类型
@@ -40,6 +41,7 @@ public class DataSummaryTradeParam implements Serializable {
* THIS_MONTH 本月 * THIS_MONTH 本月
* CUSTOM 自定义时间范围 * CUSTOM 自定义时间范围
*/ */
@NotBlank(message = "时间范围类型不能为空")
private String rangeType; private String rangeType;
/** /**
* 店铺id * 店铺id