修改订单逻辑-如果有订单详情保存详情，否则不添加订单详情

blade-service/blade-factory/src/main/java/org/springblade/factory/api/controller/SalesForecastSummaryController.java

@@ -1519,15 +1519,12 @@ public class SalesForecastSummaryController {
 	}
 
 
-
-
-
 	/* ========== 库存表 ========== */
 	private final PjpfStockDescService stockService;
 
-//	/**
-//	 * 库存列表
-//	 */
+	/**
+	 * 库存列表
+	 */
 //	@GetMapping("brand-stock")
 //	@ApiOperation(value = "库存列表", notes = "传入cname,goodsId,brandId等查询条件")
 //	@ApiOperationSupport(order = 1)

blade-service/blade-factory/src/main/java/org/springblade/factory/service/impl/PcBladeOrderServiceImpl.java

@@ -171,9 +171,9 @@ public class PcBladeOrderServiceImpl extends BaseServiceImpl<PcBladeOrderMapper,
 		}
 
 		// 2. 校验订单明细
-		if (pcBladeOrder.getPcBladeOrderItemList() == null || pcBladeOrder.getPcBladeOrderItemList().isEmpty()) {
-			throw new ServiceException("至少有一条订单明细");
-		}
+//		if (pcBladeOrder.getPcBladeOrderItemList() == null || pcBladeOrder.getPcBladeOrderItemList().isEmpty()) {
+//			throw new ServiceException("至少有一条订单明细");
+//		}
 
 		// 3. 生成并检查订单编号（完全基础的方式，不依赖QueryWrapper）
 		String orderCode;
@@ -214,29 +214,33 @@ public class PcBladeOrderServiceImpl extends BaseServiceImpl<PcBladeOrderMapper,
 			throw new ServiceException("订单ID生成失败");
 		}
 
-		// 7. 保存订单明细
-		List<PcBladeOrderItem> itemList = pcBladeOrder.getPcBladeOrderItemList();
-
-		for(int i = 0; i < itemList.size(); i++) {
-			PcBladeOrderItem item = itemList.get(i);
-			item.setOrderId(orderId);
-			int a = i + 1;
-			item.setOrderCode(orderCode + "-" + a);
-			item.setCreateUser(AuthUtil.getUserId());
-			item.setCreateTime(new Date());
-			item.setUpdateTime(new Date());
-			item.setUpdateUser(AuthUtil.getUserId());
-			if (item.getStatus() == null) {
-				item.setStatus(0);
-			}
-			if (item.getIsDeleted() == null) {
-				item.setIsDeleted(0);
-			}
-			boolean isItemSaved = orderItemService.insertPcBladeOrderItem(item);
-			if (!isItemSaved) {
-				throw new ServiceException("订单明细保存失败，订单ID：" + orderId);
+		if (!pcBladeOrder.getPcBladeOrderItemList().isEmpty()) {
+			// 7. 保存订单明细
+			List<PcBladeOrderItem> itemList = pcBladeOrder.getPcBladeOrderItemList();
+			for(int i = 0; i < itemList.size(); i++) {
+				PcBladeOrderItem item = itemList.get(i);
+				item.setOrderId(orderId);
+				int a = i + 1;
+				item.setOrderCode(orderCode + "-" + a);
+				item.setCreateUser(AuthUtil.getUserId());
+				item.setCreateTime(new Date());
+				item.setUpdateTime(new Date());
+				item.setUpdateUser(AuthUtil.getUserId());
+				if (item.getStatus() == null) {
+					item.setStatus(0);
+				}
+				if (item.getIsDeleted() == null) {
+					item.setIsDeleted(0);
+				}
+				boolean isItemSaved = orderItemService.insertPcBladeOrderItem(item);
+				if (!isItemSaved) {
+					throw new ServiceException("订单明细保存失败，订单ID：" + orderId);
+				}
 			}
 		}
+
+
+
 		return orderId;
 	}