From f499939b148ef4b6d7d5dc4c5d3d497ee3e901f9 Mon Sep 17 00:00:00 2001 From: dzq Date: Tue, 13 May 2025 10:42:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9C=A8CabinetDetailDTO=E5=92=8CSearc?= =?UTF-8?q?hShopOrderQuery=E4=B8=AD=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在CabinetDetailDTO.CellInfoDTO中添加stock字段，用于存储单元格库存信息 - 在SmartCabinetApplicationService中设置cellInfo的stock字段 - 在SearchShopOrderQuery中添加openid字段，用于按用户openid查询订单 --- .../cabinet/smartCabinet/SmartCabinetApplicationService.java | 1 + .../domain/cabinet/smartCabinet/dto/CabinetDetailDTO.java | 1 + .../agileboot/domain/shop/order/query/SearchShopOrderQuery.java | 2 ++ 3 files changed, 4 insertions(+) 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 69532d3..d21e767 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 @@ -89,6 +89,7 @@ public class SmartCabinetApplicationService { // 设置单元格基础信息 cellInfo.setCellId(cell.getCellId()); cellInfo.setPinNo(cell.getPinNo()); + cellInfo.setStock(cell.getStock()); // 处理单元格关联的商品信息 if (cell.getGoodsId() != null) { 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 fedecdc..c7cc523 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 @@ -16,6 +16,7 @@ public class CabinetDetailDTO { public static class CellInfoDTO { private Long cellId; private Integer pinNo; + private Integer stock; private ProductInfoDTO product; } diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java index 66d5fdf..96c301d 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java @@ -13,6 +13,7 @@ import lombok.EqualsAndHashCode; public class SearchShopOrderQuery extends AbstractPageQuery { private Long orderId; + private String openid; private Long cellId; private Long cabinetId; private Integer status; @@ -29,6 +30,7 @@ public class SearchShopOrderQuery extends AbstractPageQuery { queryWrapper .eq(orderId != null, "o.order_id", orderId) .eq(cellId != null, "og.cell_id", cellId) + .eq(StrUtil.isNotBlank(openid), "o.openid", openid.trim()) .eq(cabinetId != null, "cc.cabinet_id", cabinetId) .eq(status != null, "o.status", status) .eq(payStatus != null, "o.pay_status", payStatus)