From 7bc7523ad53c358a6057bb6ccaa5e4240579ee0f Mon Sep 17 00:00:00 2001
From: "kuang.yife" <clunt@vip.163.com>
Date: Thu, 26 Sep 2024 10:14:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE=E5=8D=95=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=9B=BE=E7=89=87url+remark=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wansenai/vo/receipt/ReceiptDetailVO.java  |  2 ++
 .../vo/receipt/retail/RetailRefundVO.java     |  2 ++
 .../impl/ReceiptRetailServiceImpl.java        |  1 +
 .../receipt/impl/ReceiptServiceImpl.java      | 23 ++++++++++++++++++-
 4 files changed, 27 insertions(+), 1 deletion(-)

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<ReceiptRetailMainMappe
                     .receiptNumber(item.getReceiptNumber())
                     .receiptDate(item.getReceiptDate())
                     .productInfo(item.getRemark())
+                    .remark(item.getRemark())
                     .operator(crateBy)
                     .productNumber(productNumber)
                     .totalPrice(item.getTotalAmount())
diff --git a/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptServiceImpl.java b/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptServiceImpl.java
index 4005d97..a1b9ef6 100644
--- a/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptServiceImpl.java
+++ b/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptServiceImpl.java
@@ -25,6 +25,7 @@ import com.wansenai.entities.financial.FinancialAccount;
 import com.wansenai.entities.financial.FinancialMain;
 import com.wansenai.entities.financial.FinancialSub;
 import com.wansenai.entities.product.Product;
+import com.wansenai.entities.product.ProductImage;
 import com.wansenai.entities.receipt.*;
 import com.wansenai.entities.user.SysUser;
 import com.wansenai.mappers.financial.FinancialMainMapper;
@@ -35,6 +36,7 @@ import com.wansenai.service.basic.MemberService;
 import com.wansenai.service.basic.SupplierService;
 import com.wansenai.service.common.CommonService;
 import com.wansenai.service.financial.IFinancialAccountService;
+import com.wansenai.service.product.ProductImageService;
 import com.wansenai.service.product.ProductService;
 import com.wansenai.service.receipt.*;
 import com.wansenai.service.user.ISysUserService;
@@ -49,6 +51,7 @@ import com.wansenai.vo.receipt.ReceiptVO;
 import com.wansenai.vo.receipt.retail.StatisticalDataVO;
 import com.wansenai.vo.report.*;
 import jakarta.servlet.http.HttpServletResponse;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -89,6 +92,8 @@ public class ReceiptServiceImpl implements ReceiptService {
 
     private final ProductService productService;
 
+    private final ProductImageService productImageService;
+
     private final ProductStockMapper productStockMapper;
 
     private final IFinancialAccountService accountService;
@@ -99,7 +104,13 @@ public class ReceiptServiceImpl implements ReceiptService {
 
     private final FinancialSubMapper financialSubMapper;
 
-    public ReceiptServiceImpl(ReceiptRetailService receiptRetailService, ReceiptRetailSubService receiptRetailSubService, ReceiptSaleService receiptSaleService, ReceiptSaleSubService receiptSaleSubService, ReceiptPurchaseService receiptPurchaseService, ReceiptPurchaseSubService receiptPurchaseSubService, MemberService memberService, CustomerService customerService, SupplierService supplierService, ISysUserService userService, ProductService productService, ProductStockMapper productStockMapper, IFinancialAccountService accountService, CommonService commonService, FinancialMainMapper financialMainMapper, FinancialSubMapper financialSubMapper) {
+    public ReceiptServiceImpl(ReceiptRetailService receiptRetailService, ReceiptRetailSubService receiptRetailSubService,
+                              ReceiptSaleService receiptSaleService, ReceiptSaleSubService receiptSaleSubService,
+                              ReceiptPurchaseService receiptPurchaseService, ReceiptPurchaseSubService receiptPurchaseSubService,
+                              MemberService memberService, CustomerService customerService, SupplierService supplierService,
+                              ISysUserService userService, ProductService productService, ProductStockMapper productStockMapper,
+                              IFinancialAccountService accountService, CommonService commonService, FinancialMainMapper financialMainMapper,
+                              FinancialSubMapper financialSubMapper,ProductImageService productImageService) {
         this.receiptRetailService = receiptRetailService;
         this.receiptRetailSubService = receiptRetailSubService;
         this.receiptSaleService = receiptSaleService;
@@ -116,6 +127,7 @@ public class ReceiptServiceImpl implements ReceiptService {
         this.commonService = commonService;
         this.financialMainMapper = financialMainMapper;
         this.financialSubMapper = financialSubMapper;
+        this.productImageService = productImageService;
     }
 
     @Override
@@ -594,6 +606,14 @@ public class ReceiptServiceImpl implements ReceiptService {
                 receiptDetailVO.setProductStandard(productVO.getProductStandard());
                 receiptDetailVO.setProductModel(productVO.getProductModel());
                 receiptDetailVO.setUnit(productVO.getProductUnit());
+
+                // 查图片
+                List<ProductImage> 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);
         });