fix:增加对部分接口的trycatch 能力 修改部分接口的异常为customException

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java

@@ -470,7 +470,7 @@ public class AftersalesWorkOrderController extends BladeController {
 			return R.fail(s.getMessage());
 		}catch (Exception e){
 			log.error("客服操作确定修改》》》{}",e.getMessage());
-			return R.fail("系统异常！！");
+			return R.fail("系统错误:"+e.getMessage());
 		}
 
 	}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -47,6 +47,7 @@ import org.springblade.common.annotations.LogpmAsync;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.DictTimeoutEnum;
 import org.springblade.common.constant.aftersales.*;
+import org.springblade.common.exception.CustomerException;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
@@ -2405,17 +2406,17 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		// 安全性校验：确保用户信息不为空
 		BladeUser user = AuthUtil.getUser();
 		if (user == null) {
-			throw new RuntimeException("用户信息获取失败");
+			throw new CustomerException("用户信息获取失败");
 		}
 
 		// 参数合法性校验：校验aftersalesAppeal不为空
 		if (aftersalesAppeal == null) {
-			throw new IllegalArgumentException("申诉信息不能为空");
+			throw new CustomerException("申诉信息不能为空");
 		}
 		// 参数合法性校验：校验申诉类型不为空且为预期值
 		String typesOf = aftersalesAppeal.getTypesOf();
 		if (!ObjectUtils.isNotNull(typesOf) || !("2".equals(typesOf) || "3".equals(typesOf))) {
-			throw new IllegalArgumentException("无效的申诉类型");
+			throw new CustomerException("无效的申诉类型");
 		}
 
 		// 设置处理人信息和处理时间
@@ -2443,7 +2444,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		} catch (Exception e) {
 			log.error("处理申诉信息时发生异常", e);
 			// 异常处理：记录日志或抛出自定义异常
-			throw new RuntimeException("处理申诉信息时发生异常", e);
+			throw new CustomerException("处理申诉信息时发生异常");
 		}
 	}
 

blade-service/logpm-business/src/main/java/com/logpm/business/controller/DistributionBusinessPreOrderController.java

@@ -62,13 +62,13 @@ public class DistributionBusinessPreOrderController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "页面ID", notes = "传入distributionDeliveryList")
 	public R<Boolean> inOrder(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-//		try {
+		try {
 			Boolean isSuccess = distributionIBusinessPreOrderService.inOrder(ids);
 			return R.data(isSuccess);
-//		}catch (Exception e){
+		}catch (Exception e){
-//			log.error("预入库信息入库失败",e);
+			log.error("预入库信息入库失败",e);
-//			return R.fail(500,e.getMessage());
+			return R.fail(500,e.getMessage());
-//		}
+		}
 
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java

@@ -495,7 +495,7 @@ public class DistributionDeliveryListController extends BladeController {
 
 		}catch (Exception e){
 			log.error("#############signforPC:",e);
-			return R.fail("签收失败");
+			return R.fail("签收失败"+e.getMessage());
 		}
 
 	}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java

