From 11743ff77d62e7d626116bbff6225994ad7001b0 Mon Sep 17 00:00:00 2001 From: dzq Date: Thu, 3 Jul 2025 09:35:38 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=99=BA=E8=83=BD=E6=9F=9C):=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=AE=A2=E5=8D=95=E5=85=B3=E8=81=94=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BB=A5=E6=94=AF=E6=8C=81=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在CabinetCellEntity、CabinetDetailDTO和SmartCabinetApplicationService中添加orderId和orderGoodsId字段 修改CabinetCellMapper查询以获取关联订单信息 --- .../domain/cabinet/cell/db/CabinetCellEntity.java | 8 ++++++++ .../domain/cabinet/cell/db/CabinetCellMapper.java | 2 +- .../smartCabinet/SmartCabinetApplicationService.java | 2 ++ .../domain/cabinet/smartCabinet/dto/CabinetDetailDTO.java | 2 ++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/cell/db/CabinetCellEntity.java b/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/cell/db/CabinetCellEntity.java index 160d627..90df829 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/cell/db/CabinetCellEntity.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/cell/db/CabinetCellEntity.java @@ -77,6 +77,14 @@ public class CabinetCellEntity extends BaseEntity { @TableField("goods_id") private Long goodsId; + @ApiModelProperty("关联订单ID") + @TableField(exist = false) + private Long orderId; + + @ApiModelProperty("关联订单商品ID") + @TableField(exist = false) + private Long orderGoodsId; + @Override public Serializable pkVal() { diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/cell/db/CabinetCellMapper.java b/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/cell/db/CabinetCellMapper.java index aa7f4bf..f275a9b 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/cell/db/CabinetCellMapper.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/cell/db/CabinetCellMapper.java @@ -112,7 +112,7 @@ public interface CabinetCellMapper extends BaseMapper { "${ew.customSqlSegment} ") List selectLatestOrderInfoByCell(@Param(Constants.WRAPPER) Wrapper queryWrapper); - @Select("SELECT DISTINCT cc.* " + + @Select("SELECT DISTINCT cc.*, sog.order_id as orderId, sog.order_goods_id as orderGoodsId " + "FROM cabinet_cell cc " + "INNER JOIN shop_order_goods sog ON cc.cell_id = sog.cell_id AND sog.deleted = 0 " + "INNER JOIN shop_order so ON sog.order_id = so.order_id AND so.deleted = 0 " + diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/SmartCabinetApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/SmartCabinetApplicationService.java index 338facb..793b4b3 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/SmartCabinetApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/SmartCabinetApplicationService.java @@ -353,6 +353,8 @@ public class SmartCabinetApplicationService { cellInfo.setPinNo(cell.getPinNo()); cellInfo.setStock(cell.getStock()); cellInfo.setCellPrice(cell.getCellPrice()); + cellInfo.setOrderId(cell.getOrderId()); + cellInfo.setOrderGoodsId(cell.getOrderGoodsId()); return cellInfo; }).collect(Collectors.toList()); 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 452662a..98502aa 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 @@ -19,6 +19,8 @@ public class CabinetDetailDTO { private Integer pinNo; private Integer stock; private BigDecimal cellPrice; + private Long orderId; + private Long orderGoodsId; private ProductInfoDTO product; }