From c467ea2eb390d82cd96dac34d58babad64e7c9a2 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Wed, 8 Oct 2025 20:55:38 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=94=9F=E4=BA=A7=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E5=88=97=E8=A1=A8=EF=BC=8C=E7=BC=96=E8=BE=91=E6=97=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=AF=E5=90=A6=E7=B4=A7=E6=80=A5=E5=8D=95?= =?UTF-8?q?=E6=9C=AA=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../storeProductDemandDetail/StoreProdDemandDetailUpdateVO.java | 2 ++ .../StoreProdDemandDetailUpdateDTO.java | 2 ++ .../xkt/service/impl/StoreProductDemandDetailServiceImpl.java | 2 ++ 3 files changed, 6 insertions(+) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemandDetail/StoreProdDemandDetailUpdateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemandDetail/StoreProdDemandDetailUpdateVO.java index 0207d71bb..3c65bcda0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemandDetail/StoreProdDemandDetailUpdateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemandDetail/StoreProdDemandDetailUpdateVO.java @@ -18,6 +18,8 @@ public class StoreProdDemandDetailUpdateVO { @NotNull(message = "商品需求明细ID不能为空") @ApiModelProperty(value = "商品需求明细ID", required = true) private Long storeProdDemandDetailId; + @ApiModelProperty(value = "是否紧急单") + private Integer emergency; @ApiModelProperty(value = "尺码30") private Integer size30; @ApiModelProperty(value = "尺码31") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemandDetail/StoreProdDemandDetailUpdateDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemandDetail/StoreProdDemandDetailUpdateDTO.java index e2b09f121..f97b15201 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemandDetail/StoreProdDemandDetailUpdateDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemandDetail/StoreProdDemandDetailUpdateDTO.java @@ -15,6 +15,8 @@ public class StoreProdDemandDetailUpdateDTO { @ApiModelProperty(value = "商品需求明细ID") private Long storeProdDemandDetailId; + @ApiModelProperty(value = "是否紧急单") + private Integer emergency; @ApiModelProperty(value = "尺码30") private Integer size30; @ApiModelProperty(value = "尺码31") diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandDetailServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandDetailServiceImpl.java index 96930bfcb..df27374ab 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandDetailServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandDetailServiceImpl.java @@ -9,6 +9,7 @@ import com.ruoyi.xkt.dto.storeProductDemandDetail.StoreProdDemandDetailUpdateDTO import com.ruoyi.xkt.mapper.StoreProductDemandDetailMapper; import com.ruoyi.xkt.service.IStoreProductDemandDetailService; import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -38,6 +39,7 @@ public class StoreProductDemandDetailServiceImpl implements IStoreProductDemandD StoreProductDemandDetail demandDetail = Optional.ofNullable(this.demandDetailMapper.selectOne(new LambdaQueryWrapper() .eq(StoreProductDemandDetail::getId, updateDTO.getStoreProdDemandDetailId()).eq(StoreProductDemandDetail::getDelFlag, Constants.UNDELETED))) .orElseThrow(() -> new ServiceException("商品需求单明细不存在!", HttpStatus.ERROR)); + demandDetail.setEmergency(ObjectUtils.defaultIfNull(updateDTO.getEmergency(), 0)); // 如果数量为0，则设置为null demandDetail.setSize30(this.convertZeroToNull(updateDTO.getSize30())); demandDetail.setSize31(this.convertZeroToNull(updateDTO.getSize31()));