@@ -178,8 +178,14 @@ public class DistributionReservationController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入distrbutionReservation")
 	public R autonomouslySave(@Valid @RequestBody DistributionReservationDTO distributionReservationDTO) {
+		try{
 			R result = reservationService.insertAutonomouslyReservation(distributionReservationDTO);
+
 			return result;
+		}catch (Exception e){
+			return R.fail(e.getMessage());
+		}
+
 	}
 
 	/**

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java

@@ -55,6 +55,7 @@ import org.springblade.common.constant.signing.SignforStatusConstant;
 import org.springblade.common.constant.stockup.StockAssignStatusConstant;
 import org.springblade.common.constant.stockup.StockupStatusConstant;
 import org.springblade.common.constant.stockup.StockupTypeConstant;
+import org.springblade.common.exception.CustomerException;
 import org.springblade.common.serviceConstant.ServiceConstant;
 import org.springblade.common.utils.AddressUtil;
 import org.springblade.common.utils.CommonUtil;
@@ -2953,7 +2954,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 							.notIn(DistributionParcelListEntity::getOrderPackageStatus, new String[]{OrderPackageStatusConstant.yichuku.getValue(), OrderPackageStatusConstant.yiqianshou.getValue()}));
 						if (Func.isEmpty(distributionParcelListEntities)) {
 							log.error("#########################无可用包件,订单ID为‘；:{}", s.getId());
-							throw new RuntimeException(s.getOrderCode() + "无可用包件!!!");
+							throw new CustomerException(s.getOrderCode() + "无可用包件!!!");
 						}
 						List<Long> packageIds = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList());
 						packageLockIds.addAll(packageIds);
@@ -3044,7 +3045,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 						boolean inputFlag = parcelNumberVOS.stream().allMatch(zero -> zero.getReservationNum() <= 0);
 						if (inputFlag) {
 							//判断零担品类录入是否都为0
-							throw new RuntimeException(s.getOrderCode() + "此零担订单数量录入错误!!!");
+							throw new CustomerException(s.getOrderCode() + "此零担订单数量录入错误!!!");
 						}
 						//存在零担订单的包件信息
 						parcelNumberVOS.forEach(p -> {
@@ -3077,7 +3078,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 						if (!list.isEmpty()) {
 							int sum = list.stream().mapToInt(DistributionParcelNumberVO::getHandQuantity).sum();
 							if (sum == 0) {
-								throw new RuntimeException(s.getOrderCode() + "此零担订单无在库数量!!!");
+								throw new CustomerException(s.getOrderCode() + "此零担订单无在库数量!!!");
 							}
 							list.forEach(l -> {
 								if (l.getHandQuantity() > 0) {
@@ -3124,7 +3125,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 						if (b) {
 							log.error("###############预约新增订单同时操作");
 							//当前操作包件存在于缓存中，此次操作无效
-							throw new RuntimeException(s.getOrderCode() + "正在操作,请刷新后尝试");
+							throw new CustomerException(s.getOrderCode() + "正在操作,请刷新后尝试");
 						} else {
 							packageLockIds.addAll(a);
 							bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + s.getOrderCode(), packageLockIds, 60L);
@@ -3145,7 +3146,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				DistributionStockListEntity stockListEntity = distributionStockListService.getById(i.getId());
 				int keyongshuliang = stockListEntity.getQuantityStock() - stockListEntity.getQuantityOccupied();
 				if (i.getReservationNum() > keyongshuliang) {
-					throw new RuntimeException("库存品库内数量不足!!!");
+					throw new CustomerException("库存品库内数量不足!!!");
 				}
 				if (Func.isNotBlank(i.getServiceNumber())) {
 					serviceNumber.add(i.getServiceNumber());

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -3133,7 +3133,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				} else {
 					//一个客户下出现重复包条码
 					log.error("############出现重复包条码：{}", collect);
-					throw new RuntimeException("包件数据异常，请联系管理员!!!");
+					throw new CustomerException("包件数据异常，请联系管理员!!!");
 				}
 			}
 			trunklinePackageTrackLogClient.addPackageTrackLog(aaa);
@@ -3146,7 +3146,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any));
 					if (flag) {
 						//正在操作，请稍后重试
-						throw new RuntimeException("该包件正在被操作,请稍后再试!!!");
+						throw new CustomerException("该包件正在被操作,请稍后再试!!!");
 					} else {
 						packageLockIds.addAll(a);
 						bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:", packageLockIds, 60L);
@@ -3160,8 +3160,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			//维护配送任务
 			distributionDeliveryListService.maintenanceDeliveryInfo(distrilbutionloadingscanDTO.getDeliveryId());
 			return R.data(orderpackages, "签收成功");
-		} catch (RuntimeException e) {
+		} catch (Exception e) {
-			log.error("签收异常", e);
+
 			LogError logError = new LogError();
 			logError.setMessage(e.getMessage());
 			logClient.saveErrorLog(logError);

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java

@@ -402,7 +402,7 @@ public class WarehouseWaybillController extends BladeController {
 			Map<String,List<PrintPreviewVO>> printPreviewVOS = warehouseWaybillService.printBatch(ids, tempId);
 			return R.data(printPreviewVOS);
 		} catch (Exception e) {
-			throw new RuntimeException(e);
+			return R.fail(e.getMessage());
 		}
 
 	}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java

@@ -250,7 +250,7 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl<Wareh
 		//查询备货库位
 		String stockUpAllocationId = distributionStockClient.getCargoStockUpAllocationId(code, warehouseId, taskId);
 		if (Func.isEmpty(stockUpAllocationId)) {
-			log.error(method + "无上架库位ID,stockUpAllocationId:{}", stockUpAllocationId);
+			log.warn(method + "无上架库位ID,stockUpAllocationId:{}", stockUpAllocationId);
 			return;
 //			throw new RuntimeException("无上架记录");
 		}
@@ -261,7 +261,7 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl<Wareh
 			.eq(WarehouseUpdownStockupAreaEntity::getAllocationId, stockUpAllocationId)
 		);
 		if (warehouseUpdownStockupAreaEntityList.isEmpty()) {
-			log.error(method + "无上架记录AssociationValue:{},warehouseId:{}", code, warehouseId);
+			log.warn(method + "无上架记录AssociationValue:{},warehouseId:{}", code, warehouseId);
 //			throw new RuntimeException("无上架记录");
 			return;
 
@@ -269,10 +269,10 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl<Wareh
 		if (warehouseUpdownStockupAreaEntityList.size() > 1) {
 			boolean flag = warehouseUpdownStockupAreaEntityList.stream().anyMatch(item -> !item.getAssociationType().equals("3"));
 			if (flag) {
-				log.error(method + "多条上架记录AssociationValue:{},warehouseId:{}", code, warehouseId);
+				log.warn(method + "多条上架记录AssociationValue:{},warehouseId:{}", code, warehouseId);
 				throw new RuntimeException("多条上架记录");
 			} else {
-				log.info(method + "零担备货库位存在多条上架记录AssociationValue:{},warehouseId:{}", code, warehouseId);
+				log.warn(method + "零担备货库位存在多条上架记录AssociationValue:{},warehouseId:{}", code, warehouseId);
 			}
 		}
 		WarehouseUpdownStockupAreaEntity warehouseUpdownStockupArea = warehouseUpdownStockupAreaEntityList.get(0);
@@ -297,7 +297,7 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl<Wareh
 				AtomicInteger a = new AtomicInteger(num);
 				if (i < 0) {
 					log.info(method + "零担备货库位下架备货库位数量不足下架,库位总数sum:{},下架数量num:{}", sum, num);
-					throw new RuntimeException("备货库位在库数不足");
+					throw new CustomerException("备货库位在库数不足");
 				}
 				Iterator<WarehouseUpdownStockupAreaEntity> iterator = warehouseUpdownStockupAreaEntityList.iterator();
 				while (iterator.hasNext()){

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java

@@ -237,7 +237,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 									int i1 = next.getActualReceipt() - i.getActualReceipt();
 									if (i1 < 0) {
 										log.info("入库单进行预计数量修改,已入库数量:{},目标修改数量:{}", i.getActualReceipt(), next.getActualReceipt());
-										throw new RuntimeException("请输入正确的入库数量");
+										throw new CustomerException("请输入正确的入库数量");
 									}
 									//添加库存品
 									addInventory(i1, warehouseWarehousingEntryDTO, i);