Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/ILandVehicleClient.java

@@ -0,0 +1,18 @@
+package org.springblade.client.feign;
+
+import org.springblade.common.constant.LauncherConstant;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@FeignClient(
+	value = LauncherConstant.APPLICATION_CLIENT_NAME
+)
+public interface ILandVehicleClient {
+
+	String API_PREFIX = "/client";
+	String GET_VEHICLE_COUNT = API_PREFIX + "/getVehicleCount";
+
+	@GetMapping(GET_VEHICLE_COUNT)
+	int getVehicleCount();
+
+}

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/IPortClient.java

@@ -0,0 +1,20 @@
+package org.springblade.client.feign;
+
+import org.springblade.client.entity.BasicPortDesc;
+import org.springblade.common.constant.LauncherConstant;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(
+	value = LauncherConstant.APPLICATION_CLIENT_NAME
+)
+public interface IPortClient {
+
+	String API_PREFIX = "/client";
+	String GET_PORT = API_PREFIX + "/getPort";
+
+	@GetMapping(GET_PORT)
+	BasicPortDesc getPort(@RequestParam("id") Long id);
+
+}

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

@@ -250,6 +250,18 @@ public class Order implements Serializable {
 	private String salesmanName;
 
 	@TableField(exist = false)
+	private String salesmanDeptName;
+
+	@TableField(exist = false)
+	private String agentName;
+
+	@TableField(exist = false)
+	private String polName;
+
+	@TableField(exist = false)
+	private String podName;
+
+	@TableField(exist = false)
 	private String ctnDetail;
 
 	@TableField(exist = false)

blade-service-api/blade-land-api/src/main/java/org/springblade/land/entity/OrderItem.java

@@ -368,6 +368,9 @@ public class OrderItem implements Serializable {
 	private String addressDetail;
 
 	@TableField(exist = false)
+	private List<OrderAddress> orderAddressList;
+
+	@TableField(exist = false)
 	private List<CommonFile> fileList;
 
 	@TableField(exist = false)
@@ -391,4 +394,7 @@ public class OrderItem implements Serializable {
 	@TableField(exist = false)
 	private BigDecimal profit;
 
+	@TableField(exist = false)
+	private String source;
+
 }

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/extra/entity/ClaimItem.java

@@ -26,7 +26,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -59,27 +58,37 @@ public class ClaimItem implements Serializable {
 	@ApiModelProperty(value = "日期")
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date expenseDate;
+	private Date payDate;
 	/**
-	 * 费用ID
+	 * 费用类别ID
 	 */
-	@ApiModelProperty(value = "费用ID")
-	private Long expenseId;
+	@ApiModelProperty(value = "费用类别ID")
+	private Long moldId;
 	/**
-	 * 费用项目
+	 * 费用类别
 	 */
-	@ApiModelProperty(value = "费用项目")
-	private String expenseItem;
+	@ApiModelProperty(value = "费用类别")
+	private String mold;
+	/**
+	 * 费用明细ID
+	 */
+	@ApiModelProperty(value = "费用明细ID")
+	private String detailId;
+	/**
+	 * 费用明细
+	 */
+	@ApiModelProperty(value = "费用明细")
+	private String detail;
 	/**
 	 * 摘要说明
 	 */
 	@ApiModelProperty(value = "摘要说明")
 	private String explanation;
 	/**
-	 * 单据数量
+	 * 支付方式
 	 */
-	@ApiModelProperty(value = "单据数量")
-	private Integer quantity;
+	@ApiModelProperty(value = "支付方式")
+	private Integer payMethod;
 	/**
 	 * 金额
 	 */
@@ -135,5 +144,4 @@ public class ClaimItem implements Serializable {
 	@ApiModelProperty(value = "是否已删除（0-否、1-是）")
 	private Integer isDeleted;
 
-
 }

blade-service/blade-client/src/main/java/org/springblade/client/land/feign/LandVehicleClient.java

@@ -0,0 +1,28 @@
+package org.springblade.client.land.feign;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.AllArgsConstructor;
+import org.springblade.client.entity.LandVehicle;
+import org.springblade.client.feign.ILandVehicleClient;
+import org.springblade.client.land.service.ILandVehicleService;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tenant.annotation.NonDS;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+@NonDS
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class LandVehicleClient implements ILandVehicleClient {
+
+	private final ILandVehicleService landVehicleService;
+
+	@Override
+	public int getVehicleCount() {
+		return landVehicleService.count(new LambdaQueryWrapper<LandVehicle>()
+			.eq(LandVehicle::getTenantId, AuthUtil.getTenantId())
+			.eq(LandVehicle::getIsDeleted, 0)
+		);
+	}
+}

blade-service/blade-client/src/main/java/org/springblade/client/port/feign/PortClient.java

@@ -0,0 +1,26 @@
+package org.springblade.client.port.feign;
+
+import lombok.AllArgsConstructor;
+import org.springblade.client.entity.BasicPortDesc;
+import org.springblade.client.feign.IPortClient;
+import org.springblade.client.port.service.BasicPortDescService;
+import org.springblade.core.tenant.annotation.NonDS;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+@NonDS
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class PortClient implements IPortClient {
+
+	private final BasicPortDescService portDescService;
+
+	@Override
+	@GetMapping(GET_PORT)
+	public BasicPortDesc getPort(Long id) {
+		return portDescService.getById(id);
+	}
+
+}

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

@@ -0,0 +1,157 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.land.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springblade.client.entity.CorpsDesc;
+import org.springblade.client.feign.ICorpsDescClient;
+import org.springblade.client.feign.ILandVehicleClient;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.CollectionUtil;
+import org.springblade.core.tool.utils.Func;
+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.OrderItem;
+import org.springblade.land.service.IOrderItemService;
+import org.springblade.land.service.IOrderService;
+import org.springblade.land.vo.OrderItemVO;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 陆运订单明细表 控制器
+ *
+ * @author BladeX
+ * @since 2022-03-07
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/order-index")
+@Api(value = "陆运订单首页", tags = "陆运订单首页接口")
+public class OrderIndexController extends BladeController {
+
+	private final IOrderService orderService;
+
+	private final IOrderItemService orderItemService;
+
+	private final ILandVehicleClient landVehicleClient;
+
+	private final ICorpsDescClient corpsDescClient;
+
+	/**
+	 * 统计
+	 */
+	@GetMapping("/count")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "统计", notes = "")
+	public R count() {
+		// 今日新增柜数
+		int newly = orderItemService.count(new LambdaQueryWrapper<OrderItem>()
+			.between(OrderItem::getCreateTime, getTime(true), getTime(false))
+			.eq(OrderItem::getKind, 2)
+			.eq(OrderItem::getTenantId, AuthUtil.getTenantId())
+			.eq(OrderItem::getIsDeleted, 0)
+		);
+
+		// 未安排柜数
+		int inactive = orderItemService.count(new LambdaQueryWrapper<OrderItem>()
+			.eq(OrderItem::getStatus, 0)
+			.eq(OrderItem::getKind, 2)
+			.eq(OrderItem::getTenantId, AuthUtil.getTenantId())
+			.eq(OrderItem::getIsDeleted, 0)
+		);
+
+		// 今日派车数
+		int send = orderItemService.count(new LambdaQueryWrapper<OrderItem>()
+			.notIn(OrderItem::getStatus, 0, 1)
+			.between(OrderItem::getSendTime, getTime(true), getTime(false))
+			.eq(OrderItem::getKind, 2)
+			.eq(OrderItem::getTenantId, AuthUtil.getTenantId())
+			.eq(OrderItem::getIsDeleted, 0)
+		);
+
+		// 可用车辆数
+		int all = landVehicleClient.getVehicleCount();
+		int active = orderItemService.count(new LambdaQueryWrapper<OrderItem>()
+			.notIn(OrderItem::getStatus, 0, 1, 4)
+			.eq(OrderItem::getKind, 2)
+			.eq(OrderItem::getTenantId, AuthUtil.getTenantId())
+			.eq(OrderItem::getIsDeleted, 0)
+		);
+		int usable = all - active;
+
+		return R.data(new HashMap<String, Object>() {{
+			this.put("newly", newly);
+			this.put("inactive", inactive);
+			this.put("send", send);
+			this.put("usable", usable);
+		}});
+	}
+
+	/**
+	 * 运行车辆
+	 */
+	@GetMapping("/active")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "运行车辆", notes = "")
+	public R<List<OrderItem>> active() {
+		LambdaQueryWrapper<OrderItem> itemQueryWrapper = new LambdaQueryWrapper<>();
+		itemQueryWrapper.in(OrderItem::getStatus, 2, 3, 5)
+			.eq(OrderItem::getKind, 2)
+			.eq(OrderItem::getIsDeleted, 0)
+			.eq(OrderItem::getTenantId, AuthUtil.getTenantId())
+			.orderByDesc(OrderItem::getUpdateTime);
+		List<OrderItem> itemList = orderItemService.list(itemQueryWrapper);
+		itemList.forEach(item -> {
+			Order order = orderService.getById(item.getOrderId());
+			if (ObjectUtil.isNotEmpty(order.getCorpId())) {
+				R<CorpsDesc> corp = corpsDescClient.getCorpMessage(order.getCorpId());
+				if (corp.isSuccess() && corp.getData() != null) {
+					item.setCorpName(corp.getData().getCname());
+				}
+			}
+		});
+
+		return R.data(itemList);
+	}
+
+	private String getTime(boolean init) {
+		String date = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+		if (init) {
+			return date + "00:00:00";
+		}
+		return date + "23:59:59";
+	}
+
+}

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

@@ -40,8 +40,10 @@ 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.entity.Order;
+import org.springblade.land.entity.OrderAddress;
 import org.springblade.land.entity.OrderChange;
 import org.springblade.land.entity.OrderItem;
+import org.springblade.land.mapper.OrderAddressMapper;
 import org.springblade.land.mapper.OrderChangeMapper;
 import org.springblade.land.mapper.OrderItemMapper;
 import org.springblade.land.mapper.OrderMapper;
@@ -69,6 +71,8 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 
 	private final OrderChangeMapper orderChangeMapper;
 
+	private final OrderAddressMapper orderAddressMapper;
+
 	private final ICorpsDescClient corpsDescClient;
 
 	private final ILandDriverClient landDriverClient;
@@ -91,7 +95,6 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 				.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())
-				.between(StringUtil.isNotBlank(orderItem.getBeginArrivalTime()) && StringUtil.isNotBlank(orderItem.getEndArrivalTime()), Order::getArrivalTime, orderItem.getBeginArrivalTime(), orderItem.getEndArrivalTime())
 				.between(StringUtil.isNotBlank(orderItem.getBeginCrateTime()) && StringUtil.isNotBlank(orderItem.getEndCrateTime()), Order::getCreateTime, orderItem.getBeginCrateTime(), orderItem.getEndCrateTime())
 				.eq(Order::getIsDeleted, 0)
 				.eq(Order::getTenantId, AuthUtil.getTenantId())
