散货修改

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

@@ -554,7 +554,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			order.setUpdateTime(new Date());
 			baseMapper.updateById(order);
 		}
-
 		BigDecimal freight = BigDecimal.ZERO;
 		List<OrderItem> itemList = order.getItemList();
 		for (OrderItem item : itemList) {
@@ -608,8 +607,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				.eq(OrderItem::getOrderId, order.getId())
 				.eq(OrderItem::getKind, 2)
 				.eq(OrderItem::getShippingMode, "散货");
-			OrderItem item = orderItemMapper.selectOne(queryWrapper);
-			if (ObjectUtil.isEmpty(item)){
+			OrderItem orderItem = orderItemMapper.selectOne(queryWrapper);
+			OrderItem item = new OrderItem();
+			if (ObjectUtil.isEmpty(orderItem)){
 				item.setOrderId(order.getId());
 				item.setShippingMode("散货");
 				item.setKind(2);
@@ -626,16 +626,16 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				item.setLandAmountC(order.getFreightPay());
 				orderItemMapper.insert(item);
 			}else {
-				item.setTenantId(AuthUtil.getTenantId());
-				item.setUpdateUser(AuthUtil.getUserId());
-				item.setUpdateTime(new Date());
-				item.setFleetId(order.getFleetId());
-				item.setDriverId(order.getDriverId());
-				item.setPlateNo(order.getPlateNo());
-				item.setTel(order.getDriverTel());
-				item.setLandAmountD(order.getFreightCollect());
-				item.setLandAmountC(order.getFreightPay());
-				orderItemMapper.updateById(item);
+				orderItem.setTenantId(AuthUtil.getTenantId());
+				orderItem.setUpdateUser(AuthUtil.getUserId());
+				orderItem.setUpdateTime(new Date());
+				orderItem.setFleetId(order.getFleetId());
+				orderItem.setDriverId(order.getDriverId());
+				orderItem.setPlateNo(order.getPlateNo());
+				orderItem.setTel(order.getDriverTel());
+				orderItem.setLandAmountD(order.getFreightCollect());
+				orderItem.setLandAmountC(order.getFreightPay());
+				orderItemMapper.updateById(orderItem);
 			}
 		}