feat: 在CabinetDetailDTO和SearchShopOrderQuery中添加新字段
- 在CabinetDetailDTO.CellInfoDTO中添加stock字段,用于存储单元格库存信息 - 在SmartCabinetApplicationService中设置cellInfo的stock字段 - 在SearchShopOrderQuery中添加openid字段,用于按用户openid查询订单
This commit is contained in:
parent
30dbf9d2f9
commit
f499939b14
|
@ -89,6 +89,7 @@ public class SmartCabinetApplicationService {
|
|||
// 设置单元格基础信息
|
||||
cellInfo.setCellId(cell.getCellId());
|
||||
cellInfo.setPinNo(cell.getPinNo());
|
||||
cellInfo.setStock(cell.getStock());
|
||||
|
||||
// 处理单元格关联的商品信息
|
||||
if (cell.getGoodsId() != null) {
|
||||
|
|
|
@ -16,6 +16,7 @@ public class CabinetDetailDTO {
|
|||
public static class CellInfoDTO {
|
||||
private Long cellId;
|
||||
private Integer pinNo;
|
||||
private Integer stock;
|
||||
private ProductInfoDTO product;
|
||||
}
|
||||
|
||||
|
|
|
@ -13,6 +13,7 @@ import lombok.EqualsAndHashCode;
|
|||
public class SearchShopOrderQuery<T> extends AbstractPageQuery<T> {
|
||||
|
||||
private Long orderId;
|
||||
private String openid;
|
||||
private Long cellId;
|
||||
private Long cabinetId;
|
||||
private Integer status;
|
||||
|
@ -29,6 +30,7 @@ public class SearchShopOrderQuery<T> extends AbstractPageQuery<T> {
|
|||
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)
|
||||
|
|
Loading…
Reference in New Issue