@@ -114,6 +117,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 			.like(StringUtil.isNotBlank(orderItem.getBillNo()), OrderItem::getBillNo, orderItem.getBillNo())
 			.like(StringUtil.isNotBlank(orderItem.getTel()), OrderItem::getTel, orderItem.getTel())
 			.like(StringUtil.isNotBlank(orderItem.getCtnNo()), OrderItem::getCtnNo, orderItem.getCtnNo())
+			.between(StringUtil.isNotBlank(orderItem.getBeginArrivalTime()) && StringUtil.isNotBlank(orderItem.getEndArrivalTime()), OrderItem::getArrivalTime, orderItem.getBeginArrivalTime(), orderItem.getEndArrivalTime())
 			.eq(ObjectUtil.isNotEmpty(orderItem.getFleetId()), OrderItem::getFleetId, orderItem.getFleetId())
 			.eq(ObjectUtil.isNotEmpty(orderItem.getVehicleId()), OrderItem::getVehicleId, orderItem.getVehicleId())
 			.eq(ObjectUtil.isNotEmpty(orderItem.getDriverId()), OrderItem::getDriverId, orderItem.getDriverId())
@@ -153,6 +157,15 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 				BigDecimal c = record.getLandAmountC().add(record.getOneFeeC()).add(record.getTwoFeeC()).add(record.getThreeFeeC()).add(record.getFourFeeC()).add(record.getFiveFeeC());
 				record.setProfit(d.subtract(c));
 			}
