|
|
@ -33,6 +33,7 @@ import org.springframework.util.ObjectUtils; |
|
|
import org.springframework.web.bind.annotation.*; |
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
|
import java.util.*; |
|
|
import java.util.*; |
|
|
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
@Slf4j |
|
|
@Slf4j |
|
|
@RestController |
|
|
@RestController |
|
|
@ -79,6 +80,9 @@ public class ReturnSaleController { |
|
|
@Autowired |
|
|
@Autowired |
|
|
private CustomerService customerService; |
|
|
private CustomerService customerService; |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
private ProductService productService; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*@RequestMapping(value = "/get/{id}", method = RequestMethod.GET) |
|
|
/*@RequestMapping(value = "/get/{id}", method = RequestMethod.GET) |
|
|
@ -117,6 +121,14 @@ public class ReturnSaleController { |
|
|
.groupBy("product_id"); |
|
|
.groupBy("product_id"); |
|
|
final List<String> list = returnDetailService.selectByCondition1(queryWrapper); |
|
|
final List<String> list = returnDetailService.selectByCondition1(queryWrapper); |
|
|
final List<SaleDetailDTO> saleDetailDTOS = new ArrayList<>(); |
|
|
final List<SaleDetailDTO> saleDetailDTOS = new ArrayList<>(); |
|
|
|
|
|
Map<String, Product> productMap = new HashMap<>(); |
|
|
|
|
|
// 获取商品
|
|
|
|
|
|
if(list != null && !list.isEmpty()){ |
|
|
|
|
|
final List<Product> productList = productService.getProductList(list); |
|
|
|
|
|
// 将商品封装为map,key为商品id,value为商品信息
|
|
|
|
|
|
productMap = productList.stream().collect(Collectors.toMap(Product::getId, product -> product)); |
|
|
|
|
|
} |
|
|
|
|
|
if (list != null) { |
|
|
for (String productId : list) { |
|
|
for (String productId : list) { |
|
|
final QueryWrapper<ReturnDetail> queryPWrapper = new QueryWrapper<>(); |
|
|
final QueryWrapper<ReturnDetail> queryPWrapper = new QueryWrapper<>(); |
|
|
queryPWrapper.eq("return_sale_id", id).eq("product_id", productId); |
|
|
queryPWrapper.eq("return_sale_id", id).eq("product_id", productId); |
|
|
@ -147,18 +159,22 @@ public class ReturnSaleController { |
|
|
saleDetailDTO.setProductPicture(returnDetail.getProductPicture()); |
|
|
saleDetailDTO.setProductPicture(returnDetail.getProductPicture()); |
|
|
saleDetailDTO.setProductSn(returnDetail.getProductSn()); |
|
|
saleDetailDTO.setProductSn(returnDetail.getProductSn()); |
|
|
|
|
|
|
|
|
|
|
|
// 获取商品的专属分类值
|
|
|
|
|
|
if(productMap.containsKey(productId)){ |
|
|
|
|
|
saleDetailDTO.setAttrId(productMap.get(productId).getAttrId()); |
|
|
|
|
|
} |
|
|
final SaleDetailQueryDTO saleDetailQueryDTO = new SaleDetailQueryDTO(); |
|
|
final SaleDetailQueryDTO saleDetailQueryDTO = new SaleDetailQueryDTO(); |
|
|
saleDetailQueryDTO.setAttributeList(returnDetail.getAttributeList()); |
|
|
saleDetailQueryDTO.setAttributeList(returnDetail.getAttributeList()); |
|
|
saleDetailQueryDTO.setProductCount(returnDetail.getProductCount()); |
|
|
saleDetailQueryDTO.setProductCount(returnDetail.getProductCount()); |
|
|
|
|
|
|
|
|
saleDetailQueryDTO.setStockCount(stockMap.getOrDefault(saleDetailQueryDTO.getAttributeList(), null)); |
|
|
saleDetailQueryDTO.setStockCount(stockMap.getOrDefault(saleDetailQueryDTO.getAttributeList(), null)); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
saleDetailQueryDTOS.add(saleDetailQueryDTO); |
|
|
saleDetailQueryDTOS.add(saleDetailQueryDTO); |
|
|
} |
|
|
} |
|
|
saleDetailDTO.setStockLogList1(saleDetailQueryDTOS); |
|
|
saleDetailDTO.setStockLogList1(saleDetailQueryDTOS); |
|
|
saleDetailDTOS.add(saleDetailDTO); |
|
|
saleDetailDTOS.add(saleDetailDTO); |
|
|
} |
|
|
} |
|
|
|
|
|
} |
|
|
saleReturnVO.setSaleDetailDTOList(saleDetailDTOS); |
|
|
saleReturnVO.setSaleDetailDTOList(saleDetailDTOS); |
|
|
//增加客户信息明细
|
|
|
//增加客户信息明细
|
|
|
final String customerId = returnSale.getUserId(); |
|
|
final String customerId = returnSale.getUserId(); |
|
|
|
wangfukang
2 years ago