车辆运单增加展示司机电话

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

@@ -63,6 +63,12 @@ public class CarWaybillVO {
      * 司机
      */
     private String driverName;
+
+    /**
+     * 司机电话
+     */
+    private String driverPhone;
+
     /**
      * 承运车队
      */

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

@@ -1036,7 +1036,7 @@ public class AcceptCarriageOrderService {
                 subcontractConsignmentVO.setLoadAddressDetail(subcontractConsignmentVO.getLoadCityName() + subcontractConsignmentVO.getLoadAddress());
                 subcontractConsignmentVO.setUnloadAddressDetail(subcontractConsignmentVO.getUnloadCityName() + subcontractConsignmentVO.getUnloadAddress());
                 subcontractConsignmentVO.setOrderSourceLabel(orderSource == null ? null : orderSource.get(subcontractConsignmentVO.getOrderSource()));
-                subcontractConsignmentVO.setTaxRateLabel(subcontractConsignmentVO.getTaxRate()+"%");
+                subcontractConsignmentVO.setTaxRateLabel(subcontractConsignmentVO.getTaxRate() + "%");
             }
             allList.addAll(voList);
         }
@@ -1832,6 +1832,8 @@ public class AcceptCarriageOrderService {
         KwtLogisticsOrderGoods orderGoods = kwtLogisticsOrderGoodsMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderGoods>()
                 .eq(StringUtils.isNotBlank(logisticsOrder.getId()), KwtLogisticsOrderGoods::getLOrderId, logisticsOrder.getId()));
         OrderDetailVO orderDetailVO = new OrderDetailVO();
+        orderDetailVO.setLoadName(loadOrderAddress.getName());
+        orderDetailVO.setUnloadName(unloadOrderAddress.getName());
         orderDetailVO.setId(String.valueOf(logisticsOrder.getId()));
         if (contract != null) {
             orderDetailVO.setContractId(contract.getContractId() == null ? null : String.valueOf(contract.getContractId()));
@@ -1865,11 +1867,11 @@ public class AcceptCarriageOrderService {
         orderDetailVO.setLoadAddress(loadOrderAddress.getName());
         orderDetailVO.setLoadContacts(loadOrderAddress.getContacts());
         orderDetailVO.setLoadPhone(loadOrderAddress.getPhone());
-        orderDetailVO.setLoadAddressDetail(loadOrderAddress.getDetailAddress());
+        orderDetailVO.setLoadAddressDetail(loadOrderAddress.getCityName() + loadOrderAddress.getDetailAddress());
         orderDetailVO.setUnloadAddress(unloadOrderAddress.getName());
         orderDetailVO.setUnloadContacts(unloadOrderAddress.getContacts());
         orderDetailVO.setUnloadPhone(unloadOrderAddress.getPhone());
-        orderDetailVO.setUnloadAddressDetail(unloadOrderAddress.getDetailAddress());
+        orderDetailVO.setUnloadAddressDetail(unloadOrderAddress.getCityName() + unloadOrderAddress.getDetailAddress());
         orderDetailVO.setSettlementCycle(logisticsOrder.getSettlementCycle() == null ? null : String.valueOf(logisticsOrder.getSettlementCycle()));
         orderDetailVO.setBillingMode(logisticsOrder.getBillingMode());
         orderDetailVO.setScheduleStartTime(logisticsOrder.getStartTime() == null ? null : logisticsOrder.getStartTime());

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

@@ -390,6 +390,7 @@ public class ConsignOrderService {
                     carWaybillVo.setStatusLabel(CarWaybillEnum.getName(kwtWaybillOrder.getStatus()));
                     carWaybillVo.setWaybillType(kwtWaybillOrder.getType());
                     carWaybillVo.setDriverName(kwtWaybillOrder.getDriverName());
+                    carWaybillVo.setDriverPhone(kwtWaybillOrder.getDriverPhone());
                     //todo 取mongo
 //                SckwWaybillOrder sckwWaybillOrder = mongoTemplate.findById(kwtWaybillOrder.getId(), SckwWaybillOrder.class);
                     /** 2023-07-24 原值为承运车队-去除后更换展示为承运公司*/
@@ -665,6 +666,7 @@ public class ConsignOrderService {
                     carWaybillVo.setStatusLabel(CarWaybillEnum.getName(kwtWaybillOrder.getStatus()));
                     carWaybillVo.setWaybillType(kwtWaybillOrder.getType());
                     carWaybillVo.setDriverName(kwtWaybillOrder.getDriverName());
+                    carWaybillVo.setDriverPhone(kwtWaybillOrder.getDriverPhone());
                     //todo 取mongo
 //                SckwWaybillOrder sckwWaybillOrder = mongoTemplate.findById(kwtWaybillOrder.getId(), SckwWaybillOrder.class);
                     /** 2023-07-24 原值为承运车队-去除后更换展示为承运公司*/