2023年7月18日14:31:11

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/component/impl/DefaultOrderSaveImpl.java

@@ -345,11 +345,19 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 
 		}
 		if ("577435".equals(AuthUtil.getTenantId())){
-			order.setStorageQuantity(order.getOrderItemsList().stream().map(OrderItems::getOrderQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));
-			order.setOrderQuantity(order.getOrderItemsList().stream().map(OrderItems::getOrderQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));
-			order.setActualQuantity(order.getOrderItemsList().stream().map(OrderItems::getActualQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));
-			order.setPurchaseQuantity(order.getOrderItemsList().stream().map(OrderItems::getPurchaseQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));
-			order.setPurchaseAmount(order.getOrderItemsList().stream().map(OrderItems::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
+			if (ObjectUtils.isNotNull(order.getOrderItemsList())){
+				order.setStorageQuantity(order.getItemsVOList().stream().map(OrderItems::getOrderQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));
+				order.setOrderQuantity(order.getItemsVOList().stream().map(OrderItems::getOrderQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));
+				order.setActualQuantity(order.getItemsVOList().stream().map(OrderItems::getActualQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));
+				order.setPurchaseQuantity(order.getItemsVOList().stream().map(OrderItems::getOrderQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));
+				order.setPurchaseAmount(order.getItemsVOList().stream().map(OrderItems::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
+			}else{
+				order.setStorageQuantity(order.getItemsVOList().stream().map(OrderItems::getOrderQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));
+				order.setOrderQuantity(order.getItemsVOList().stream().map(OrderItems::getOrderQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));
+				order.setActualQuantity(order.getItemsVOList().stream().map(OrderItems::getActualQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));
+				order.setPurchaseQuantity(order.getItemsVOList().stream().map(OrderItems::getOrderQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));
+				order.setPurchaseAmount(order.getItemsVOList().stream().map(OrderItems::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
+			}
 		}
 		order.setUpdateTime(new Date());
 		order.setUpdateUser(AuthUtil.getUserId());