update 增加订单-运单列表-订单详情接口

sckw-modules/sckw-report/src/main/java/com/sckw/report/controller/KwTransportController.java

@@ -6,6 +6,7 @@ import com.sckw.excel.config.easyexcel.RequestHolder;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.report.service.KwTransportService;
 import com.sckw.report.service.param.ConsignOrderQuery;
+import com.sckw.report.service.param.WaybillOrderQuery;
 import com.sckw.report.service.vo.ConsignOrderVo;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.AllArgsConstructor;
@@ -96,6 +97,20 @@ public class KwTransportController {
         }
     }
 
-
-
+    /**
+     * 运单管理-运单列表
+     * @param query
+     * @return
+     */
+    @RequestMapping(value = "/getWaybillOrders", method = RequestMethod.POST)
+    public HttpResult getWayBillOrders(@Validated @RequestBody WaybillOrderQuery query){
+        HttpResult httpResult = new HttpResult();
+        try {
+            httpResult = transportService.getWaybillOrders(query);
+        } catch (Exception e) {
+            log.error("[WAYBILL]运单管理-运单列表失败:{}", e.getMessage(), e);
+            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
+        }
+        return httpResult;
+    }
 }

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwTransportService.java

@@ -14,6 +14,8 @@ import com.sckw.mongo.model.TobleTop;
 import com.sckw.report.dao.SckwLogisticsOrderRepository;
 import com.sckw.report.enums.CarWaybillEnum;
 import com.sckw.report.service.param.ConsignOrderQuery;
+import com.sckw.report.service.param.WaybillOrderQuery;
+import com.sckw.report.service.vo.CarWaybillVo;
 import com.sckw.report.service.vo.ConsignOrderVo;
 import com.sckw.transport.api.dubbo.TransportDubboService;
 import com.sckw.transport.api.model.dto.vo.KwtLogisticsOrderVO;
@@ -323,4 +325,103 @@ public class KwTransportService {
         List<KwtLogisticsOrderVO> acceptCarriageOrderDetail = transportDubboService.getAcceptCarriageOrderDetail(ids);
         return acceptCarriageOrderDetail;
     }
