退款单返回商品图片url+remark字段

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)

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;

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())

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);
         });