From 63f1aa2e8a5f568d070678bce9e1f9491d751da6 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Tue, 25 Nov 2025 21:20:52 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=BC=96=E8=BE=91=E6=A1=A3?= =?UTF-8?q?=E5=8F=A3=E5=8F=AF=E4=BB=A5=E6=9B=B4=E6=96=B0LOGO=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkt/vo/store/StoreUpdateVO.java | 17 +++++++++++++ .../ruoyi/xkt/dto/store/StoreUpdateDTO.java | 25 ++++++++++++++++--- .../xkt/service/impl/StoreServiceImpl.java | 6 +++++ 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreUpdateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreUpdateVO.java index 8566c7ec4..022551376 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreUpdateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreUpdateVO.java @@ -8,6 +8,7 @@ import lombok.experimental.Accessors; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; +import java.math.BigDecimal; /** * @author liujiang @@ -48,5 +49,21 @@ public class StoreUpdateVO { private String facAddress; @ApiModelProperty(value = "生产规模") private Integer prodScale; + @ApiModelProperty(value = "档口logo") + private SUFileVO storeLogo; + + + @Data + public static class SUFileVO { + @ApiModelProperty(value = "文件名称") + private String fileName; + @ApiModelProperty(value = "文件路径") + private String fileUrl; + @ApiModelProperty(value = "文件类型(6档口营业执照)") + private Integer fileType; + @ApiModelProperty(value = "文件大小") + private BigDecimal fileSize; + } + } diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreUpdateDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreUpdateDTO.java index 78d3c0400..c50e33883 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreUpdateDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreUpdateDTO.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * @author liujiang * @version v1.0 @@ -15,13 +17,13 @@ import lombok.experimental.Accessors; @Accessors(chain = true) public class StoreUpdateDTO { - @ApiModelProperty(value = "档口ID", required = true) + @ApiModelProperty(value = "档口ID") private Long storeId; - @ApiModelProperty(value = "档口名称", required = true) + @ApiModelProperty(value = "档口名称") private String storeName; - @ApiModelProperty(value = "联系人", required = true) + @ApiModelProperty(value = "联系人") private String contactName; - @ApiModelProperty(value = "联系电话", required = true) + @ApiModelProperty(value = "联系电话") private String contactPhone; @ApiModelProperty(value = "备选联系电话") private String contactBackPhone; @@ -39,5 +41,20 @@ public class StoreUpdateDTO { private String facAddress; @ApiModelProperty(value = "生产规模") private Integer prodScale; + @ApiModelProperty(value = "档口logo") + private SUFileDTO storeLogo; + + + @Data + public static class SUFileDTO { + @ApiModelProperty(value = "文件名称") + private String fileName; + @ApiModelProperty(value = "文件路径") + private String fileUrl; + @ApiModelProperty(value = "文件类型(6档口营业执照)") + private Integer fileType; + @ApiModelProperty(value = "文件大小") + private BigDecimal fileSize; + } } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java index 9f72ca58d..b3cdd8a83 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java @@ -301,6 +301,12 @@ public class StoreServiceImpl implements IStoreService { .eq(Store::getId, storeUpdateDTO.getStoreId()).eq(Store::getDelFlag, Constants.UNDELETED))) .orElseThrow(() -> new ServiceException("档口不存在!", HttpStatus.ERROR)); BeanUtil.copyProperties(storeUpdateDTO, store); + // 如果有档口LOGO,则更新档口LOGO + if (ObjectUtils.isNotEmpty(storeUpdateDTO.getStoreLogo())) { + SysFile sysFile = BeanUtil.toBean(storeUpdateDTO.getStoreLogo(), SysFile.class); + this.fileMapper.insert(sysFile); + store.setStoreLogoId(sysFile.getId()); + } return storeMapper.updateById(store); }