+
+    /**
+     * 获取运单列表
+     * @param query
+     * @return
+     * @throws ParseException
+     */
+    public HttpResult getWaybillOrders(WaybillOrderQuery query) throws ParseException {
+        // 模糊匹配
+        // 根据条件查询所有并排序，且分页
+        // 设置模糊查询匹配规则  忽略大小写
+        // 创建条件对象
+        Criteria criteria = new Criteria();
+        criteria.and("entId").is(LoginUserHolder.getEntId());
+        // 装载时间
+        if (StringUtils.isNotBlank(query.getStartLoadTime()) && StringUtils.isNotEmpty(query.getEndLoadTime())) {
+            criteria.andOperator(Criteria.where("loadTime").gte(query.getStartLoadTime()), Criteria.where("loadTime")
+                    .lte(query.getEndLoadTime()));
+        }
+        // 派车时间
+        if (StringUtils.isNotBlank(query.getStartSendCarTime()) && StringUtils.isNotEmpty(query.getEndSendCarTime())) {
+            criteria.andOperator(Criteria.where("sendCarTime").gte(query.getStartSendCarTime()), Criteria.where("sendCarTime")
+                    .lte(query.getEndSendCarTime()));
+        }
+        // 卸货时间
+        if (StringUtils.isNotBlank(query.getStartUnloadTime()) && StringUtils.isNotEmpty(query.getEndUnloadTime())) {
+            criteria.andOperator(Criteria.where("unloadTime").gte(query.getStartUnloadTime()), Criteria.where("unloadTime")
+                    .lte(query.getEndUnloadTime()));
+        }
+        criteria.and("delFlag").is(String.valueOf(NumberConstant.ZERO));
+        // 多条件模糊查询
+        Criteria c1 = new Criteria();
+        Criteria c2 = new Criteria();
+        Criteria c3 = new Criteria();
+        Criteria c4 = new Criteria();
+        Criteria c5 = new Criteria();
+        Criteria c6 = new Criteria();
+        if (StringUtils.isNotBlank(query.getKeywords())) {
+            Pattern pattern = Pattern.compile("^.*" + query.getKeywords() + ".*$", Pattern.CASE_INSENSITIVE);
+            c1 = Criteria.where("wOrderNo").regex(pattern);
+            c2 = Criteria.where("truckNo").regex(pattern);
+            c3 = Criteria.where("driverName").regex(pattern);
+            c4 = Criteria.where("firmName").regex(pattern);
+            c5 = Criteria.where("loadAddress").regex(pattern);
+            c6 = Criteria.where("unloadAddress").regex(pattern);
+            criteria.orOperator(c1, c2, c3, c4, c5, c6);
+        }
+        Query queryFormat = new Query(criteria);
+        // in查询
+        if (CollectionUtils.isNotEmpty(query.getIds())) {
+            queryFormat.addCriteria(Criteria.where("wOrderId").in(query.getIds()));
+        }
+        // 总记录数
+        long total = mongoTemplate.count(queryFormat, SckwWaybillOrder.class);
+        queryFormat.with(PageRequest.of(query.getPage() - 1, query.getPageSize(),
+                Sort.by(Sort.Order.desc("createTime"))));
+        // 执行查询
+        List<SckwWaybillOrder> list = mongoTemplate.find(queryFormat, SckwWaybillOrder.class);
+        List<CarWaybillVo> returnList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(list)) {
+            packageWayBillReturnList(list, returnList);
+        }
+        PageResult build = PageResult.build(query.getPage(), query.getPageSize(), total, returnList);
+        return HttpResult.ok(build);
+    }
+
+    /**
+     * 处理运单查询结果
+     * @param list
+     * @param returnList
+     */
+    private void packageWayBillReturnList(List<SckwWaybillOrder> list, List<CarWaybillVo> returnList) {
+        for (SckwWaybillOrder waybillOrder : list) {
+            CarWaybillVo vo = new CarWaybillVo();
+            vo.setWOrderNo(waybillOrder.getWOrderNo() == null ?
+                    null : String.valueOf(waybillOrder.getWOrderNo()));
+            vo.setFirmName(waybillOrder.getFirmName() == null ?
+                    null : String.valueOf(waybillOrder.getFirmName()));
+            vo.setTruckNo(waybillOrder.getTruckNo());
+            vo.setDriverName(waybillOrder.getDriverName() == null ?
+                    null : String.valueOf(waybillOrder.getDriverName()));
+            vo.setType(waybillOrder.getType());
+            vo.setSendCarTime(String.valueOf(waybillOrder.getSendCarTime()));
+            vo.setStartTime(String.valueOf(waybillOrder.getStartTime()));
+            vo.setEndTime(String.valueOf(waybillOrder.getEndTime()));
+            vo.setEntrustAmount(String.valueOf(waybillOrder.getEntrustAmount()));
+            vo.setLoadingAddress(waybillOrder.getLoadingAddress());
+            vo.setUnloadingAddress(waybillOrder.getUnloadingAddress());
+            vo.setLoadAmount(waybillOrder.getLoadAmount() == null ?
+                    null : String.valueOf(waybillOrder.getLoadAmount()));
+            vo.setUnloadAmount(waybillOrder.getUnloadAmount() == null ?
+                    null : String.valueOf(waybillOrder.getUnloadAmount()));
+            vo.setLoadTime(waybillOrder.getLoadTime() == null ?
+                    null : String.valueOf(waybillOrder.getLoadTime()));
+            vo.setUnloadTime(waybillOrder.getUnloadTime() == null ?
+                    null :String.valueOf(waybillOrder.getUnloadTime()));
+            returnList.add(vo);
+        }
+    }
 }

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/param/WaybillOrderQuery.java

@@ -0,0 +1,61 @@
+package com.sckw.report.service.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.model.page.PageRequest;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author JC
+ * @version 1.0
+ * @desc TODO
+ * @date 2023/{07}/19 10:20:44
+ **/
+@Data
+@Accessors(chain = true)
+public class WaybillOrderQuery extends PageRequest implements Serializable {
+    private List<Long> ids;
+    /**
+     * 派车开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private String startSendCarTime;
+
+    /**
+     * 派车结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private String endSendCarTime;
+
+    /**
+     * 装载开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private String startLoadTime;
+
+    /**
+     * 装载结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private String endLoadTime;
+
+    /**
+     * 卸载开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private String startUnloadTime;
+
+    /**
+     * 卸载结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private String endUnloadTime;
+
+    /**
+     * 关键字搜索
+     */
+    private String keywords;
+}

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/vo/CarWaybillVo.java

