From 55ac947ed96cb11c0e834f5870d0a547b224b537 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 25 Jun 2025 20:26:14 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BA=A7=E5=93=81ID=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/dto/pre/fry/AddPreFryRecordsDTO.java | 5 +++++ .../cool/store/dto/pre/fry/AddPreFryRecordsDetailDTO.java | 3 +++ .../cool/store/service/impl/PreFryRecordsServiceImpl.java | 3 +++ 3 files changed, 11 insertions(+) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/AddPreFryRecordsDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/AddPreFryRecordsDTO.java index 0b0276282..430c58f64 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/AddPreFryRecordsDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/AddPreFryRecordsDTO.java @@ -3,6 +3,9 @@ package com.cool.store.dto.pre.fry; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -14,12 +17,14 @@ import java.util.List; public class AddPreFryRecordsDTO { @ApiModelProperty("门店编码") + @NotEmpty(message = "门店编码不能为空") private String storeCode; @ApiModelProperty("当前产品阶段：1-预炸完成，2-存入展示柜，3-放入冰箱，4-次日拿出，5-报废") private Integer currentStage; @ApiModelProperty("申请类型 选择的类型 不是最高类型") + @NotNull(message = "申请类型不能为空") private Integer applyType; @ApiModelProperty("批量数据") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/AddPreFryRecordsDetailDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/AddPreFryRecordsDetailDTO.java index cc9ed3ff2..b91a4fd76 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/AddPreFryRecordsDetailDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/AddPreFryRecordsDetailDTO.java @@ -3,6 +3,8 @@ package com.cool.store.dto.pre.fry; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; + /** * @Author suzhuhong * @Date 2025/6/23 14:55 @@ -14,6 +16,7 @@ public class AddPreFryRecordsDetailDTO { @ApiModelProperty("记录ID") private Long recordId; @ApiModelProperty("产品ID") + @NotNull(message = "产品ID不能为空") private Long productId; @ApiModelProperty("图片1") private String image1; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryRecordsServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryRecordsServiceImpl.java index 47cb52e7c..162893862 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryRecordsServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryRecordsServiceImpl.java @@ -75,6 +75,9 @@ public class PreFryRecordsServiceImpl implements PreFryRecordsService { List list = new ArrayList<>(); if (addPreFryRecordsFlag(minApplyTypeByStoreCode.getApplyType(), addPreFryRecordsDTO.getCurrentStage())){ addPreFryRecordsDTO.getRecords().forEach(x->{ + if (x.getProductId()==null){ + throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); + } PreFryRecordsDO preFryRecordsDO = new PreFryRecordsDO(); preFryRecordsDO.setStoreCode(addPreFryRecordsDTO.getStoreCode()); preFryRecordsDO.setProductId(x.getProductId());