From 8b7c3cae22e1e121c94a05e57e4f8dfc2c857f9b Mon Sep 17 00:00:00 2001
From: Houpn <houxiaonao6@gmail.com>
Date: Wed, 30 Aug 2023 23:05:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=8B=E5=8D=95=E5=A1=AB?=
 =?UTF-8?q?=E5=85=85=E6=98=8E=E7=BB=86=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SalesAndDetailsServiceImpl.java           | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesAndDetailsServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesAndDetailsServiceImpl.java
index 50f23298..05129474 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesAndDetailsServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesAndDetailsServiceImpl.java
@@ -1,9 +1,9 @@
 package cc.hiver.mall.serviceimpl;
 
-import cc.hiver.mall.entity.Sale;
-import cc.hiver.mall.entity.SaleDetail;
+import cc.hiver.mall.entity.*;
 import cc.hiver.mall.pojo.dto.SaleDTO;
 import cc.hiver.mall.service.SalesAndDetailsService;
+import cc.hiver.mall.service.mybatis.ProductService;
 import cc.hiver.mall.service.mybatis.SaleDetailService;
 import cc.hiver.mall.service.mybatis.SaleService;
 import cn.hutool.core.util.StrUtil;
@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -23,6 +24,9 @@ public class SalesAndDetailsServiceImpl implements SalesAndDetailsService {
     @Autowired
     SaleDetailService saleDetailService;
 
+    @Autowired
+    ProductService productService;
+
     @Override
     public Sale handleSalesAndDetails(SaleDTO saleDTO) {
 
@@ -54,9 +58,24 @@ public class SalesAndDetailsServiceImpl implements SalesAndDetailsService {
          * 2.处理SaleDetail明细单
          * */
 
+        Product product;
+
         List<SaleDetail> saleDetailList = saleDTO.getSaleDetailList();
-        for(SaleDetail saleDetail : saleDetailList)
+        List<SaleDetail> saleDetailList2 = new ArrayList<SaleDetail>();
+        for(SaleDetail saleDetail : saleDetailList){
+            String productId = saleDetail.getProductId();
+            product =productService.getById(productId);
+
+            saleDetail.setProductName(product.getProductName());
+            saleDetail.setUnit(product.getUnit());
+            saleDetail.setShopId(sale.getShopId());
+            saleDetail.setCategoryId(product.getCategoryId());
             saleDetail.setSaleId(saleId);
+            saleDetail.setPrice(product.getPrice());
+            saleDetail.setWholesalePrice(product.getWholesalePrice());
+            saleDetail.setPurchasePrice(product.getPurchasePrice());
+            saleDetailList2.add(saleDetail);
+        }
         saleDetailService.saveBatch(saleDetailList);
 
         return sale;