陆运修改

blade-service/blade-client/src/main/java/org/springblade/client/corps/excel/FactoryExcel.java

@@ -24,4 +24,22 @@ public class FactoryExcel implements Serializable {
 	@ExcelProperty("工厂分类(必填)")
 	private String type;
 
+	@ExcelProperty("联系人")
+	private String attn;
+
+	@ExcelProperty("电话")
+	private String tel;
+
+	@ExcelProperty("职位")
+	private String position;
+
+	@ExcelProperty("单位地址")
+	private String addr;
+
+	@ExcelProperty("仓库地址")
+	private String storageAddr;
+
+	@ExcelProperty("分仓地址")
+	private String subStorageAddr;
+
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/excel/FleetExcel.java

@@ -26,6 +26,24 @@ public class FleetExcel implements Serializable {
 	@ExcelProperty("车队分类(必填)")
 	private String type;
 
+	@ExcelProperty("联系人")
+	private String attn;
+
+	@ExcelProperty("电话")
+	private String tel;
+
+	@ExcelProperty("职位")
+	private String position;
+
+	@ExcelProperty("单位地址")
+	private String addr;
+
+	@ExcelProperty("仓库地址")
+	private String storageAddr;
+
+	@ExcelProperty("分仓地址")
+	private String subStorageAddr;
+
 	@ExcelProperty(value = "道路经营许可证号")
 	private String roadOperationKey;
 

blade-service/blade-land/src/main/java/org/springblade/land/controller/OrderController.java

@@ -116,7 +116,7 @@ public class OrderController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入order")
 	public R submit(@Valid @RequestBody Order order) {
-		return R.status(orderService.submitOrder(order));
+		return orderService.submitOrder(order);
 	}
 
 	/**

blade-service/blade-land/src/main/java/org/springblade/land/service/IOrderService.java

@@ -19,6 +19,7 @@ package org.springblade.land.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
 import org.springblade.land.entity.Order;
 import org.springblade.land.vo.OrderVO;
 
@@ -81,7 +82,7 @@ public interface IOrderService extends IService<Order> {
 	 * @param order
 	 * @return
 	 */
-	boolean submitOrder(Order order);
+	R submitOrder(Order order);
 
 	/**
 	 * 撤销订单

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderServiceImpl.java

@@ -436,17 +436,20 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public boolean submitOrder(Order order) {
+	public R submitOrder(Order order) {
 		List<OrderItem> orderItemList = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItem>()
 			.eq(OrderItem::getOrderId, order.getId())
 			.eq(OrderItem::getKind, 1)
 			.eq(OrderItem::getIsDeleted, 0)
 		);
 
-		orderItemList.forEach(item -> {
+		for (OrderItem item : orderItemList) {
 			orderItemMapper.delete(new LambdaQueryWrapper<OrderItem>().eq(OrderItem::getParentId, item.getId()));
 
 			Integer ctnQuantity = item.getCtnQuantity();
+			if (ctnQuantity < 1) {
+				return R.fail("数据异常，请检查箱量");
+			}
 			BigDecimal landWeight = item.getLandWeight().divide(new BigDecimal(ctnQuantity), 6, RoundingMode.HALF_UP);
 			IntStream.range(0, ctnQuantity).forEach(i -> {
 				OrderItem childItem = new OrderItem();
@@ -470,13 +473,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				change.setChangeTime(new Date());
 				orderChangeMapper.insert(change);
 			});
-		});
+		}
 
 		Order oderTemp = new Order();
 		oderTemp.setId(order.getId());
 		oderTemp.setStatus(1);
 		baseMapper.updateById(oderTemp);
-		return true;
+		return R.status(true);
 	}
 
 	@Override