+
+			// 手机端
+			if (StringUtil.isNotBlank(orderItem.getSource())) {
+				List<OrderAddress> orderAddressList = orderAddressMapper.selectList(new LambdaQueryWrapper<OrderAddress>()
+					.eq(OrderAddress::getOrderId, record.getOrderId())
+					.eq(OrderAddress::getIsDeleted, 0)
+				);
+				record.setOrderAddressList(orderAddressList);
+			}
 		});
 		return pages;
 	}
@@ -384,7 +397,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 		item.setFourFeeC(orderItem.getFourFeeC());
 		item.setFiveFeeC(orderItem.getFiveFeeC());
 		item.setFeeRemarksC(orderItem.getFeeRemarksC());
-		item.setStatus(3);
+		item.setStatus(5);
 		item.setAcceptTime(new Date());
 		item.setUpdateUser(AuthUtil.getUserId());
 		item.setUpdateTime(new Date());
@@ -427,7 +440,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 	public boolean arrival(Long id) {
 		OrderItem item = new OrderItem();
 		item.setId(id);
-		item.setStatus(5);
+		item.setStatus(3);
 		item.setRealArrivalTime(new Date());
 		item.setUpdateUser(AuthUtil.getUserId());
 		item.setUpdateTime(new Date());

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

@@ -35,6 +35,7 @@ import org.springblade.land.mapper.*;
 import org.springblade.land.service.IOrderService;
 import org.springblade.land.util.MessageUtil;
 import org.springblade.land.vo.OrderVO;
+import org.springblade.system.feign.ISysClient;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.stereotype.Service;
@@ -76,6 +77,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	private final IUserClient userClient;
 
+	private final ISysClient sysClient;
+
+	private final IPortClient portClient;
+
 	@Override
 	public IPage<OrderVO> selectOrderPage(IPage<OrderVO> page, OrderVO order) {
 		return page.setRecords(baseMapper.selectOrderPage(page, order));
@@ -101,27 +106,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			.eq(OrderItem::getIsDeleted, 0));
 		detail.setItemList(itemList);
 
-		List<OrderItem> orderItemList = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItem>()
-			.eq(OrderItem::getOrderId, order.getId())
-			.eq(OrderItem::getKind, 2)
-			.eq(OrderItem::getIsDeleted, 0)
-		);
-		orderItemList.forEach(orderItem -> {
-			if (ObjectUtil.isNotEmpty(orderItem.getFleetId())) {
-				R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(orderItem.getFleetId());
-				if (corpMessage.isSuccess() && corpMessage.getData() != null) {
-					orderItem.setFleetName(corpMessage.getData().getCname());
-				}
-			}
-
-			if (ObjectUtil.isNotEmpty(orderItem.getDriverId())) {
-				LandDriver driver = landDriverClient.getDriver(orderItem.getDriverId());
-				if (ObjectUtil.isNotEmpty(driver)) {
-					orderItem.setDriverName(driver.getName());
-				}
-			}
-		});
-		detail.setOrderItemList(orderItemList);
+		detail.setOrderItemList(getOrderItemList(order.getId()));
 
 		List<OrderAddress> orderAddressList = orderAddressMapper.selectList(new LambdaQueryWrapper<OrderAddress>()
 			.eq(OrderAddress::getOrderId, order.getId())
@@ -129,31 +114,71 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		);
 		detail.setOrderAddressList(orderAddressList);
 
