From d333f11d34d412b287214b7df626d1bc448a71e3 Mon Sep 17 00:00:00 2001
From: "kuang.yife" <clunt@vip.163.com>
Date: Mon, 23 Sep 2024 14:57:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/wansenai/bo/ShipmentsDataBO.java  |  2 ++
 .../receipt/impl/ReceiptRetailServiceImpl.java | 18 +++++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/core/domain/src/main/java/com/wansenai/bo/ShipmentsDataBO.java b/core/domain/src/main/java/com/wansenai/bo/ShipmentsDataBO.java
index b63b14c..d391bdd 100644
--- a/core/domain/src/main/java/com/wansenai/bo/ShipmentsDataBO.java
+++ b/core/domain/src/main/java/com/wansenai/bo/ShipmentsDataBO.java
@@ -45,6 +45,8 @@ public class ShipmentsDataBO {
 
     private String productModel;
 
+    private String imageUrl;
+
     private String productColor;
 
     private Integer stock;
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 cfb035e..e2f7c50 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
@@ -28,6 +28,7 @@ import com.wansenai.dto.receipt.retail.RetailRefundDTO;
 import com.wansenai.dto.receipt.retail.RetailShipmentsDTO;
 import com.wansenai.dto.system.SystemMessageDTO;
 import com.wansenai.entities.financial.FinancialAccount;
+import com.wansenai.entities.product.ProductImage;
 import com.wansenai.entities.product.ProductStock;
 import com.wansenai.entities.product.ProductStockKeepUnit;
 import com.wansenai.entities.receipt.ReceiptRetailMain;
@@ -40,6 +41,7 @@ import com.wansenai.mappers.receipt.ReceiptRetailMainMapper;
 import com.wansenai.mappers.system.SysFileMapper;
 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.ReceiptRetailService;
 import com.wansenai.service.receipt.ReceiptRetailSubService;
@@ -62,6 +64,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.io.IOException;
@@ -97,7 +100,13 @@ public class ReceiptRetailServiceImpl extends ServiceImpl<ReceiptRetailMainMappe
 
     private final RedisUtil redisUtil;
 
-    public ReceiptRetailServiceImpl(ReceiptRetailMainMapper receiptRetailMainMapper, ReceiptRetailSubService receiptRetailSubService, IFinancialAccountService accountService, ISysUserService userService, SysFileMapper fileMapper, ProductStockMapper productStockMapper, ProductStockKeepUnitMapper productStockKeepUnitMapper, ProductService productService, CommonService commonService, ISysMsgService messageService, RedisUtil redisUtil) {
+    private final ProductImageService productImageService;
+
+    public ReceiptRetailServiceImpl(ReceiptRetailMainMapper receiptRetailMainMapper, ReceiptRetailSubService receiptRetailSubService,
+                                    IFinancialAccountService accountService, ISysUserService userService, SysFileMapper fileMapper,
+                                    ProductStockMapper productStockMapper, ProductStockKeepUnitMapper productStockKeepUnitMapper,
+                                    ProductService productService, CommonService commonService, ISysMsgService messageService, RedisUtil redisUtil,
+                                    ProductImageService productImageService) {
         this.receiptRetailMainMapper = receiptRetailMainMapper;
         this.receiptRetailSubService = receiptRetailSubService;
         this.accountService = accountService;
@@ -109,6 +118,7 @@ public class ReceiptRetailServiceImpl extends ServiceImpl<ReceiptRetailMainMappe
         this.commonService = commonService;
         this.messageService = messageService;
         this.redisUtil = redisUtil;
+        this.productImageService = productImageService;
     }
 
     private String getAccountName(Long accountId) {
@@ -216,6 +226,8 @@ public class ReceiptRetailServiceImpl extends ServiceImpl<ReceiptRetailMainMappe
                 .warehouseId(item.getWarehouseId())
                 .build();
         var data = productStockMapper.getProductSkuByBarCode(item.getProductBarcode(), item.getWarehouseId());
+        var img = productImageService.lambdaQuery().select(ProductImage::getImageUrl)
+                .eq(ProductImage::getProductId, item.getProductId()).list();
         if (data != null) {
             shipmentBo.setWarehouseId(data.getWarehouseId());
             shipmentBo.setProductName(data.getProductName());
@@ -228,6 +240,10 @@ public class ReceiptRetailServiceImpl extends ServiceImpl<ReceiptRetailMainMappe
             if (data.getWarehouseId() != null) {
                 shipmentBo.setWarehouseName(commonService.getWarehouseName(data.getWarehouseId()));
             }
+
+            if(!CollectionUtils.isEmpty(img)){
+                shipmentBo.setImageUrl(img.get(0).getImageUrl());
+            }
         }
         return shipmentBo;
     }