达沃特修改

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

@@ -73,7 +73,7 @@ public interface IOrderItemsService extends IService<OrderItems> {
 	 * @param isCovered
 	 * @return
 	 */
-	R<List<OrderItems>> importUser(List<OrderItemsExcel> data, Boolean isCovered);
+	R<Map<String,Object>> importUser(List<OrderItemsExcel> data, Boolean isCovered);
 
 	/**
 	 * 经销商导入订单明细
@@ -82,7 +82,7 @@ public interface IOrderItemsService extends IService<OrderItems> {
 	 * @param isCovered
 	 * @return
 	 */
-	R<Map<String,Object>> importDealerOrder(List<DealerOrderItem> data, Boolean isCovered, Long storageId);
+	R<List<OrderItems>> importDealerOrder(List<DealerOrderItem> data, Boolean isCovered, Long storageId);
 
 	/**
 	 * 获取订单明细

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

@@ -113,8 +113,10 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 	}
 
 	@Override
-	public R<List<OrderItems>> importUser(List<OrderItemsExcel> data, Boolean isCovered) {
-		List<OrderItems> list = new ArrayList<>();
+	public R<Map<String,Object>> importUser(List<OrderItemsExcel> data, Boolean isCovered) {
+		Map<String,Object> map = new HashMap<>();
+		List<OrderItems> list = new ArrayList<>();//导入成功
+		List<String> lose = new ArrayList<>();//导入失败的
 		data.forEach(item -> {
 			R<GoodsDesc> goods = goodsDescClient.GoodsByCode(item.getCode());
 			if (goods.isSuccess() && goods.getData() != null) {
@@ -145,16 +147,18 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 					orderItems.setStorageQuantity(new BigDecimal(BigInteger.ZERO));
 				}
 				list.add(orderItems);
+			}else {
+				lose.add(item.getCode());
 			}
 		});
-		return R.data(list);
+		map.put("list",list);
+		map.put("lose",lose);
+		return R.data(map);
 	}
 
 	@Override
-	public R<Map<String,Object>> importDealerOrder(List<DealerOrderItem> data, Boolean isCovered, Long storageId) {
-		Map<String,Object> map = new HashMap<>();
-		List<OrderItems> list = new ArrayList<>();//导入成功的
-		List<String> lose = new ArrayList<>();//导入失败的
+	public R<List<OrderItems>> importDealerOrder(List<DealerOrderItem> data, Boolean isCovered, Long storageId) {
+		List<OrderItems> list = new ArrayList<>();
 		data.forEach(item -> {
 			R<GoodsDesc> goods = goodsDescClient.GoodsByCode(item.getCode());
 			if (goods.isSuccess() && goods.getData() != null) {
@@ -204,13 +208,9 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 				}
 
 				list.add(orderItems);
-			}else {
-				lose.add(item.getCode());
 			}
 		});
-		map.put("list",list);
-		map.put("lose",lose);
-		return R.data(map);
+		return R.data(list);
 	}
 
 	/**