陆运修改

blade-service-api/blade-client-api/src/main/java/org/springblade/client/vo/CorpListVo.java

@@ -46,4 +46,14 @@ public class CorpListVo {
 	 */
 	@ApiModelProperty(value = "所属公司中文名")
 	private String belongCompany;
+	/**
+	 * 代理区域
+	 */
+	@ApiModelProperty(value = "代理区域")
+	private String belongtoarea;
+	/**
+	 * 仓库地址
+	 */
+	@ApiModelProperty(value = "仓库地址")
+	private String storageAddr;
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsAttnController.java

@@ -2,13 +2,17 @@ package org.springblade.client.corps.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 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.corps.service.ICorpsAttnService;
+import org.springblade.client.corps.service.ICorpsDescService;
 import org.springblade.client.entity.CorpsAttn;
+import org.springblade.client.entity.CorpsDesc;
+import org.springblade.client.vo.CorpListVo;
 import org.springblade.client.vo.CorpsAttnVO;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
@@ -16,6 +20,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springframework.web.bind.annotation.*;
@@ -36,6 +41,8 @@ public class CorpsAttnController extends BladeController {
 
 	private final ICorpsAttnService corpsAttnService;
 
+	private final ICorpsDescService corpsDescService;
+
 	/**
 	 * 详情
 	 */
@@ -138,8 +145,16 @@ public class CorpsAttnController extends BladeController {
 			.eq(CorpsAttn::getIsDeleted, 0)
 		);
 
-		if (ObjectUtil.isNotEmpty(corpsAttn)) {
-			return R.data(corpsAttn.getPid());
+		if (!ObjectUtil.isEmpty(corpsAttn)) {
+			CorpsDesc corpsDesc = corpsDescService.getById(corpsAttn.getPid());
+			CorpListVo vo = BeanUtil.copy(corpsDesc, CorpListVo.class);
+			if (StringUtils.isNotBlank(corpsDesc.getBelongtocompany())) {
+				CorpsDesc company = corpsDescService.getById(corpsDesc.getBelongtocompany());
+				if (!ObjectUtil.isEmpty(company) && !ObjectUtil.isEmpty(vo)) {
+					vo.setBelongCompany(company.getCname());
+					return R.data(vo);
+				}
+			}
 		}
 		return R.data(null);
 	}

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

@@ -154,7 +154,7 @@ public interface IOrderItemService extends IService<OrderItem> {
 	 * @param orderItem
 	 * @return
 	 */
-	OrderItem changeFleet(OrderItem orderItem);
+	List<OrderItem> changeFleet(OrderItem orderItem);
 
 	/**
 	 * 变更车辆信息

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

@@ -423,7 +423,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public OrderItem changeFleet(OrderItem orderItem) {
+	public List<OrderItem> changeFleet(OrderItem orderItem) {
 		orderItem.setStatus(1);
 		orderItem.setDispatchTime(new Date());
 		orderItem.setUpdateUser(AuthUtil.getUserId());
@@ -472,7 +472,25 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 			orderChangeMapper.insert(change);
 		}
 		addChange(orderItem.getId(), orderItem.getFleetName(), 2);
-		return baseMapper.selectById(orderItem.getId());
+		List<OrderItem> itemList = baseMapper.selectList(new LambdaQueryWrapper<OrderItem>()
+			.eq(OrderItem::getOrderId, orderItem.getOrderId())
+			.eq(OrderItem::getKind, 2)
+			.eq(OrderItem::getIsDeleted, 0)
+		);
+		itemList.forEach(item -> {
+			if (ObjectUtil.isNotEmpty(item.getFleetId())) {
+				R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getFleetId());
+				if (corpMessage.isSuccess() && corpMessage.getData() != null) {
+					item.setFleetName(corpMessage.getData().getCname());
+				}
+			}
+
+			if (ObjectUtil.isNotEmpty(item.getDriverId())) {
+				LandDriver driver = landDriverClient.getDriver(item.getDriverId());
+				item.setDriverName(driver.getName());
+			}
+		});
+		return itemList;
 	}
 
 	@Override