需求130后台-集运-包裹列表-包裹详情

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/cons/ConsServiceImpl.java

@@ -98,6 +98,7 @@ public class ConsServiceImpl extends AbstractService<ConsMapper, ConsDO> impleme
         String consNum = generateConsNumber(warehouseCode);
         ConsDO cons = ConsConvert.INSTANCE.convert(createReqVO);
         cons.setConsNum(consNum);
+        cons.setStatus(0);
         consMapper.insert(cons);
         createReqVO.getConsItemVOList().forEach(consItemVO -> {
             consItemVO.setConsId(cons.getId());

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/cons/ConsBackVO.java

 package cn.iocoder.yudao.module.order.vo.cons;
 
+import cn.iocoder.yudao.module.depository.dto.LogisticsInfoDto;
 import cn.iocoder.yudao.module.order.vo.consItem.ConsItemBackVO;
 import lombok.*;
 import java.util.*;
@@ -223,4 +224,8 @@ public class ConsBackVO {
     @ApiModelProperty(value = "客户手机号")
     private String phoneNew;
 
+    @ExcelProperty("初始物流信息相关")
+    @ApiModelProperty(value = "初始物流信息相关")
+    private LogisticsInfoDto initialLogisticsInfoDto;
+
 }

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/consItem/ConsItemBackVO.java

 package cn.iocoder.yudao.module.order.vo.consItem;
 
+import cn.iocoder.yudao.module.order.vo.consTrackingRecord.ConsTrackingRecordBackVO;
 import lombok.*;
 
 import java.math.BigDecimal;
@@ -111,4 +112,5 @@ public class ConsItemBackVO {
     @ApiModelProperty(value = "", required = true)
     private Date createTime;
 
+
 }

yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/cons/ConsController.java

 package cn.iocoder.yudao.module.order.controller.admin.cons;
 
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.code.CodeUtils;
+import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
 import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
+import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
+import cn.iocoder.yudao.module.customer.dal.dataobject.customer.CustomerDO;
 import cn.iocoder.yudao.module.customer.dal.dataobject.customerContacts.CustomerContactsDO;
+import cn.iocoder.yudao.module.customer.service.customer.CustomerService;
 import cn.iocoder.yudao.module.customer.service.customerContacts.CustomerContactsService;
+import cn.iocoder.yudao.module.depository.dal.mysql.warehouse.WarehouseLineMapper;
+import cn.iocoder.yudao.module.depository.dto.LogisticsInfoDto;
 import cn.iocoder.yudao.module.order.convert.cons.ConsConvert;
-import cn.iocoder.yudao.module.order.convert.consItem.ConsItemConvert;
 import cn.iocoder.yudao.module.order.dal.dataobject.cons.ConsDO;
-import cn.iocoder.yudao.module.order.dal.dataobject.consItem.ConsItemDO;
 import cn.iocoder.yudao.module.order.service.cons.ConsService;
 import cn.iocoder.yudao.module.order.service.consItem.ConsItemService;
+import cn.iocoder.yudao.module.order.service.consTrackingRecord.ConsTrackingRecordService;
 import cn.iocoder.yudao.module.order.vo.cons.ConsBackVO;
 import cn.iocoder.yudao.module.order.vo.cons.ConsCreateReqVO;
 import cn.iocoder.yudao.module.order.vo.cons.ConsQueryVO;
 import cn.iocoder.yudao.module.order.vo.cons.ConsUpdateReqVO;
+import cn.iocoder.yudao.module.order.vo.consItem.ConsItemBackVO;
+import cn.iocoder.yudao.module.order.vo.consItem.ConsItemQueryVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.annotations.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.io.IOException;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
-import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
-import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
+import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.module.order.enums.ErrorCodeConstants.NOT_FIND_LOGISTICS_INFO;
 
 
 @Validated
@@ -43,6 +56,15 @@ public class ConsController {
     @Resource
     private CustomerContactsService customerContactsService;
 
+    @Resource
+    private ConsTrackingRecordService consTrackingRecordService;
+
+    @Resource
+    private CustomerService customerService;
+
+    @Resource
+    private WarehouseLineMapper warehouseLineMapper;
+
     @Resource
     private ConsItemService consItemService;
 
@@ -76,12 +98,22 @@ public class ConsController {
     @PreAuthorize("@ss.hasPermission('ecw:cons:query')")
     public CommonResult<ConsBackVO> getCons(@RequestParam("id") Long id) {
         ConsDO cons = consService.getCons(id);
+        CustomerDO customer = customerService.selectOne("id", cons.getCustomerId());
         CustomerContactsDO customerContacts = customerContactsService.getDefaultContacts(cons.getCustomerId());
-        List<ConsItemDO> consItemDOS = consItemService.selectList(ConsItemDO::getConsId, cons.getId());
+        List<ConsItemBackVO> consItemBackVOS = consItemService.getConsItemBackVOList(new ConsItemQueryVO().setConsId(id));
         ConsBackVO consBackVO = ConsConvert.INSTANCE.convert(cons);
-        consBackVO.setConsItemVOList(ConsItemConvert.INSTANCE.convertList(consItemDOS));
+        consBackVO.setConsItemVOList(consItemBackVOS);
         consBackVO.setAreaCode(customerContacts.getAreaCode());
         consBackVO.setPhoneNew(customerContacts.getPhoneNew());
+        consBackVO.setCustomerName(customer.getName());
+        // 物流信息查询
+        LogisticsInfoDto initialLogisticsInfoDto =
+                warehouseLineMapper.getStartInfoAndDestInfoByLineId(cons.getWarehouseLineId());
+        if (Objects.isNull(initialLogisticsInfoDto)) {
+            throw exception(NOT_FIND_LOGISTICS_INFO);
+        }
+        //初始物流信息
+        consBackVO.setInitialLogisticsInfoDto(initialLogisticsInfoDto);
         return success(consBackVO);
     }