-		List<OrderFee> orderFeeList = orderFeeMapper.selectList(new LambdaQueryWrapper<OrderFee>()
-			.eq(OrderFee::getOrderId, order.getId())
-			.eq(OrderFee::getIsDeleted, 0)
-		);
-		orderFeeList.forEach(orderFee -> {
-			if (!ObjectUtil.isEmpty(orderFee.getCorpId())) {
-				R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(orderFee.getCorpId());
-				if (corpMessage.isSuccess() && corpMessage.getData() != null) {
-					orderFee.setCorpName(corpMessage.getData().getCname());
+		// 手机端
+		if (StringUtil.isNotBlank(order.getSource())) {
+			if (!ObjectUtil.isEmpty(detail.getSalesman())) {
+				R<User> user = userClient.userInfoById(detail.getSalesman());
+				if (user.isSuccess() && user.getData() != null) {
+					detail.setSalesmanName(user.getData().getRealName());
 				}
 			}
-			if (!ObjectUtil.isEmpty(orderFee.getFeeId())) {
-				R<FeesDesc> feesMessage = feesDescClient.detail(orderFee.getFeeId());
-				if (feesMessage.isSuccess() && feesMessage.getData() != null) {
-					orderFee.setFeeName(feesMessage.getData().getCname());
+			if (!ObjectUtil.isEmpty(detail.getSalesmanDept())) {
+				R<String> dept = sysClient.getDeptName(detail.getSalesmanDept());
+				if (dept.isSuccess() && dept.getData() != null) {
+					detail.setSalesmanDeptName(dept.getData());
+				}
+			}
+			if (!ObjectUtil.isEmpty(detail.getAgentId())) {
+				R<CorpsDesc> agent = corpsDescClient.getCorpMessage(detail.getAgentId());
+				if (agent.isSuccess() && agent.getData() != null) {
+					detail.setAgentName(agent.getData().getCname());
+				}
+			}
+			if (!ObjectUtil.isEmpty(detail.getAgentId())) {
+				R<CorpsDesc> agent = corpsDescClient.getCorpMessage(detail.getAgentId());
+				if (agent.isSuccess() && agent.getData() != null) {
+					detail.setAgentName(agent.getData().getCname());
+				}
+			}
+			if (!ObjectUtil.isEmpty(detail.getPolId())) {
+				BasicPortDesc pol = portClient.getPort(detail.getPolId());
+				if (pol != null) {
+					detail.setPolName(pol.getName());
+				}
+			}
+			if (!ObjectUtil.isEmpty(detail.getPodId())) {
+				BasicPortDesc pod= portClient.getPort(detail.getPodId());
+				if (pod != null) {
+					detail.setPodName(pod.getName());
 				}
 			}
-		});
-		detail.setOrderFeeList(orderFeeList);
-
-		R<List<CommonFile>> fileList = commonFileClient.getList(order.getId(), LandConstant.ORDER);
-		if (fileList.isSuccess() && fileList.getData() != null) {
-			detail.setFileList(fileList.getData());
 		} else {
-			detail.setFileList(Collections.emptyList());
+			List<OrderFee> orderFeeList = orderFeeMapper.selectList(new LambdaQueryWrapper<OrderFee>()
+				.eq(OrderFee::getOrderId, order.getId())
+				.eq(OrderFee::getIsDeleted, 0)
+			);
+			orderFeeList.forEach(orderFee -> {
+				if (!ObjectUtil.isEmpty(orderFee.getCorpId())) {
+					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(orderFee.getCorpId());
+					if (corpMessage.isSuccess() && corpMessage.getData() != null) {
+						orderFee.setCorpName(corpMessage.getData().getCname());
+					}
+				}
+				if (!ObjectUtil.isEmpty(orderFee.getFeeId())) {
+					R<FeesDesc> feesMessage = feesDescClient.detail(orderFee.getFeeId());
+					if (feesMessage.isSuccess() && feesMessage.getData() != null) {
+						orderFee.setFeeName(feesMessage.getData().getCname());
+					}
+				}
+			});
+			detail.setOrderFeeList(orderFeeList);
+
+			R<List<CommonFile>> fileList = commonFileClient.getList(order.getId(), LandConstant.ORDER);
+			if (fileList.isSuccess() && fileList.getData() != null) {
+				detail.setFileList(fileList.getData());
+			} else {
+				detail.setFileList(Collections.emptyList());
+			}
 		}
 		return detail;
 	}
@@ -179,6 +204,20 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				return new Page<>();
 			}
 		}
+		if (StringUtil.isNotBlank(order.getBeginArrivalTime()) && StringUtil.isNotBlank(order.getEndArrivalTime())) {
+			orderIdList = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItem>()
+				.select(OrderItem::getOrderId)
+				.in(CollectionUtil.isNotEmpty(orderIdList), OrderItem::getOrderId, orderIdList)
+				.between(OrderItem::getArrivalTime, order.getBeginArrivalTime(), order.getEndArrivalTime())
+				.eq(OrderItem::getKind, 1)
+				.eq(OrderItem::getIsDeleted, 0)
+				.groupBy(OrderItem::getOrderId)
+			).stream().map(OrderItem::getOrderId).collect(Collectors.toList());
+
+			if (CollectionUtil.isEmpty(orderIdList)) {
+				return new Page<>();
+			}
+		}
 
 		orderQueryWrapper.in(CollectionUtil.isNotEmpty(orderIdList), Order::getId, orderIdList)
 			.eq(ObjectUtil.isNotEmpty(order.getCorpId()), Order::getCorpId, order.getCorpId())
@@ -189,7 +228,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			.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());
@@ -302,7 +340,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				}
 			}
 
