From 81e98a451618963c55ce38a110476572c6cdd260 Mon Sep 17 00:00:00 2001 From: dzq Date: Fri, 9 Jan 2026 11:19:59 +0800 Subject: [PATCH] =?UTF-8?q?refactor(shop):=20=E7=AE=80=E5=8C=96=E5=BA=97?= =?UTF-8?q?=E9=93=BA=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 移除店铺详情中的冗余字段（封面图、柜机类型、运行模式等）， 优化柜机详情API文档注释 Co-Authored-By: Claude --- .../smartCabinet/dto/CabinetDetailDTO.java | 4 ++-- .../shop/shop/ShopApplicationService.java | 6 ------ .../domain/shop/shop/dto/ShopDetailDTO.java | 18 ------------------ 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/dto/CabinetDetailDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/dto/CabinetDetailDTO.java index a065795..2eccd50 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/dto/CabinetDetailDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/dto/CabinetDetailDTO.java @@ -49,10 +49,10 @@ public class CabinetDetailDTO { @ApiModelProperty("密码") private String password; - @ApiModelProperty("使用状态（0-空闲 1-占用 2-维护 3-禁用）") + @ApiModelProperty("使用状态（1空闲 2已占用）") private Integer usageStatus; - @ApiModelProperty("格子类型（0-普通 1-冷藏 2-加热）") + @ApiModelProperty("格口类型（1小格 2中格 3大格 4超大格）") private Integer cellType; @ApiModelProperty("备注") diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/ShopApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/ShopApplicationService.java index c52b32d..cad5c9d 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/ShopApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/ShopApplicationService.java @@ -139,22 +139,16 @@ public class ShopApplicationService { shopDetailDTO.setBelongType(shop.getBelongType()); shopDetailDTO.setMode(shop.getMode()); shopDetailDTO.setBalanceEnable(shop.getBalanceEnable()); - shopDetailDTO.setCoverImg(shop.getCoverImg()); List cabinetInfoList = new ArrayList<>(); for (SmartCabinetEntity cabinet : cabinets) { ShopDetailDTO.CabinetInfoDTO cabinetInfo = new ShopDetailDTO.CabinetInfoDTO(); cabinetInfo.setCabinetId(cabinet.getCabinetId()); cabinetInfo.setCabinetName(cabinet.getCabinetName()); - cabinetInfo.setCabinetType(cabinet.getCabinetType()); cabinetInfo.setMainCabinet(cabinet.getMainCabinet()); - cabinetInfo.setMode(cabinet.getMode()); - cabinetInfo.setBalanceEnable(cabinet.getBalanceEnable()); - cabinetInfo.setBelongType(cabinet.getBelongType()); cabinetInfo.setMqttServerId(cabinet.getMqttServerId()); cabinetInfo.setTemplateNo(cabinet.getTemplateNo()); cabinetInfo.setLockControlNo(cabinet.getLockControlNo()); - cabinetInfo.setLocation(cabinet.getLocation()); cabinetInfo.setReturnDeadline(cabinet.getReturnDeadline()); cabinetInfoList.add(cabinetInfo); } diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/dto/ShopDetailDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/dto/ShopDetailDTO.java index a948b70..4c8c3fc 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/dto/ShopDetailDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/dto/ShopDetailDTO.java @@ -26,9 +26,6 @@ public class ShopDetailDTO { @ApiModelProperty("借呗支付（1-正常使用 0-禁止使用）") private Integer balanceEnable; - @ApiModelProperty("封面图URL") - private String coverImg; - @ApiModelProperty("柜机列表") private List cabinets; @@ -40,21 +37,9 @@ public class ShopDetailDTO { @ApiModelProperty("柜机名称") private String cabinetName; - @ApiModelProperty("柜机类型（0主柜 1副柜）") - private Integer cabinetType; - @ApiModelProperty("归属主柜ID") private Long mainCabinet; - @ApiModelProperty("运行模式（0-支付模式 1-审批模式 2-借还模式 3-会员模式 4-耗材模式 5-暂存模式）") - private Integer mode; - - @ApiModelProperty("借呗支付（1-正常使用 0-禁止使用）") - private Integer balanceEnable; - - @ApiModelProperty("归属类型（0-借还柜 1-固资通）") - private Integer belongType; - @ApiModelProperty("MQTT服务ID") private Long mqttServerId; @@ -64,9 +49,6 @@ public class ShopDetailDTO { @ApiModelProperty("锁控板序号") private Integer lockControlNo; - @ApiModelProperty("柜机位置") - private Integer location; - @ApiModelProperty("归还期限（天），0表示不限制") private Integer returnDeadline; }