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 saleDetailList = saleDTO.getSaleDetailList(); - for(SaleDetail saleDetail : saleDetailList) + List saleDetailList2 = new ArrayList(); + 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;