2022年11月7日19:26:04

blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java

@@ -70,6 +70,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 		String paramTenant = request.getParameter(TokenUtil.TENANT_PARAM_KEY);
 		String password = request.getParameter(TokenUtil.PASSWORD_KEY);
 		String grantType = request.getParameter(TokenUtil.GRANT_TYPE_KEY);
+		String openId = request.getParameter(TokenUtil.OPEN_ID);
 
 		//判断租户号是否为空  为空查询数据库赋值
 		if (ObjectUtils.isNull(headerTenant) && ObjectUtils.isNull(paramTenant)) {
@@ -81,6 +82,10 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 					throw new UsernameNotFoundException(TokenUtil.USER_NOT_FOUND);
 				}
 			}
+			//保存openId
+			user.setOpenId(openId);
+			userClient.updateUser(user);
+
 			headerTenant = user.getTenantId();
 			paramTenant = user.getTenantId();
 			String tenantId = StringUtils.isBlank(headerTenant) ? paramTenant : headerTenant;
@@ -120,6 +125,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 			if (result.isSuccess()) {
 				UserInfo userInfo = result.getData();
 				User user1 = userInfo.getUser();
+
 				// 用户不存在,但提示用户名与密码错误并锁定账号
 				if (user1 == null || user1.getId() == null) {
 					setFailCount(tenantId, user1.getAccount(), count);

blade-service-api/blade-land-api/src/main/java/org/springblade/land/dto/OrderDTO.java

@@ -16,13 +16,9 @@
  */
 package org.springblade.land.dto;
 
-import org.springblade.land.entity.Order;
+import org.springblade.land.entity.LandOrder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.land.entity.OrderAddress;
-import org.springblade.land.entity.OrderItem;
-
-import java.util.List;
 
 /**
  * 陆运订单表数据传输对象实体类
@@ -32,7 +28,7 @@ import java.util.List;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class OrderDTO extends Order {
+public class OrderDTO extends LandOrder {
 	private static final long serialVersionUID = 1L;
 
 }

blade-service-api/blade-land-api/src/main/java/org/springblade/land/entity/Order.java → blade-service-api/blade-land-api/src/main/java/org/springblade/land/entity/LandOrder.java

@@ -40,7 +40,7 @@ import java.util.List;
 @Data
 @TableName("land_order")
 @ApiModel(value = "Order对象", description = "陆运订单表")
-public class Order implements Serializable {
+public class LandOrder implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 

blade-service-api/blade-land-api/src/main/java/org/springblade/land/vo/OrderVO.java

@@ -16,14 +16,10 @@
  */
 package org.springblade.land.vo;
 
-import org.springblade.land.entity.Order;
+import org.springblade.land.entity.LandOrder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
-import org.springblade.land.entity.OrderAddress;
-import org.springblade.land.entity.OrderItem;
-
-import java.util.List;
 
 /**
  * 陆运订单表视图实体类
@@ -34,7 +30,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "OrderVO对象", description = "陆运订单表")
-public class OrderVO extends Order {
+public class OrderVO extends LandOrder {
 	private static final long serialVersionUID = 1L;
 
 }

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

@@ -32,7 +32,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.land.constant.LandConst;
-import org.springblade.land.entity.Order;
+import org.springblade.land.entity.LandOrder;
 import org.springblade.land.excel.*;
 import org.springblade.land.service.IOrderService;
 import org.springblade.land.vo.OrderAcctVO;
@@ -64,7 +64,7 @@ public class OrderController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入order")
-	public R<Order> detail(Order order) {
+	public R<LandOrder> detail(LandOrder order) {
 		return R.data(orderService.getDetail(order));
 	}
 
@@ -74,7 +74,7 @@ public class OrderController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入order")
-	public R<IPage<Order>> list(Order order, Query query) {
+	public R<IPage<LandOrder>> list(LandOrder order, Query query) {
 		return R.data(orderService.getList(order, query));
 	}
 
@@ -95,7 +95,7 @@ public class OrderController extends BladeController {
 	@GetMapping("/count")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "统计", notes = "传入order")
-	public R count(Order order) {
+	public R count(LandOrder order) {
 		return R.data(orderService.getCount(order));
 	}
 
@@ -116,7 +116,7 @@ public class OrderController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入order")
-	public R save(@Valid @RequestBody Order order) {
+	public R save(@Valid @RequestBody LandOrder order) {
 		return R.data(orderService.saveOrder(order));
 	}
 
@@ -136,7 +136,7 @@ public class OrderController extends BladeController {
 	@GetMapping("/detailBulkLoad")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "散货详情", notes = "传入order")
-	public R<Order> detailBulkLoad(Order order) {
+	public R<LandOrder> detailBulkLoad(LandOrder order) {
 		return R.data(orderService.detailBulkLoad(order));
 	}
 
@@ -146,7 +146,7 @@ public class OrderController extends BladeController {
 	@GetMapping("/detailAppBulkLoad")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "散货App详情", notes = "传入order")
-	public R<Order> detailAppBulkLoad(Order order) {
+	public R<LandOrder> detailAppBulkLoad(LandOrder order) {
 		return R.data(orderService.detailAppBulkLoad(order));
 	}
 
@@ -156,7 +156,7 @@ public class OrderController extends BladeController {
 	@GetMapping("/pageBulkLoad")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "散货分页", notes = "传入order")
-	public R<IPage<Order>> pageBulkLoad(Order order, Query query) {
+	public R<IPage<LandOrder>> pageBulkLoad(LandOrder order, Query query) {
 		return R.data(orderService.selectBulkLoadList(order, query));
 	}
 
@@ -178,7 +178,7 @@ public class OrderController extends BladeController {
 	@GetMapping("/BulkLoadCount")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "统计", notes = "传入order")
-	public R BulkLoadCount(Order order) {
+	public R BulkLoadCount(LandOrder order) {
 		return R.data(orderService.BulkLoadCount(order));
 	}
 
@@ -196,7 +196,7 @@ public class OrderController extends BladeController {
 	@PostMapping("/change")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "变更", notes = "传入order")
-	public R change(@Valid @RequestBody Order order) {
+	public R change(@Valid @RequestBody LandOrder order) {
 		return R.data(orderService.changeOrder(order));
 	}
 
@@ -206,7 +206,7 @@ public class OrderController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入order")
-	public R update(@Valid @RequestBody Order order) {
+	public R update(@Valid @RequestBody LandOrder order) {
 		return R.status(orderService.updateById(order));
 	}
 
@@ -216,7 +216,7 @@ public class OrderController extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入order")
-	public R submit(@Valid @RequestBody Order order) {
+	public R submit(@Valid @RequestBody LandOrder order) {
 		return orderService.submitOrder(order);
 	}
 
@@ -338,7 +338,7 @@ public class OrderController extends BladeController {
 	 * 附件上传
 	 */
 	@PostMapping("/file")
-	public R file(@RequestBody Order order) {
+	public R file(@RequestBody LandOrder order) {
 		return R.status(orderService.file(order));
 	}
 

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

@@ -30,7 +30,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.land.constant.LandConst;
-import org.springblade.land.entity.Order;
+import org.springblade.land.entity.LandOrder;
 import org.springblade.land.entity.OrderItem;
 import org.springblade.land.service.IOrderItemService;
 import org.springblade.land.service.IOrderService;
@@ -128,7 +128,7 @@ public class OrderIndexController extends BladeController {
 			.orderByDesc(OrderItem::getUpdateTime);
 		List<OrderItem> itemList = orderItemService.list(itemQueryWrapper);
 		itemList.forEach(item -> {
-			Order order = orderService.getById(item.getOrderId());
+			LandOrder order = orderService.getById(item.getOrderId());
 			if (ObjectUtil.isNotEmpty(order.getCorpId())) {
 				R<CorpsDesc> corp = corpsDescClient.getCorpMessage(order.getCorpId());
 				if (corp.isSuccess() && corp.getData() != null) {

blade-service/blade-land/src/main/java/org/springblade/land/mapper/OrderMapper.java

@@ -18,7 +18,7 @@ package org.springblade.land.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.land.entity.Order;
+import org.springblade.land.entity.LandOrder;
 import org.springblade.land.vo.OrderAcctVO;
 import org.springblade.land.vo.OrderVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -32,7 +32,7 @@ import java.util.List;
  * @since 2022-03-07
  */
 @Mapper
-public interface OrderMapper extends BaseMapper<Order> {
+public interface OrderMapper extends BaseMapper<LandOrder> {
 
 	/**
 	 * 自定义分页

blade-service/blade-land/src/main/java/org/springblade/land/mapper/OrderMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.land.mapper.OrderMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="orderResultMap" type="org.springblade.land.entity.Order">
+    <resultMap id="orderResultMap" type="org.springblade.land.entity.LandOrder">
         <id column="id" property="id"/>
         <result column="corp_id" property="corpId"/>
         <result column="bill_no" property="billNo"/>

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

@@ -21,7 +21,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.client.entity.CommonFile;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
-import org.springblade.land.entity.Order;
+import org.springblade.land.entity.LandOrder;
 import org.springblade.land.vo.OrderAcctVO;
 import org.springblade.land.vo.OrderVO;
 
@@ -34,7 +34,7 @@ import java.util.Map;
  * @author BladeX
  * @since 2022-03-07
  */
-public interface IOrderService extends IService<Order> {
+public interface IOrderService extends IService<LandOrder> {
 
 	/**
 	 * 自定义分页
@@ -51,7 +51,7 @@ public interface IOrderService extends IService<Order> {
 	 * @param order
 	 * @return
 	 */
-	Order getDetail(Order order);
+	LandOrder getDetail(LandOrder order);
 
 	/**
 	 * 列表 分页
@@ -60,7 +60,7 @@ public interface IOrderService extends IService<Order> {
 	 * @param query
 	 * @return
 	 */
-	IPage<Order> getList(Order order, Query query);
+	IPage<LandOrder> getList(LandOrder order, Query query);
 
 	/**
 	 * 陆运台账
@@ -85,7 +85,7 @@ public interface IOrderService extends IService<Order> {
 	 * @param order
 	 * @return
 	 */
-	Map<String, Object> getCount(Order order);
+	Map<String, Object> getCount(LandOrder order);
 
 	/**
 	 * 保存订单
@@ -93,7 +93,7 @@ public interface IOrderService extends IService<Order> {
 	 * @param order
 	 * @return
 	 */
-	Long saveOrder(Order order);
+	Long saveOrder(LandOrder order);
 
 	/**
 	 * 提交 陆运散货提交
@@ -103,17 +103,17 @@ public interface IOrderService extends IService<Order> {
 	/**
 	 * 自定义分页 陆运散货订单表
 	 */
-	IPage<Order> selectBulkLoadList(Order page, Query query);
+	IPage<LandOrder> selectBulkLoadList(LandOrder page, Query query);
 
 	/**
 	 * 陆运散货详情
 	 */
-	Order detailBulkLoad(Order order);
+	LandOrder detailBulkLoad(LandOrder order);
 
 	/**
 	 * 陆运散货App详情
 	 */
-	Order detailAppBulkLoad(Order order);
+	LandOrder detailAppBulkLoad(LandOrder order);
 
 	/**
 	 * 陆运散货修改状态
@@ -123,7 +123,7 @@ public interface IOrderService extends IService<Order> {
 	/**
 	 * 散货 统计
 	 */
-	Map<String, Object> BulkLoadCount(Order order);
+	Map<String, Object> BulkLoadCount(LandOrder order);
 
 	/**
 	 * 变更许可
@@ -139,7 +139,7 @@ public interface IOrderService extends IService<Order> {
 	 * @param order
 	 * @return
 	 */
-	Long changeOrder(Order order);
+	Long changeOrder(LandOrder order);
 
 	/**
 	 * 提交订单
@@ -147,7 +147,7 @@ public interface IOrderService extends IService<Order> {
 	 * @param order
 	 * @return
 	 */
-	R submitOrder(Order order);
+	R submitOrder(LandOrder order);
 
 	/**
 	 * 撤销订单
@@ -171,7 +171,7 @@ public interface IOrderService extends IService<Order> {
 	 * @param order
 	 * @return
 	 */
-	boolean file(Order order);
+	boolean file(LandOrder order);
 
 	/**
 	 * 附件列表

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

@@ -22,7 +22,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.land.entity.Order;
+import org.springblade.land.entity.LandOrder;
 import org.springblade.land.entity.OrderAddress;
 import org.springblade.land.mapper.OrderAddressMapper;
 import org.springblade.land.mapper.OrderMapper;
@@ -93,7 +93,7 @@ public class OrderAddressServiceImpl extends ServiceImpl<OrderAddressMapper, Ord
 				}
 			}
 
-			Order order = new Order();
+			LandOrder order = new LandOrder();
 			order.setId(temp.getOrderId());
 			order.setAddressDetail(addressDetail.toString());
 			orderMapper.updateById(order);
@@ -178,7 +178,7 @@ public class OrderAddressServiceImpl extends ServiceImpl<OrderAddressMapper, Ord
 				}
 			}
 
-			Order order = new Order();
+			LandOrder order = new LandOrder();
 			order.setId(temp.getOrderId());
 			order.setAddressDetail(addressDetail.toString());
 			order.setUnloadingPlace(unloadedaddressDetail.toString());

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

@@ -42,7 +42,7 @@ import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.land.constant.LandConst;
-import org.springblade.land.entity.Order;
+import org.springblade.land.entity.LandOrder;
 import org.springblade.land.entity.OrderAddress;
 import org.springblade.land.entity.OrderChange;
 import org.springblade.land.entity.OrderItem;
@@ -109,7 +109,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 		}
 		IPage<OrderItem> pages = baseMapper.selectPage(Condition.getPage(query), wrapper);
 		pages.getRecords().forEach(record -> {
-			Order order = orderMapper.selectById(record.getOrderId());
+			LandOrder order = orderMapper.selectById(record.getOrderId());
 			filling(record, order, orderItem.getTag());
 
 			// 手机端
@@ -137,7 +137,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 
 		List<OrderItem> itemList = baseMapper.selectList(wrapper);
 		itemList.forEach(item -> {
-			Order order = orderMapper.selectById(item.getOrderId());
+			LandOrder order = orderMapper.selectById(item.getOrderId());
 			filling(item, order, orderItem.getTag());
 		});
 		return itemList;
@@ -148,19 +148,19 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 		List<Long> orderIdList = Collections.emptyList();
 		if (AuthUtil.getUserRole().contains(LandConst.DDZX_MANAGER)) {
 			R<List<User>> r = userSearchClient.listByRole("1572039278093946882");
-			LambdaQueryWrapper<Order> orderLambdaQueryWrapper = new LambdaQueryWrapper<Order>()
-				.like(StringUtil.isNotBlank(orderItem.getOrderNo()), Order::getOrderNo, orderItem.getOrderNo())
-				.like(StringUtil.isNotBlank(orderItem.getStation()), Order::getStation, orderItem.getStation())
-				.like(StringUtil.isNotBlank(orderItem.getFactory()), Order::getFactory, orderItem.getFactory())
-				.like(StringUtil.isNotBlank(orderItem.getAddressDetail()), Order::getAddressDetail, orderItem.getAddressDetail())
-				.eq(Order::getIsDeleted, 0)
-				.eq(Order::getTenantId, AuthUtil.getTenantId())
-				.ne(Order::getShippingMode, "散货");
+			LambdaQueryWrapper<LandOrder> orderLambdaQueryWrapper = new LambdaQueryWrapper<LandOrder>()
+				.like(StringUtil.isNotBlank(orderItem.getOrderNo()), LandOrder::getOrderNo, orderItem.getOrderNo())
+				.like(StringUtil.isNotBlank(orderItem.getStation()), LandOrder::getStation, orderItem.getStation())
+				.like(StringUtil.isNotBlank(orderItem.getFactory()), LandOrder::getFactory, orderItem.getFactory())
+				.like(StringUtil.isNotBlank(orderItem.getAddressDetail()), LandOrder::getAddressDetail, orderItem.getAddressDetail())
+				.eq(LandOrder::getIsDeleted, 0)
+				.eq(LandOrder::getTenantId, AuthUtil.getTenantId())
+				.ne(LandOrder::getShippingMode, "散货");
 			if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())) {
 				List<Long> ids = r.getData().stream().map(User::getId).collect(Collectors.toList());
 				orderLambdaQueryWrapper.apply("find_in_set(dispatcher,'" + StringUtils.join(ids, ",") + "')");
 			}
-			orderIdList = orderMapper.selectList(orderLambdaQueryWrapper).stream().map(Order::getId).collect(Collectors.toList());
+			orderIdList = orderMapper.selectList(orderLambdaQueryWrapper).stream().map(LandOrder::getId).collect(Collectors.toList());
 
 			if (CollectionUtil.isEmpty(orderIdList)) {
 				return null;
@@ -231,7 +231,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 
 		OrderItem data = baseMapper.selectById(orderItem.getId());
 
-		Order order = new Order();
+		LandOrder order = new LandOrder();
 		order.setId(data.getOrderId());
 		order.setStatus(2);
 		orderMapper.updateById(order);
@@ -285,7 +285,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 			}
 		});
 
-		Order order = new Order();
+		LandOrder order = new LandOrder();
 		order.setId(orderItem.getOrderId());
 		order.setStatus(2);
 		orderMapper.updateById(order);
@@ -329,7 +329,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 		);
 
 		if (count == 0) {
-			Order order = new Order();
+			LandOrder order = new LandOrder();
 			order.setId(data.getOrderId());
 			order.setStatus(1);
 			orderMapper.updateById(order);
@@ -636,19 +636,19 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 		List<Long> orderIdList = Collections.emptyList();
 		if (AuthUtil.getUserRole().contains(LandConst.DDZX_MANAGER)) {
 			R<List<User>> r = userSearchClient.listByRole("1572039278093946882");
-			LambdaQueryWrapper<Order> orderLambdaQueryWrapper = new LambdaQueryWrapper<Order>()
-				.like(StringUtil.isNotBlank(orderItem.getOrderNo()), Order::getOrderNo, orderItem.getOrderNo())
-				.like(StringUtil.isNotBlank(orderItem.getStation()), Order::getStation, orderItem.getStation())
-				.like(StringUtil.isNotBlank(orderItem.getFactory()), Order::getFactory, orderItem.getFactory())
-				.like(StringUtil.isNotBlank(orderItem.getAddressDetail()), Order::getAddressDetail, orderItem.getAddressDetail())
-				.eq(Order::getIsDeleted, 0)
-				.eq(Order::getTenantId, AuthUtil.getTenantId())
-				.ne(Order::getShippingMode, "散货");
+			LambdaQueryWrapper<LandOrder> orderLambdaQueryWrapper = new LambdaQueryWrapper<LandOrder>()
+				.like(StringUtil.isNotBlank(orderItem.getOrderNo()), LandOrder::getOrderNo, orderItem.getOrderNo())
+				.like(StringUtil.isNotBlank(orderItem.getStation()), LandOrder::getStation, orderItem.getStation())
+				.like(StringUtil.isNotBlank(orderItem.getFactory()), LandOrder::getFactory, orderItem.getFactory())
+				.like(StringUtil.isNotBlank(orderItem.getAddressDetail()), LandOrder::getAddressDetail, orderItem.getAddressDetail())
+				.eq(LandOrder::getIsDeleted, 0)
+				.eq(LandOrder::getTenantId, AuthUtil.getTenantId())
+				.ne(LandOrder::getShippingMode, "散货");
 			if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())) {
 				List<Long> ids = r.getData().stream().map(User::getId).collect(Collectors.toList());
 				orderLambdaQueryWrapper.apply("find_in_set(dispatcher,'" + StringUtils.join(ids, ",") + "')");
 			}
-			orderIdList = orderMapper.selectList(orderLambdaQueryWrapper).stream().map(Order::getId).collect(Collectors.toList());
+			orderIdList = orderMapper.selectList(orderLambdaQueryWrapper).stream().map(LandOrder::getId).collect(Collectors.toList());
 
 			if (CollectionUtil.isEmpty(orderIdList)) {
 				return null;
@@ -656,14 +656,14 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 		} else {
 			if (StringUtil.isNotBlank(orderItem.getAddressDetail()) || StringUtil.isNotBlank(orderItem.getStation())
 				|| StringUtil.isNotBlank(orderItem.getFactory()) || StringUtil.isNotBlank(orderItem.getOrderNo())) {
-				LambdaQueryWrapper<Order> orderLambdaQueryWrapper = new LambdaQueryWrapper<Order>()
-					.like(StringUtil.isNotBlank(orderItem.getOrderNo()), Order::getOrderNo, orderItem.getOrderNo())
-					.like(StringUtil.isNotBlank(orderItem.getStation()), Order::getStation, orderItem.getStation())
-					.like(StringUtil.isNotBlank(orderItem.getFactory()), Order::getFactory, orderItem.getFactory())
-					.like(StringUtil.isNotBlank(orderItem.getAddressDetail()), Order::getAddressDetail, orderItem.getAddressDetail())
-					.eq(Order::getIsDeleted, 0)
-					.eq(Order::getTenantId, AuthUtil.getTenantId())
-					.ne(Order::getShippingMode, "散货");
+				LambdaQueryWrapper<LandOrder> orderLambdaQueryWrapper = new LambdaQueryWrapper<LandOrder>()
+					.like(StringUtil.isNotBlank(orderItem.getOrderNo()), LandOrder::getOrderNo, orderItem.getOrderNo())
+					.like(StringUtil.isNotBlank(orderItem.getStation()), LandOrder::getStation, orderItem.getStation())
+					.like(StringUtil.isNotBlank(orderItem.getFactory()), LandOrder::getFactory, orderItem.getFactory())
+					.like(StringUtil.isNotBlank(orderItem.getAddressDetail()), LandOrder::getAddressDetail, orderItem.getAddressDetail())
+					.eq(LandOrder::getIsDeleted, 0)
+					.eq(LandOrder::getTenantId, AuthUtil.getTenantId())
+					.ne(LandOrder::getShippingMode, "散货");
 				if (AuthUtil.getUserRole().contains(LandConst.DDZX_MANAGER)) {
 					R<List<User>> r = userSearchClient.listByRole("1572039278093946882");
 					if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())) {
@@ -671,7 +671,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 						orderLambdaQueryWrapper.apply("find_in_set(dispatcher,'" + StringUtils.join(ids, ",") + "')");
 					}
 				}
-				orderIdList = orderMapper.selectList(orderLambdaQueryWrapper).stream().map(Order::getId).collect(Collectors.toList());
+				orderIdList = orderMapper.selectList(orderLambdaQueryWrapper).stream().map(LandOrder::getId).collect(Collectors.toList());
 
 				if (CollectionUtil.isEmpty(orderIdList)) {
 					return null;
@@ -708,7 +708,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 		return itemQueryWrapper;
 	}
 
-	private void filling(OrderItem item, Order order, Integer tag) {
+	private void filling(OrderItem item, LandOrder order, Integer tag) {
 		item.setOrderNo(order.getOrderNo());
 		item.setBelongCompany(order.getBelongCompany());
 		item.setStation(order.getStation());
@@ -771,7 +771,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 			LandDriver driver = landDriverClient.getDriver(item.getDriverId());
 			item.setDriverName(driver.getName());
 		}
-		Order order = orderMapper.selectById(item.getOrderId());
+		LandOrder order = orderMapper.selectById(item.getOrderId());
 		if (ObjectUtil.isNotEmpty(order.getDispatcher())) {
 			item.setSendUserId(order.getDispatcher());
 			sendMsg(MessageUtil.toUser(item, mold));

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

@@ -62,7 +62,7 @@ import java.util.stream.IntStream;
  */
 @Service
 @AllArgsConstructor
-public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {
+public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implements IOrderService {
 
 	private final OrderItemMapper orderItemMapper;
 
@@ -96,8 +96,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	}
 
 	@Override
-	public Order getDetail(Order order) {
-		Order detail = baseMapper.selectById(order.getId());
+	public LandOrder getDetail(LandOrder order) {
+		LandOrder detail = baseMapper.selectById(order.getId());
 		if (ObjectUtil.isEmpty(detail)) {
 			return detail;
 		}
@@ -204,8 +204,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	}
 
 	@Override
-	public IPage<Order> getList(Order order, Query query) {
-		LambdaQueryWrapper<Order> orderQueryWrapper = new LambdaQueryWrapper<>();
+	public IPage<LandOrder> getList(LandOrder order, Query query) {
+		LambdaQueryWrapper<LandOrder> orderQueryWrapper = new LambdaQueryWrapper<>();
 
 		Integer itemStatus = order.getItemStatus();
 		List<Long> orderIdList = Collections.emptyList();
@@ -226,28 +226,28 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			}
 		}
 
-		orderQueryWrapper.in(CollectionUtil.isNotEmpty(orderIdList), Order::getId, orderIdList)
-			.eq(ObjectUtil.isNotEmpty(order.getCorpId()), Order::getCorpId, order.getCorpId())
-			.eq(ObjectUtil.isNotEmpty(order.getSalesman()), Order::getSalesman, order.getSalesman())
-			.eq(ObjectUtil.isNotEmpty(order.getDispatcher()), Order::getDispatcher, order.getDispatcher())
-			.eq(ObjectUtil.isNotEmpty(order.getDispatchDept()), Order::getDispatchDept, order.getDispatchDept())
-			.eq(ObjectUtil.isNotEmpty(itemStatus) && itemStatus == 999, Order::getStatus, 0)
-			.eq(StringUtil.isNotBlank(order.getShippingMode()), Order::getShippingMode, order.getShippingMode())
-			.like(StringUtil.isNotBlank(order.getOrderNo()), Order::getOrderNo, order.getOrderNo())
-			.like(StringUtil.isNotBlank(order.getBillNo()), Order::getBillNo, order.getBillNo())
-			.like(StringUtil.isNotBlank(order.getBelongCompany()), Order::getBelongCompany, order.getBelongCompany())
-			.like(StringUtil.isNotBlank(order.getStation()), Order::getStation, order.getStation())
-			.like(StringUtil.isNotBlank(order.getFactory()), Order::getFactory, order.getFactory())
-			.like(StringUtil.isNotBlank(order.getAddressDetail()), Order::getAddressDetail, order.getAddressDetail())
-			.between(StringUtil.isNotBlank(order.getBeginArrivalTime()) && StringUtil.isNotBlank(order.getEndArrivalTime()), Order::getArrivalTime, order.getBeginArrivalTime(), order.getEndArrivalTime())
-			.between(StringUtil.isNotBlank(order.getBeginCrateTime()) && StringUtil.isNotBlank(order.getEndCrateTime()), Order::getCreateTime, order.getBeginCrateTime(), order.getEndCrateTime())
-			.eq(Order::getIsDeleted, 0)
-			.eq(Order::getTenantId, AuthUtil.getTenantId())
-			.ne(Order::getShippingMode, "散货")
-			.orderByDesc(Order::getArrivalTime);
+		orderQueryWrapper.in(CollectionUtil.isNotEmpty(orderIdList), LandOrder::getId, orderIdList)
+			.eq(ObjectUtil.isNotEmpty(order.getCorpId()), LandOrder::getCorpId, order.getCorpId())
+			.eq(ObjectUtil.isNotEmpty(order.getSalesman()), LandOrder::getSalesman, order.getSalesman())
+			.eq(ObjectUtil.isNotEmpty(order.getDispatcher()), LandOrder::getDispatcher, order.getDispatcher())
+			.eq(ObjectUtil.isNotEmpty(order.getDispatchDept()), LandOrder::getDispatchDept, order.getDispatchDept())
+			.eq(ObjectUtil.isNotEmpty(itemStatus) && itemStatus == 999, LandOrder::getStatus, 0)
+			.eq(StringUtil.isNotBlank(order.getShippingMode()), LandOrder::getShippingMode, order.getShippingMode())
+			.like(StringUtil.isNotBlank(order.getOrderNo()), LandOrder::getOrderNo, order.getOrderNo())
+			.like(StringUtil.isNotBlank(order.getBillNo()), LandOrder::getBillNo, order.getBillNo())
+			.like(StringUtil.isNotBlank(order.getBelongCompany()), LandOrder::getBelongCompany, order.getBelongCompany())
+			.like(StringUtil.isNotBlank(order.getStation()), LandOrder::getStation, order.getStation())
+			.like(StringUtil.isNotBlank(order.getFactory()), LandOrder::getFactory, order.getFactory())
+			.like(StringUtil.isNotBlank(order.getAddressDetail()), LandOrder::getAddressDetail, order.getAddressDetail())
+			.between(StringUtil.isNotBlank(order.getBeginArrivalTime()) && StringUtil.isNotBlank(order.getEndArrivalTime()), LandOrder::getArrivalTime, order.getBeginArrivalTime(), order.getEndArrivalTime())
+			.between(StringUtil.isNotBlank(order.getBeginCrateTime()) && StringUtil.isNotBlank(order.getEndCrateTime()), LandOrder::getCreateTime, order.getBeginCrateTime(), order.getEndCrateTime())
+			.eq(LandOrder::getIsDeleted, 0)
+			.eq(LandOrder::getTenantId, AuthUtil.getTenantId())
+			.ne(LandOrder::getShippingMode, "散货")
+			.orderByDesc(LandOrder::getArrivalTime);
 
 		if (order.getKind() == 2) {
-			orderQueryWrapper.ne(Order::getStatus, 0);
+			orderQueryWrapper.ne(LandOrder::getStatus, 0);
 		}
 		if (AuthUtil.getUserRole().contains(LandConst.DDZX_MANAGER)) {
 			R<List<User>> r = userSearchClient.listByRole("1572039278093946882");
@@ -257,13 +257,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			}
 		}
 
-		IPage<Order> pages = baseMapper.selectPage(Condition.getPage(query), orderQueryWrapper);
+		IPage<LandOrder> pages = baseMapper.selectPage(Condition.getPage(query), orderQueryWrapper);
 		String corpIds = "";//客户
 		String createUserIds = "";//创建人
 		String salesmanIds = "";//业务员
 		String dispatcherIds = "";//调度员
 		String dispatchDeptIds = "";//调度部门
-		for (Order orderOne : pages.getRecords()) {
+		for (LandOrder orderOne : pages.getRecords()) {
 			if (ObjectUtil.isNotEmpty(orderOne.getCorpId())) {
 				corpIds = corpIds + orderOne.getCorpId() + ",";
 			}
@@ -456,7 +456,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	}
 
 	@Override
-	public Map<String, Object> getCount(Order order) {
+	public Map<String, Object> getCount(LandOrder order) {
 		long all = 0;
 		long last = 0;
 		long zero = 0;
@@ -467,11 +467,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 		List<Long> orderIdList;
 
-		LambdaQueryWrapper<Order> orderQueryWrapper = new LambdaQueryWrapper<>();
-		orderQueryWrapper.eq(Order::getTenantId, AuthUtil.getTenantId())
-			.eq(Order::getIsDeleted, 0)
-			.ne(Order::getShippingMode, "散货")
-			.between(StringUtil.isNotBlank(order.getBeginArrivalTime()) && StringUtil.isNotBlank(order.getEndArrivalTime()), Order::getArrivalTime, order.getBeginArrivalTime(), order.getEndArrivalTime());
+		LambdaQueryWrapper<LandOrder> orderQueryWrapper = new LambdaQueryWrapper<>();
+		orderQueryWrapper.eq(LandOrder::getTenantId, AuthUtil.getTenantId())
+			.eq(LandOrder::getIsDeleted, 0)
+			.ne(LandOrder::getShippingMode, "散货")
+			.between(StringUtil.isNotBlank(order.getBeginArrivalTime()) && StringUtil.isNotBlank(order.getEndArrivalTime()), LandOrder::getArrivalTime, order.getBeginArrivalTime(), order.getEndArrivalTime());
 		if (AuthUtil.getUserRole().contains(LandConst.DDZX_MANAGER)) {
 			R<List<User>> r = userSearchClient.listByRole("1572039278093946882");
 			if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())) {
@@ -481,7 +481,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		}
 
 		if (order.getKind() == 1) {
-			orderIdList = baseMapper.selectList(orderQueryWrapper).stream().filter(orderTemp -> orderTemp.getStatus() == 0).map(Order::getId).collect(Collectors.toList());
+			orderIdList = baseMapper.selectList(orderQueryWrapper).stream().filter(orderTemp -> orderTemp.getStatus() == 0).map(LandOrder::getId).collect(Collectors.toList());
 			if (CollectionUtil.isNotEmpty(orderIdList)) {
 				List<OrderItem> itemList = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItem>()
 					.in(OrderItem::getOrderId, orderIdList)
@@ -492,7 +492,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			}
 		}
 
-		orderIdList = baseMapper.selectList(orderQueryWrapper).stream().filter(orderTemp -> orderTemp.getStatus() != 0).map(Order::getId).collect(Collectors.toList());
+		orderIdList = baseMapper.selectList(orderQueryWrapper).stream().filter(orderTemp -> orderTemp.getStatus() != 0).map(LandOrder::getId).collect(Collectors.toList());
 		if (CollectionUtil.isNotEmpty(orderIdList)) {
 			List<OrderItem> itemList = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItem>()
 				.in(OrderItem::getOrderId, orderIdList)
@@ -522,7 +522,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 * 散货 统计
 	 */
 	@Override
-	public Map<String, Object> BulkLoadCount(Order order) {
+	public Map<String, Object> BulkLoadCount(LandOrder order) {
 		long all = 0;
 		long last = 0;
 		long zero = 0;
@@ -531,25 +531,25 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		long three = 0;
 		long four = 0;
 
-		List<Order> orderIdList;
-		LambdaQueryWrapper<Order> orderQueryWrapper = new LambdaQueryWrapper<>();
-		orderQueryWrapper.eq(Order::getTenantId, AuthUtil.getTenantId())
-			.eq(Order::getShippingMode, "散货")
-			.eq(Order::getIsDeleted, 0);
+		List<LandOrder> orderIdList;
+		LambdaQueryWrapper<LandOrder> orderQueryWrapper = new LambdaQueryWrapper<>();
+		orderQueryWrapper.eq(LandOrder::getTenantId, AuthUtil.getTenantId())
+			.eq(LandOrder::getShippingMode, "散货")
+			.eq(LandOrder::getIsDeleted, 0);
 		if (AuthUtil.getUserRole().equals(LandConst.MOLD_MANAGER)) {
-			orderQueryWrapper.eq(Order::getCorpId, 1508356683997454337l);
+			orderQueryWrapper.eq(LandOrder::getCorpId, 1508356683997454337l);
 		}
-		orderQueryWrapper.between(StringUtil.isNotBlank(order.getBeginArrivalTime()) && StringUtil.isNotBlank(order.getEndArrivalTime()), Order::getArrivalTime, order.getBeginArrivalTime(), order.getEndArrivalTime());
+		orderQueryWrapper.between(StringUtil.isNotBlank(order.getBeginArrivalTime()) && StringUtil.isNotBlank(order.getEndArrivalTime()), LandOrder::getArrivalTime, order.getBeginArrivalTime(), order.getEndArrivalTime());
 		;
 
 		String userRole = AuthUtil.getUserRole();
 		if (userRole.contains(LandConst.ROLE_CD)) {//车队
 			//未派车2，未受理3，未完工4，已关闭5
-			orderQueryWrapper.in(Order::getStatus, 2, 3, 4, 5, 6);
+			orderQueryWrapper.in(LandOrder::getStatus, 2, 3, 4, 5, 6);
 		}
 		if (userRole.contains(LandConst.ROLE_SJ)) {//司机
 			//未受理3，未完工4，已关闭5
-			orderQueryWrapper.in(Order::getStatus, 3, 4, 5, 6);
+			orderQueryWrapper.in(LandOrder::getStatus, 3, 4, 5, 6);
 		}
 
 		orderIdList = baseMapper.selectList(orderQueryWrapper);
@@ -579,7 +579,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	@GlobalTransactional(rollbackFor = Exception.class)
-	public Long saveOrder(Order order) {
+	public Long saveOrder(LandOrder order) {
 		if (ObjectUtil.isEmpty(order.getId())) {
 			order.setOrderNo(getSerial());
 			order.setTenantId(AuthUtil.getTenantId());
@@ -588,12 +588,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			baseMapper.insert(order);
 		} else {
 			if (order.getShippingMode().equals("散货")) {
-				LambdaQueryWrapper<Order> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-				lambdaQueryWrapper.eq(Order::getId, order.getId());
-				lambdaQueryWrapper.eq(Order::getShippingMode, "散货");
-				lambdaQueryWrapper.eq(Order::getTenantId, AuthUtil.getTenantId());
-				lambdaQueryWrapper.eq(Order::getIsDeleted, 0);
-				Order order1 = baseMapper.selectOne(lambdaQueryWrapper);
+				LambdaQueryWrapper<LandOrder> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+				lambdaQueryWrapper.eq(LandOrder::getId, order.getId());
+				lambdaQueryWrapper.eq(LandOrder::getShippingMode, "散货");
+				lambdaQueryWrapper.eq(LandOrder::getTenantId, AuthUtil.getTenantId());
+				lambdaQueryWrapper.eq(LandOrder::getIsDeleted, 0);
+				LandOrder order1 = baseMapper.selectOne(lambdaQueryWrapper);
 				order.setStatus(order1.getStatus());
 			}
 			order.setUpdateUser(AuthUtil.getUserId());
@@ -718,7 +718,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 */
 	@Override
 	public Boolean submitBulkLoad(Long id) {
-		Order order = new Order();
+		LandOrder order = new LandOrder();
 		order.setId(id);
 		order.setStatus(1);
 		order.setTenantId(AuthUtil.getTenantId());
@@ -730,46 +730,46 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 * 自定义分页 陆运散货订单表
 	 */
 	@Override
-	public IPage<Order> selectBulkLoadList(Order order, Query query) {
-		LambdaQueryWrapper<Order> orderQueryWrapper = new LambdaQueryWrapper<>();
-		orderQueryWrapper.eq(Order::getShippingMode, "散货")
-			.eq(Order::getTenantId, AuthUtil.getTenantId())
-			.eq(Order::getIsDeleted, 0)
-			.eq(ObjectUtil.isNotEmpty(order.getSalesman()), Order::getSalesman, order.getSalesman())//业务员
-			.eq(ObjectUtil.isNotEmpty(order.getDispatchDept()), Order::getDispatchDept, order.getDispatchDept())//调度部门
-			.eq(ObjectUtil.isNotEmpty(order.getCorpId()), Order::getCorpId, order.getCorpId())//客户id
-			.eq(ObjectUtil.isNotEmpty(order.getFleetId()), Order::getFleetId, order.getFleetId())//车队id
-			.eq(ObjectUtil.isNotEmpty(order.getPlateNo()), Order::getPlateNo, order.getPlateNo())//车号
-			.eq(ObjectUtil.isNotEmpty(order.getDriverId()), Order::getDriverId, order.getDriverId())//司机id
-			.eq(StringUtil.isNotBlank(order.getOrderNo()), Order::getOrderNo, order.getOrderNo())//订单号
-			.like(StringUtil.isNotBlank(order.getContractNo()), Order::getContractNo, order.getContractNo())//合同号
-			.like(StringUtil.isNotBlank(order.getDispatchNumber()), Order::getDispatchNumber, order.getDispatchNumber())//派车单号
-			.like(StringUtil.isNotBlank(order.getAddressDetail()), Order::getAddressDetail, order.getAddressDetail())//装货地址
-			.like(StringUtil.isNotBlank(order.getUnloadingPlace()), Order::getUnloadingPlace, order.getUnloadingPlace())//卸货地址
-			.between(StringUtil.isNotBlank(order.getBeginArrivalTime()) && StringUtil.isNotBlank(order.getEndArrivalTime()), Order::getArrivalTime, order.getBeginArrivalTime(), order.getEndArrivalTime())//货运日期
-			.between(StringUtil.isNotBlank(order.getBeginCrateTime()) && StringUtil.isNotBlank(order.getEndCrateTime()), Order::getCreateTime, order.getBeginCrateTime(), order.getEndCrateTime());//制单日期
+	public IPage<LandOrder> selectBulkLoadList(LandOrder order, Query query) {
+		LambdaQueryWrapper<LandOrder> orderQueryWrapper = new LambdaQueryWrapper<>();
+		orderQueryWrapper.eq(LandOrder::getShippingMode, "散货")
+			.eq(LandOrder::getTenantId, AuthUtil.getTenantId())
+			.eq(LandOrder::getIsDeleted, 0)
+			.eq(ObjectUtil.isNotEmpty(order.getSalesman()), LandOrder::getSalesman, order.getSalesman())//业务员
+			.eq(ObjectUtil.isNotEmpty(order.getDispatchDept()), LandOrder::getDispatchDept, order.getDispatchDept())//调度部门
+			.eq(ObjectUtil.isNotEmpty(order.getCorpId()), LandOrder::getCorpId, order.getCorpId())//客户id
+			.eq(ObjectUtil.isNotEmpty(order.getFleetId()), LandOrder::getFleetId, order.getFleetId())//车队id
+			.eq(ObjectUtil.isNotEmpty(order.getPlateNo()), LandOrder::getPlateNo, order.getPlateNo())//车号
+			.eq(ObjectUtil.isNotEmpty(order.getDriverId()), LandOrder::getDriverId, order.getDriverId())//司机id
+			.eq(StringUtil.isNotBlank(order.getOrderNo()), LandOrder::getOrderNo, order.getOrderNo())//订单号
+			.like(StringUtil.isNotBlank(order.getContractNo()), LandOrder::getContractNo, order.getContractNo())//合同号
+			.like(StringUtil.isNotBlank(order.getDispatchNumber()), LandOrder::getDispatchNumber, order.getDispatchNumber())//派车单号
+			.like(StringUtil.isNotBlank(order.getAddressDetail()), LandOrder::getAddressDetail, order.getAddressDetail())//装货地址
+			.like(StringUtil.isNotBlank(order.getUnloadingPlace()), LandOrder::getUnloadingPlace, order.getUnloadingPlace())//卸货地址
+			.between(StringUtil.isNotBlank(order.getBeginArrivalTime()) && StringUtil.isNotBlank(order.getEndArrivalTime()), LandOrder::getArrivalTime, order.getBeginArrivalTime(), order.getEndArrivalTime())//货运日期
+			.between(StringUtil.isNotBlank(order.getBeginCrateTime()) && StringUtil.isNotBlank(order.getEndCrateTime()), LandOrder::getCreateTime, order.getBeginCrateTime(), order.getEndCrateTime());//制单日期
 
 		if (AuthUtil.getUserRole().equals(LandConst.MOLD_MANAGER)) {
-			orderQueryWrapper.eq(Order::getCorpId, 1508356683997454337l);
+			orderQueryWrapper.eq(LandOrder::getCorpId, 1508356683997454337l);
 		}
 
-		orderQueryWrapper.orderByDesc(Order::getArrivalTime);
+		orderQueryWrapper.orderByDesc(LandOrder::getArrivalTime);
 
 		// 获取角色 设置权限
 		String userRole = AuthUtil.getUserRole();
 		Long userId = AuthUtil.getUserId();
 		if (userRole.contains(LandConst.ROLE_CD)) {//车队
 			//未派车2，未受理3，未完工4，已关闭5
-			orderQueryWrapper.in(Order::getStatus, 2, 3, 4, 5, 6);
+			orderQueryWrapper.in(LandOrder::getStatus, 2, 3, 4, 5, 6);
 		}
 		if (userRole.contains(LandConst.ROLE_SJ)) {//司机
 			//未受理3，未完工4，已关闭5
-			orderQueryWrapper.in(Order::getStatus, 3, 4, 5, 6);
+			orderQueryWrapper.in(LandOrder::getStatus, 3, 4, 5, 6);
 		}
 
-		orderQueryWrapper.in(StringUtil.isNotBlank(order.getStatusIds()), Order::getStatus, Func.toIntList(order.getStatusIds()));
+		orderQueryWrapper.in(StringUtil.isNotBlank(order.getStatusIds()), LandOrder::getStatus, Func.toIntList(order.getStatusIds()));
 
-		IPage<Order> pages = baseMapper.selectPage(Condition.getPage(query), orderQueryWrapper);
+		IPage<LandOrder> pages = baseMapper.selectPage(Condition.getPage(query), orderQueryWrapper);
 
 		String corpIds = "";//客户
 		String createUserIds = "";//创建人
@@ -779,7 +779,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		String fleetIds = "";//车队
 		String driverIds = "";//司机
 
-		for (Order orders : pages.getRecords()) {
+		for (LandOrder orders : pages.getRecords()) {
 			if (ObjectUtil.isNotEmpty(orders.getCorpId())) {
 				corpIds = corpIds + orders.getCorpId() + ",";
 			}
@@ -908,8 +908,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 * 陆运散货详情
 	 */
 	@Override
-	public Order detailBulkLoad(Order order) {
-		Order detail = baseMapper.selectById(order.getId());
+	public LandOrder detailBulkLoad(LandOrder order) {
+		LandOrder detail = baseMapper.selectById(order.getId());
 		if (ObjectUtil.isEmpty(detail)) {
 			return detail;
 		}
@@ -989,8 +989,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 * 陆运APP散货详情
 	 */
 	@Override
-	public Order detailAppBulkLoad(Order order) {
-		Order orderapp = detailBulkLoad(order);
+	public LandOrder detailAppBulkLoad(LandOrder order) {
+		LandOrder orderapp = detailBulkLoad(order);
 
 		if (!ObjectUtil.isEmpty(orderapp.getSalesman())) {
 			R<User> user = userClient.userInfoById(orderapp.getSalesman());
@@ -1037,7 +1037,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 */
 	@Override
 	public Long statusBulkLoad(Long id, Integer status) {
-		Order order = new Order();
+		LandOrder order = new LandOrder();
 		if (ObjectUtil.isNotEmpty(id)) {
 			order.setId(id);
 			order.setStatus(status);
@@ -1069,7 +1069,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	@GlobalTransactional(rollbackFor = Exception.class)
-	public Long changeOrder(Order order) {
+	public Long changeOrder(LandOrder order) {
 		order.setUpdateUser(AuthUtil.getUserId());
 		order.setUpdateTime(new Date());
 		baseMapper.updateById(order);
@@ -1168,7 +1168,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	@Transactional(rollbackFor = Exception.class)
-	public R submitOrder(Order order) {
+	public R submitOrder(LandOrder order) {
 		List<OrderItem> orderItemList = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItem>()
 			.eq(OrderItem::getOrderId, order.getId())
 			.eq(OrderItem::getKind, 1)
@@ -1184,7 +1184,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			buildCtn(item.getCtnQuantity(), landWeight, order, item);
 		}
 
-		Order oderTemp = new Order();
+		LandOrder oderTemp = new LandOrder();
 		oderTemp.setId(order.getId());
 		oderTemp.setStatus(1);
 		baseMapper.updateById(oderTemp);
@@ -1202,7 +1202,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			.eq(OrderItem::getIsDeleted, 0)
 		);
 
-		Order order = new Order();
+		LandOrder order = new LandOrder();
 		order.setId(id);
 		order.setStatus(0);
 		baseMapper.updateById(order);
@@ -1213,7 +1213,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	@Transactional(rollbackFor = Exception.class)
 	public boolean removeOrder(List<Long> idList) {
 		idList.forEach(id -> {
-			Order order = new Order();
+			LandOrder order = new LandOrder();
 			order.setId(id);
 			order.setIsDeleted(1);
 			baseMapper.updateById(order);
@@ -1235,7 +1235,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class)
-	public boolean file(Order order) {
+	public boolean file(LandOrder order) {
 		List<CommonFile> fileList = order.getFileList();
 		fileList.forEach(file -> {
 			if (ObjectUtil.isEmpty(file.getId())) {
@@ -1291,11 +1291,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		calendar.roll(Calendar.DAY_OF_MONTH, -1);
 		String endTime = DateUtil.formatDate(calendar.getTime()) + " 23:59:59";
 
-		Order order = baseMapper.selectOne(new LambdaQueryWrapper<Order>()
-			.between(Order::getCreateTime, beginTime, endTime)
-			.eq(Order::getTenantId, AuthUtil.getTenantId())
-			.eq(Order::getIsDeleted, 0)
-			.orderByDesc(Order::getCreateTime)
+		LandOrder order = baseMapper.selectOne(new LambdaQueryWrapper<LandOrder>()
+			.between(LandOrder::getCreateTime, beginTime, endTime)
+			.eq(LandOrder::getTenantId, AuthUtil.getTenantId())
+			.eq(LandOrder::getIsDeleted, 0)
+			.orderByDesc(LandOrder::getCreateTime)
 			.last("limit 1")
 		);
 
@@ -1347,7 +1347,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		});
 	}
 
-	private void buildCtn(Integer ctnQuantity, BigDecimal landWeight, Order order, OrderItem item) {
+	private void buildCtn(Integer ctnQuantity, BigDecimal landWeight, LandOrder order, OrderItem item) {
 		IntStream.range(0, ctnQuantity).forEach(i -> {
 			OrderItem childItem = new OrderItem();
 			BeanUtil.copy(item, childItem);
@@ -1382,7 +1382,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		}
 	}
 
-	private void dealExtraInfo(Order order, StringBuilder addressDetail, StringBuilder unloadingPlace) {
+	private void dealExtraInfo(LandOrder order, StringBuilder addressDetail, StringBuilder unloadingPlace) {
 		int i = 1;
 		if (order.getShippingMode().equals("集装箱")) {
 			for (OrderAddress address : order.getOrderAddressList()) {