@@ -1,8 +1,11 @@
 package com.sckw.report.service.vo;
 
+import com.sckw.core.model.page.PageResult;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * @author lfdc
  * @description 车辆运单
@@ -10,67 +13,89 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-public class CarWaybillVo {
+public class CarWaybillVo extends PageResult implements Serializable {
 
     /**
-     * 运单编号
+     * 物流订单id
      */
-    private String waybillNumber;
+    private String wOrderId;
+
     /**
-     * 车牌号
+     * 物流订单号
      */
-    private String truckNo;
+    private String wOrderNo;
+
     /**
-     * 状态
+     * 承运车队
      */
-    private String status;
+    private String firmName;
+
     /**
-     * 运单类型
+     * 车辆牌照
      */
-    private String waybillType;
+    private String truckNo;
+
     /**
      * 司机
      */
     private String driverName;
+
     /**
-     * 承运车队
+     * 运单类型
      */
-    private String consignMotorcade;
+    private String type;
+
     /**
-     * 派车量/吨
+     * 派车时间
      */
-    private String sendCarWeigh;
+    private String sendCarTime;
+
     /**
-     * 派车时间
+     * 计划开始时间
      */
-    private String sendCarDate;
+    private String startTime;
+
     /**
-     * 实装量/吨
+     * 计划结束时间
      */
-    private String stowageWeigh;
+    private String endTime;
+
     /**
-     * 装货时间
+     * 派单量/吨
      */
-    private String stowageDate;
+    private String entrustAmount;
+
     /**
-     * 实卸量/吨
+     * 装货地点
      */
-    private String unloadWeigh;
+    private String loadingAddress;
+
     /**
-     * 卸货时间
+     * 卸货地点
      */
-    private String unloadDate;
+    private String unloadingAddress;
+
     /**
-     * 亏吨量/吨
+     * 实装量/吨
      */
-    private String defectiveWeigh;
+    private String loadAmount;
+
     /**
-     * 扣亏量/吨
+     * 实卸量/吨
+     */
+    private String unloadAmount;
+
+    /**
+     * 装货时间
      */
-    private String deduct;
+    private String loadTime;
+
     /**
-     * 派车人
+     * 卸货时间
      */
-    private String appointor;
+    private String unloadTime;
+
+    private String createTime;
+    private String updateTime;
 
 }

sckw-modules/sckw-report/src/main/resources/bootstrap-dev.yml

@@ -5,7 +5,8 @@ spring:
         # 服务注册地址
         server-addr: 10.10.10.230:8848
         # 命名空间
-        namespace: sckw-service-platform-dev
+#        namespace: sckw_jc
+        namespace:  sckw-service-platform-dev
         # 共享配置
         group: sckw-service-platform
       config:
@@ -14,7 +15,8 @@ spring:
         # 配置文件格式
         file-extension: yaml
         # 命名空间
-        namespace: sckw-service-platform-dev
+#        namespace: sckw_jc
+        namespace:  sckw-service-platform-dev
         # 共享配置
         group: sckw-service-platform
         #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组

sckw-modules/sckw-transport/pom.xml

@@ -54,6 +54,11 @@
             <artifactId>sckw-system-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.sckw</groupId>
+            <artifactId>sckw-fleet-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.sckw</groupId>
             <artifactId>sckw-product-api</artifactId>

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/WaybillManagementController.java

@@ -0,0 +1,37 @@
+package com.sckw.transport.controller;
+
+import com.sckw.core.web.constant.HttpStatus;
+import com.sckw.core.web.response.HttpResult;
+import com.sckw.transport.service.WaybillManagementService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author lfdc
+ * @description 运单管理controller
+ * @date 2023-07-05 10:07:50
+ */
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(value = "/kwtWaybillManagement")
+public class WaybillManagementController {
+    @Autowired
+    WaybillManagementService waybillManagementService;
+
+    @RequestMapping(value = "/waybillData", method = RequestMethod.GET)
+    public HttpResult waybillData(@Param("id") Long id) {
+        try {
+            return waybillManagementService.waybillData(id);
+        } catch (Exception e) {
+            log.error("托运订单详情:订单id {},error {} ", id, e.getMessage(), e);
+            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
+        }
+    }
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderAddressMapper.java

@@ -0,0 +1,10 @@
+package com.sckw.transport.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.transport.model.KwtWaybillOrderAddress;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface KwtWaybillOrderAddressMapper extends BaseMapper<KwtWaybillOrderAddress> {
+
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.mongo.model.TobleTop;
 import com.sckw.transport.model.KwtWaybillOrder;
 import com.sckw.transport.model.dto.OrderCarDTO;
+import com.sckw.transport.model.dto.WayBillDetailDTO;
 import com.sckw.transport.model.vo.WaybillDetailVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -44,4 +45,12 @@ public interface KwtWaybillOrderMapper extends BaseMapper<KwtWaybillOrder> {
      * @return
      */
     List<Long> selectDriverOrder(@Param("id") Long id, @Param("status") List<Long> status);
+
+    /**
+     * 根基运单ID查询关联数据
+     * @param id
+     * @return
+     */
+    WayBillDetailDTO selectWaybillRelate(@Param("id") Long id);
+
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtWaybillOrderAddress.java

@@ -0,0 +1,123 @@
+package com.sckw.transport.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * @author lfdc
+ * @description 车辆运单
+ * @date 2023-06-26 16:06:12
+ */
+@Data
+@TableName("kwt_waybill_order_address")
+public class KwtWaybillOrderAddress implements Serializable {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 物流订单id
+     */
+    private Long wOrderId;
+
+    /**
+     * 地址类型（1装货地址、2卸货地址）
+     */
+    private Integer addressType;
+
+    /**
+     * 地址名称
+     */
+    private String name;
+
+    /**
+     * 地址类型
+     */
+    private Long type;
+
+    /**
+     * 联系人姓名
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 所在地区
+     */
+    private Integer cityCode;
+
+    /**
+     * 所属区域名称
+     */
+    private String cityName;
+
+    /**
+     * 详细地址
+     */
+    private String detailAddress;
+
+    /**
+     * 纬度
+     */
+    private String lat;
+
+    /**
+     * 经度
+     */
+    private String lng;
+
+    /**
+     * 电子围栏
+     */
+    private String fence;
+
+    /**
+     * 入场(1刷身份证、2上报车号、3上报户头、4其它)
+     */
+    private Integer entryType;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 用户状态（0正常、1已锁）
+     */
+    private Integer status;
+
+    /**
+     * 创建人
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 是否删除（0未删除，1删除）
+     */
+    private Integer delFlag;
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/WayBillDetailDTO.java

@@ -0,0 +1,31 @@
+package com.sckw.transport.model.dto;
+
+import lombok.Data;
+
+/**
+ * @author JC
+ * @version 1.0
+ * @desc TODO
+ * @date 2023/07/20 11:32:36
+ **/
+@Data
+public class WayBillDetailDTO {
+    private Long wOrderId;
+    private String wOrderNo;
+    private String lOrderNo;
+    private String truckNo;
+    private Long lOrderId;
+    private String entrustAmount;
+    private String type;
+    private String startTime;
+    private String endTime;
+    private String createBy;
+    private String priceType;
+    private String goodsName;
+    private String startAddressId;
+    private String endAddressId;
+    private String startLocationName;
+    private String startLocationAddress;
+    private String endLocationName;
+    private String endLocationAddress;
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/WaybillDataVO.java

@@ -0,0 +1,33 @@
+package com.sckw.transport.model.vo;
+
+import com.sckw.transport.model.dto.WayBillDetailDTO;
+import lombok.Data;
+
+/**
+ * @author lfdcsdsd
+ * @description 运单详情vo
+ * @date 2023-07-18 16:07:54
+ */
+@Data
+public class WaybillDataVO {
+    /**
+     * 基础信息
+     */
+    private WayBillDetailDTO transportMessage;
+
+    /**
+     * 车辆人员
+     */
+    private WaybillOrderVO carMessage;
+
+    /**
+     * 履约协议
+     */
+    private WaybillOrderVO agreementMessage;
+
+    /**
+     * 业务日志
+     */
+    private WaybillOrderVO logsMessage;
+}
+

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/WaybillManagementService.java

@@ -0,0 +1,89 @@
+package com.sckw.transport.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sckw.core.common.enums.NumberConstant;
+import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.web.response.HttpResult;
+import com.sckw.fleet.api.RemoteFleetService;
+import com.sckw.fleet.api.model.vo.RTruckVo;
+import com.sckw.system.api.model.dto.res.UserCacheResDto;
+import com.sckw.transport.dao.*;
+import com.sckw.transport.model.KwtWaybillOrderAddress;
+import com.sckw.transport.model.KwtWaybillOrderTicket;
+import com.sckw.transport.model.KwtWaybillOrderTrack;
+import com.sckw.transport.model.dto.WayBillDetailDTO;
+import com.sckw.transport.model.vo.WaybillDataVO;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author jc
+ * @description 运单相关服务
+ * @date 2023-06-29 15:06:45
+ */
+@Slf4j
+@Service
+public class WaybillManagementService {
+
+    @DubboReference(version = "1.0.0", group = "design", check = false)
+    RemoteFleetService remoteFleetService;
+
+    @Autowired
+    public KwtWaybillOrderMapper kwtWaybillOrderMapper;
+
+    @Autowired
+    public KwtWaybillOrderAddressMapper kwtWaybillOrderAddressMapper;
+
+    @Autowired
+    public KwtWaybillOrderTicketMapper kwtWaybillOrderTicketMapper;
+
+    @Autowired
+    public KwtWaybillOrderTrackMapper kwtWaybillOrderTrackMapper;
+
+    /**
+     * 运单详情
+     * @param id
+     * @return
+     */
+    public HttpResult waybillData(@Param("id") Long id) {
+        WayBillDetailDTO kwtWaybillOrder = kwtWaybillOrderMapper.selectWaybillRelate(id);
+        // 收发地址
+        List<KwtWaybillOrderAddress> kwtWaybillOrderAddressList = kwtWaybillOrderAddressMapper.selectList(new LambdaQueryWrapper<KwtWaybillOrderAddress>()
+                .eq(KwtWaybillOrderAddress::getWOrderId, kwtWaybillOrder.getLOrderId()));
+        if(CollectionUtils.isNotEmpty(kwtWaybillOrderAddressList)) {
+            log.error("xx");
+            for (KwtWaybillOrderAddress kwtWaybillOrderAddress:kwtWaybillOrderAddressList) {
+                // 1装货地址、2卸货地址
+                log.error("AddressType: {} ", kwtWaybillOrderAddress.getAddressType());
+                if (kwtWaybillOrderAddress.getAddressType().equals(NumberConstant.ONE)) {
+                    kwtWaybillOrder.setStartLocationName(kwtWaybillOrderAddress.getName());
+                    kwtWaybillOrder.setStartLocationAddress(kwtWaybillOrderAddress.getDetailAddress());
+                }
+                if (kwtWaybillOrderAddress.getAddressType().equals(NumberConstant.TWO)) {
+                    kwtWaybillOrder.setEndLocationName(kwtWaybillOrderAddress.getName());
+                    kwtWaybillOrder.setEndLocationAddress(kwtWaybillOrderAddress.getDetailAddress());
+                }
+            }
+        }
+        WaybillDataVO waybillDataVO = new WaybillDataVO();
+        waybillDataVO.setTransportMessage(kwtWaybillOrder);
+
+        // 车辆信息
+        Map<Long, RTruckVo> truck  = remoteFleetService.findTruck(kwtWaybillOrder.getTruckNo());
+//        waybillDataVO.setCarMessage();
+        // 履约信息
+        List<KwtWaybillOrderTicket> kwtWaybillOrderTicket = kwtWaybillOrderTicketMapper.selectList(new LambdaQueryWrapper<KwtWaybillOrderTicket>()
+                .eq(KwtWaybillOrderTicket::getWOrderId, kwtWaybillOrder.getWOrderId()));
+        // 业务日志
+        List<KwtWaybillOrderTrack> kwtWaybillOrderTrack = kwtWaybillOrderTrackMapper.selectList(new LambdaQueryWrapper<KwtWaybillOrderTrack>()
+                .eq(KwtWaybillOrderTrack::getWOrderId, kwtWaybillOrder.getWOrderId()));
+
+        return HttpResult.ok(waybillDataVO);
+    }
+}

sckw-modules/sckw-transport/src/main/resources/bootstrap-dev.yml

@@ -5,7 +5,7 @@ spring:
         # 服务注册地址
         server-addr: 10.10.10.230:8848
         # 命名空间
-        namespace: sckw_lfdc
+        namespace: sckw-service-platform-dev
         # 共享配置
         group: sckw-service-platform
       config:
@@ -14,7 +14,7 @@ spring:
         # 配置文件格式
         file-extension: yaml
         # 命名空间
-        namespace: sckw_lfdc
+        namespace: sckw-service-platform-dev
         # 共享配置
         group: sckw-service-platform
         #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组

sckw-modules/sckw-transport/src/main/resources/mapper/KwtWaybillOrderAddressMapper.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.transport.dao.KwtWaybillOrderAddressMapper">
+    <resultMap id="BaseResultMap" type="com.sckw.transport.model.KwtWaybillOrder">
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="w_order_id" jdbcType="BIGINT" property="wOrderId"/>
+        <result column="address_type" jdbcType="VARCHAR" property="AddressType"/>
+        <result column="name" jdbcType="VARCHAR" property="name"/>
+        <result column="type" jdbcType="BIGINT" property="type"/>
+        <result column="contacts" jdbcType="VARCHAR" property="contacts"/>
+        <result column="phone" jdbcType="VARCHAR" property="phone"/>
+        <result column="city_code" jdbcType="INTEGER" property="cityCode"/>
+        <result column="city_name" jdbcType="VARCHAR" property="cityName"/>
+        <result column="detail_address" jdbcType="VARCHAR" property="detailAddress"/>
+        <result column="lat" jdbcType="VARCHAR" property="lat"/>
+        <result column="lng" jdbcType="VARCHAR" property="lng"/>
+        <result column="fence" jdbcType="VARCHAR" property="fence"/>
+        <result column="entry_type" jdbcType="INTEGER" property="entryType"/>
+        <result column="remark" jdbcType="VARCHAR" property="remark"/>
+        <result column="status" jdbcType="INTEGER" property="status"/>
+        <result column="create_by" jdbcType="BIGINT" property="createBy"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_by" jdbcType="BIGINT" property="updateBy"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="del_flag" jdbcType="INTEGER" property="delFlag"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        id
+        , w_order_id, address_type, `name`, `type`, `contacts`,`phone`,`city_code`
+        , city_name, detail_address, lat, lng, fence, entry_type, remark, status
+        , create_by, create_time, update_by, update_time, del_flag
+
+    </sql>
+</mapper>

sckw-modules/sckw-transport/src/main/resources/mapper/KwtWaybillOrderMapper.xml

@@ -92,4 +92,26 @@
     <select id="getWaybillData" resultType="com.sckw.transport.model.vo.WaybillDetailVO">
 
     </select>
+
+    <select id="selectWaybillRelate" resultType="com.sckw.transport.model.dto.WayBillDetailDTO">
+        SELECT
+            `order`.`id` AS `lOrderId`,
+            `order`.`w_order_no` AS `wOrderNo`,
+            `order`.`truck_no` AS `truckNo`,
+            `order`.`entrust_amount` AS `entrustAmount`,
+            `order`.`type`,
+            `order`.`start_time` AS `startTime`,
+            `order`.`end_time` AS `endTime`,
+            `order`.`create_by` AS `createBy`,
+            `logistics`.`id` AS `lOrderId`,
+            `logistics`.`l_order_no` AS `lOrderNo`,
+            `logistics`.`price_type` AS `priceType`,
+            `goods`.`goods_name` AS goodsName
+        FROM
+            `kwt_waybill_order` `order`
+                LEFT JOIN `kwt_logistics_order` `logistics` ON `logistics`.`id` = `order`.`l_order_id`
+                LEFT JOIN `kwt_logistics_order_goods` `goods` ON `goods`.`l_order_id` = `order`.`l_order_id`
+        WHERE
+            `order`.`id` = #{id,jdbcType=BIGINT}
+    </select>
 </mapper>