提交

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdOrderServiceImpl.java

@@ -951,19 +951,18 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
 
         ArrayList<StockWaitDetailsDto> outStockWaitDetailsList = new ArrayList<>();
         for (JdBatchOutStockBo teaBo : outList) {
-
-            BigDecimal quantity = teaBo.getQuantity();
-            if (ObjectUtil.isEmpty(quantity) || quantity.compareTo(BigDecimal.ZERO) <= 0) {
-                continue;
-            }
-
             StockWaitDetails dataBaseInfo = list1.stream()
                     .filter(item -> item.getBusinessId().equals(teaBo.getOrderInfoId()) && item.getProductId().equals(teaBo.getProductId()))
                     .findFirst()
                     .orElse(null);
 
             if (dataBaseInfo == null) {
-                throw new ServiceException(String.format("订单号：%s，产品编号：%s 未找到对应待出库信息", teaBo.getOrderId(), teaBo.getProductCode()));
+                BigDecimal quantity = teaBo.getQuantity();
+                if (quantity != null && quantity.compareTo(BigDecimal.ZERO) > 0) {
+                    throw new ServiceException(String.format("订单号：%s，产品编号：%s 未找到对应待出库信息", teaBo.getOrderId(), teaBo.getProductCode()));
+                }
+
+                continue;
             }
 
             //数量校验