2023年2月5日11:32:14

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderItemsServiceImpl.java

@@ -200,9 +200,9 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 					stockGoods.setStorageId(storageId);
 					StockGoods stock = stockGoodsClient.getOneStock(stockGoods);
 					if (stock != null) {
-						if (AuthUtil.getTenantId().equals("922648")){//欧记取可用库存
+						if (AuthUtil.getTenantId().equals("922648")) {//欧记取可用库存
 							orderItems.setStorageQuantity(stock.getSurplusRouteQuantity());
-						}else {
+						} else {
 							orderItems.setStorageQuantity(stock.getBalanceQuantity());
 						}
 						orderItems.setPurchaseAmount(stock.getBalanceAmount().divide(stock.getBalanceQuantity(), 2, RoundingMode.HALF_UP));
@@ -232,9 +232,9 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 	public List<OrderItems> saveOrderItemsMessage(List<OrderItems> list, Date date, Long pid) {
 		list.forEach(item -> {
 
-			if (ObjectUtils.isNotNull(item.getCorpId())){
+			if (ObjectUtils.isNotNull(item.getCorpId())) {
 				CorpsDesc corpsDesc = corpsDescClient.getCorpId(item.getCorpId());
-				if (ObjectUtils.isNotNull(corpsDesc)){
+				if (ObjectUtils.isNotNull(corpsDesc)) {
 					item.setCorpAddress(corpsDesc.getBelongtoarea());
 				}
 			}
@@ -295,14 +295,14 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 		String itemIds = "";//商品id拼接
 		String updateUserIds = "";//修改人id拼接
 		String createUserIds = "";//创建人id拼接
-		for (OrderItems items : orderItemsList){
-			if (ObjectUtil.isNotEmpty(items.getItemId())){
+		for (OrderItems items : orderItemsList) {
+			if (ObjectUtil.isNotEmpty(items.getItemId())) {
 				itemIds = itemIds + items.getItemId() + ",";
 			}
-			if (ObjectUtil.isNotEmpty(items.getUpdateUser())){
+			if (ObjectUtil.isNotEmpty(items.getUpdateUser())) {
 				updateUserIds = updateUserIds + items.getUpdateUser() + ",";
 			}
-			if (ObjectUtil.isNotEmpty(items.getCreateUser())){
+			if (ObjectUtil.isNotEmpty(items.getCreateUser())) {
 				createUserIds = createUserIds + items.getCreateUser() + ",";
 			}
 		}
@@ -318,11 +318,18 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 			orderItemsList.forEach(item -> {
 
 				if (ObjectUtil.isNotEmpty(updateUserList)) {
-					item.setUpdateUserName(updateUserList.stream().filter(e -> e.getId().equals(item.getUpdateUser())).findFirst().get().getName());
+					User user = updateUserList.stream().anyMatch(e -> e.getId().equals(item.getUpdateUser())) ? updateUserList.stream().filter(e -> e.getId().equals(item.getUpdateUser())).findFirst().get() : null;
+					if (ObjectUtils.isNotNull(user)) {
+						item.setUpdateUserName(user.getName());
+					}
 				}
 
 				if (ObjectUtil.isNotEmpty(createUserList)) {
-					item.setUpdateUserName(createUserList.stream().filter(e -> e.getId().equals(item.getCreateUser())).findFirst().get().getName());
+					User user = createUserList.stream().anyMatch(e -> e.getId().equals(item.getCreateUser())) ? createUserList.stream().filter(e -> e.getId().equals(item.getCreateUser())).findFirst().get() : null;
+					if (ObjectUtils.isNotNull(user)) {
+						item.setUpdateUserName(user.getName());
+					}
+//					item.setUpdateUserName(createUserList.stream().filter(e -> e.getId().equals(item.getCreateUser())).findFirst().get().getName());
 
 				}
 
@@ -436,7 +443,8 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 				orderDateVo.setOrderNumber(orderDateVoList.stream().filter(e -> e.getBelongToCorpId().longValue() == corpsDesc.getId().longValue()).map(OrderDateVo::getOrderNumber).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(0, BigDecimal.ROUND_HALF_UP));
 				list.add(orderDateVo);
 			}
-		} else if (CollectionUtils.isNotEmpty(corpsType) && CollectionUtils.isEmpty(orderDateVoList)) for (CorpsDesc corpsDesc : corpsType) {
+		} else if (CollectionUtils.isNotEmpty(corpsType) && CollectionUtils.isEmpty(orderDateVoList))
+			for (CorpsDesc corpsDesc : corpsType) {
 				OrderDateVo orderDateVo = new OrderDateVo();
 				orderDateVo.setBelongToCorpName(corpsDesc.getGoodtypes());
 				orderDateVo.setOrderNumber(BigDecimal.ZERO);