diff --git a/core/domain/src/main/java/com/wansenai/vo/receipt/ReceiptDetailVO.java b/core/domain/src/main/java/com/wansenai/vo/receipt/ReceiptDetailVO.java index 7013987..9151caa 100644 --- a/core/domain/src/main/java/com/wansenai/vo/receipt/ReceiptDetailVO.java +++ b/core/domain/src/main/java/com/wansenai/vo/receipt/ReceiptDetailVO.java @@ -51,6 +51,8 @@ public class ReceiptDetailVO { private Integer productNumber; + private String imageUrl; + private Integer stock; @JsonSerialize(using = BigDecimalSerializerBO.class) diff --git a/core/domain/src/main/java/com/wansenai/vo/receipt/retail/RetailRefundVO.java b/core/domain/src/main/java/com/wansenai/vo/receipt/retail/RetailRefundVO.java index 64961e0..f992a21 100644 --- a/core/domain/src/main/java/com/wansenai/vo/receipt/retail/RetailRefundVO.java +++ b/core/domain/src/main/java/com/wansenai/vo/receipt/retail/RetailRefundVO.java @@ -42,6 +42,8 @@ public class RetailRefundVO { private String productInfo; + private String remark; + private String operator; private Integer productNumber; diff --git a/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptRetailServiceImpl.java b/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptRetailServiceImpl.java index e2f7c50..5d63685 100644 --- a/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptRetailServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptRetailServiceImpl.java @@ -825,6 +825,7 @@ public class ReceiptRetailServiceImpl extends ServiceImpl imageUrlList = productImageService.lambdaQuery() + .eq(ProductImage::getProductId, productVO.getProductId()) + .list(); + if(CollectionUtils.isNotEmpty(imageUrlList)){ + receiptDetailVO.setImageUrl(imageUrlList.get(0).getImageUrl()); + } } // 查询库存 var stock = productStockMapper.getProductSkuByBarCode(item.getProductBarcode(), item.getWarehouseId()); @@ -601,6 +621,7 @@ public class ReceiptServiceImpl implements ReceiptService { receiptDetailVO.setStock(stock.getStock()); } + receiptDetailVos.add(receiptDetailVO); });