+			// 手机端
 			if (StringUtil.isNotBlank(order.getSource())) {
+				record.setOrderItemList(getOrderItemList(record.getId()));
+
 				List<OrderAddress> orderAddressList = orderAddressMapper.selectList(new LambdaQueryWrapper<OrderAddress>()
 					.eq(OrderAddress::getOrderId, record.getId())
 					.eq(OrderAddress::getIsDeleted, 0)
@@ -569,6 +610,30 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		return true;
 	}
 
+	private List<OrderItem> getOrderItemList(Long id) {
+		List<OrderItem> orderItemList = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItem>()
+			.eq(OrderItem::getOrderId, id)
+			.eq(OrderItem::getKind, 2)
+			.eq(OrderItem::getIsDeleted, 0)
+		);
+		orderItemList.forEach(orderItem -> {
+			if (ObjectUtil.isNotEmpty(orderItem.getFleetId())) {
+				R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(orderItem.getFleetId());
+				if (corpMessage.isSuccess() && corpMessage.getData() != null) {
+					orderItem.setFleetName(corpMessage.getData().getCname());
+				}
+			}
+
+			if (ObjectUtil.isNotEmpty(orderItem.getDriverId())) {
+				LandDriver driver = landDriverClient.getDriver(orderItem.getDriverId());
+				if (ObjectUtil.isNotEmpty(driver)) {
+					orderItem.setDriverName(driver.getName());
+				}
+			}
+		});
+		return orderItemList;
+	}
+
 	private String getSerial() {
 		Calendar calendar = Calendar.getInstance();
 		String postfix = DateUtil.format(calendar.getTime(), "yyMMdd");