1、调整运输服务文件名；

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/AcceptCarriageOrderController.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/KwtAcceptCarriageOrderController.java

@@ -16,8 +16,8 @@ import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.transport.model.dto.*;
 import com.sckw.transport.model.param.*;
 import com.sckw.transport.model.vo.execlVo.AcceptCarriageOrderExcelVo;
-import com.sckw.transport.service.AcceptCarriageOrderService;
-import com.sckw.transport.service.TransportCommonService;
+import com.sckw.transport.service.KwtAcceptCarriageOrderService;
+import com.sckw.transport.service.KwtTransportCommonService;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
@@ -40,13 +40,13 @@ import java.util.List;
 @RestController
 @RequiredArgsConstructor
 @RequestMapping(value = "/kwtAcceptCarriageOrder")
-public class AcceptCarriageOrderController {
+public class KwtAcceptCarriageOrderController {
 
     @Autowired
-    AcceptCarriageOrderService acceptCarriageOrderService;
+    KwtAcceptCarriageOrderService acceptCarriageOrderService;
 
     @Autowired
-    TransportCommonService transportCommonService;
+    KwtTransportCommonService transportCommonService;
 
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/ConsignOrderController.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/KwtConsignOrderController.java

@@ -22,7 +22,7 @@ import com.sckw.transport.model.param.ConsignOrderQuery;
 import com.sckw.transport.model.param.DriverParam;
 import com.sckw.transport.model.param.LogisticsOrderStatisticsParam;
 import com.sckw.transport.model.vo.execlVo.ConsignOrderExcelVo;
-import com.sckw.transport.service.ConsignOrderService;
+import com.sckw.transport.service.KwtConsignOrderService;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
@@ -44,10 +44,10 @@ import java.util.List;
 @RestController
 @RequiredArgsConstructor
 @RequestMapping(value = "/kwtConsignOrder")
-public class ConsignOrderController {
+public class KwtConsignOrderController {
 
     @Autowired
-    ConsignOrderService consignOrderService;
+    KwtConsignOrderService consignOrderService;
 
     /**
      * 托运订单首页条件查询

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/LogisticsConsignmentController.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/KwtLogisticsConsignmentController.java

@@ -18,7 +18,7 @@ import com.sckw.transport.model.param.LogisticsConsignmentParam;
 import com.sckw.transport.model.param.OrderQuery;
 import com.sckw.transport.model.vo.PurchaseLogisticOrderExcelVo;
 import com.sckw.transport.model.vo.SellLogisticOrderExcelVo;
-import com.sckw.transport.service.LogisticsConsignmentService;
+import com.sckw.transport.service.KwtLogisticsConsignmentService;
 import io.seata.spring.annotation.GlobalTransactional;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
@@ -42,10 +42,10 @@ import java.util.List;
 @RestController
 @RequiredArgsConstructor
 @RequestMapping(value = "/kwtLogisticsConsignment")
-public class LogisticsConsignmentController {
+public class KwtLogisticsConsignmentController {
 
     @Autowired
-    LogisticsConsignmentService logisticsConsignmentService;
+    KwtLogisticsConsignmentService logisticsConsignmentService;
 
     /**
      * 采购订单-物流托运生成托运订单
@@ -324,8 +324,6 @@ public class LogisticsConsignmentController {
         }
     }
 
-
-
     /**
      * @desc: 采购订单-托运运单列表导出
      * @author: jc

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

@@ -4,7 +4,7 @@ import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.transport.model.dto.AddressDropListDTO;
 import com.sckw.transport.model.dto.WaybillOrderDTO;
-import com.sckw.transport.service.WaybillManagementService;
+import com.sckw.transport.service.KwtWaybillManagementService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -24,9 +24,9 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequiredArgsConstructor
 @RequestMapping(value = "/kwtWaybillManagement")
-public class WaybillManagementController {
+public class KwtWaybillManagementController {
     @Autowired
-    WaybillManagementService waybillManagementService;
+    KwtWaybillManagementService waybillManagementService;
 
     @Valid
     @RequestMapping(name = "运单详情", value = "/waybillData", method = RequestMethod.GET)

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

@@ -13,15 +13,12 @@ import com.sckw.core.web.model.ValiList;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.transport.model.dto.*;
 import com.sckw.transport.model.vo.WaybillOrderDriverVo;
-import com.sckw.transport.service.DriverService;
 import com.sckw.transport.service.KwtWaybillOrderService;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
 import java.util.Map;
 
@@ -38,9 +35,6 @@ public class KwtWaybillOrderController {
     @Autowired
     KwtWaybillOrderService waybillOrderService;
 
-    @Autowired
-    private DriverService driverService;
-
     /**
      * @desc 统计司机任务数(待接单/出车/执行/完结)
      * @author zk
@@ -124,36 +118,6 @@ public class KwtWaybillOrderController {
         return waybillOrderService.changeWaybillOrder(wOrderId);
     }
 
-    /**
-     * 承运订单-更换司机
-     * @param dto
-     * @return
-     */
-    @RequestMapping(value = "/updateDriver", method = RequestMethod.POST)
-    public HttpResult updateDriver(@Validated @RequestBody UpdateDriverCarDTO dto) {
-        try {
-            return driverService.updateDriver(dto);
-        } catch (Exception e) {
-            log.error("承运订单更换司机 error:{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
-
-    /**
-     * 承运订单-更换车辆
-     * @param dto
-     * @return
-     */
-    @RequestMapping(value = "/updateCarCommit", method = RequestMethod.POST)
-    public HttpResult updateCarCommit(@Validated @RequestBody UpdateDriverCarDTO dto) {
-        try {
-            return driverService.updateCarCommit(dto);
-        } catch (Exception e) {
-            log.error("承运订单更换司机 error:{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
-
     /**
      * 派车-查询已派车量、待运量数据
      * @param orderId

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/enterpriseApp/AppAcceptCarriageController.java

@@ -3,7 +3,7 @@ package com.sckw.transport.controller.enterpriseApp;
 import com.alibaba.fastjson.JSONObject;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.transport.model.param.AcceptCarriageOrderQuery;
-import com.sckw.transport.service.AcceptCarriageOrderService;
+import com.sckw.transport.service.KwtAcceptCarriageOrderService;
 import com.sckw.transport.service.KwtWaybillOrderService;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
 public class AppAcceptCarriageController {
 
     @Autowired
-    private AcceptCarriageOrderService carriageOrderService;
+    private KwtAcceptCarriageOrderService carriageOrderService;
 
     @Autowired
     private KwtWaybillOrderService waybillOrderService;

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/enterpriseApp/AppConsignController.java

@@ -5,7 +5,7 @@ import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.transport.model.param.AcceptCarriageOrderQuery;
 import com.sckw.transport.model.param.DriverParam;
-import com.sckw.transport.service.ConsignOrderService;
+import com.sckw.transport.service.KwtConsignOrderService;
 import com.sckw.transport.service.KwtWaybillOrderService;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.*;
 public class AppConsignController {
 
     @Autowired
-    private ConsignOrderService consignOrderService;
+    private KwtConsignOrderService consignOrderService;
 
     @Autowired
     private KwtWaybillOrderService waybillOrderService;

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/enterpriseApp/AppWayBillController.java

@@ -3,7 +3,7 @@ package com.sckw.transport.controller.enterpriseApp;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.transport.model.dto.WaybillListAppDTO;
-import com.sckw.transport.service.WaybillManagementService;
+import com.sckw.transport.service.KwtWaybillManagementService;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
 public class AppWayBillController {
 
     @Autowired
-    WaybillManagementService waybillManagementService;
+    KwtWaybillManagementService waybillManagementService;
 
     /**
      * APP 运单统计分类 - [运输中|已完成] - 数据库

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/operationManagement/ManagementLogisticsOrderController.java

@@ -12,7 +12,7 @@ import com.sckw.transport.model.param.ManagementContractParam;
 import com.sckw.transport.model.param.ManagementLogisticsOrderQuery;
 import com.sckw.transport.model.param.OrderQuery;
 import com.sckw.transport.model.vo.execlVo.ManagementLogisticsOrderExcelVo;
-import com.sckw.transport.service.ManagementLogisticsOrderService;
+import com.sckw.transport.service.KwtManagementLogisticsOrderService;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
@@ -38,7 +38,7 @@ import java.util.List;
 public class ManagementLogisticsOrderController {
 
     @Autowired
-    ManagementLogisticsOrderService managementLogisticsOrderService;
+    KwtManagementLogisticsOrderService managementLogisticsOrderService;
 
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/operationManagement/ManagementWaybillOrderController.java

@@ -8,7 +8,7 @@ import com.sckw.excel.config.easyexcel.RequestHolder;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.transport.model.param.ManagementWaybillOrderQuery;
 import com.sckw.transport.model.vo.execlVo.ManagementWaybillOrderExcelVO;
-import com.sckw.transport.service.ManagementWaybillOrderService;
+import com.sckw.transport.service.KwtManagementWaybillOrderService;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -33,7 +33,7 @@ import java.util.List;
 public class ManagementWaybillOrderController {
 
     @Autowired
-    ManagementWaybillOrderService managementWaybillOrderService;
+    KwtManagementWaybillOrderService managementWaybillOrderService;
 
 
     /**

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

@@ -1,15 +0,0 @@
-package com.sckw.transport.service;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-/**
- * @author lfdc
- * @description 托运物流service
- * @date 2023-06-26 16:06:12
- */
-@Slf4j
-@Service
-public class ConsignLogisticsService {
-
-}

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

@@ -1,415 +0,0 @@
-package com.sckw.transport.service;
-
-import com.alibaba.fastjson2.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.sckw.core.model.constant.NumberConstant;
-import com.sckw.core.model.enums.CarWaybillEnum;
-import com.sckw.core.utils.BeanUtils;
-import com.sckw.core.utils.CollectionUtils;
-import com.sckw.core.web.constant.HttpStatus;
-import com.sckw.core.web.context.LoginUserHolder;
-import com.sckw.core.web.response.HttpResult;
-import com.sckw.excel.utils.ValidUtil;
-import com.sckw.fleet.api.RemoteFleetService;
-import com.sckw.mongo.enums.BusinessTypeEnum;
-import com.sckw.mongo.model.SckwWaybillOrder;
-import com.sckw.mongo.model.TableTops;
-import com.sckw.stream.model.SckwBusSum;
-import com.sckw.system.api.RemoteSystemService;
-import com.sckw.transport.dao.*;
-import com.sckw.transport.model.KwtLogisticsOrderAddress;
-import com.sckw.transport.model.KwtLogisticsOrderCirculate;
-import com.sckw.transport.model.KwtLogisticsOrderGoods;
-import com.sckw.transport.model.KwtWaybillOrder;
-import com.sckw.transport.model.dto.UpdateDriverCarDTO;
-import com.sckw.transport.model.vo.WaybillOrderVO;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.annotation.DubboReference;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.stream.function.StreamBridge;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @author lfdc
- * @description 司机端service
- * @date 2023-07-14 13:07:57
- */
-@Slf4j
-@Service
-public class DriverService {
-
-    @DubboReference(version = "1.0.0", group = "design", check = false)
-    RemoteSystemService remoteSystemService;
-
-    @DubboReference(version = "1.0.0", group = "design", check = false)
-    RemoteFleetService remoteFleetService;
-
-    @Autowired
-    MongoTemplate mongoTemplate;
-
-    @Autowired
-    StreamBridge streamBridge;
-
-    @Autowired
-    private KwtWaybillOrderMapper waybillOrderMapper;
-
-    @Autowired
-    private KwtWaybillOrderTrackMapper waybillOrderTrackMapper;
-
-    @Autowired
-    private KwtWaybillOrderTicketMapper waybillOrderTicketMapper;
-
-    @Autowired
-    private KwtLogisticsOrderMapper logisticsOrderMapper;
-
-    @Autowired
-    private KwtLogisticsOrderUnitMapper logisticsOrderUnitMapper;
-
-    @Autowired
-    private KwtLogisticsOrderAddressMapper logisticsOrderAddressMapper;
-
-    @Autowired
-    private KwtLogisticsOrderGoodsMapper logisticsOrderGoodsMapper;
-
-    @Autowired
-    private KwtLogisticsOrderCirculateMapper logisticsOrderCirculateMapper;
-
-
-    /**
-     * @param id
-     * @return
-     */
-    public HttpResult statistics(Long id) {
-        /**
-         * 当前司机端页面 页面【计划】=1；【出车】=2；【执行】=3；【完结】=4
-         * 计划:对应运单状态的[待接单]
-         * 出车:对应运单状态的[待出车]
-         * 执行:对应[已出车][到达装货地点]、[已装货]、[到达卸货地点]
-         * 完结: 对应[已卸货]、[已核单]
-         * */
-        List<Long> status = new ArrayList<>();
-        List<TableTops> list = new ArrayList<>();
-        status.add(CarWaybillEnum.PENDING_ORDER.getCode().longValue());
-        TableTops top = waybillOrderMapper.statistics(id, status);
-        top.setName("计划");
-        top.setValue(String.valueOf(NumberConstant.ONE));
-        status.clear();
-        status.add(CarWaybillEnum.PENDING_VEHICLE.getCode().longValue());
-        TableTops top1 = waybillOrderMapper.statistics(id, status);
-        top1.setName("出车");
-        top1.setValue(String.valueOf(NumberConstant.TWO));
-        status.clear();
-        status.add(CarWaybillEnum.EXIT_COMPLETED.getCode().longValue());
-        status.add(CarWaybillEnum.WAIT_LOADING.getCode().longValue());
-        status.add(CarWaybillEnum.COMPLETION_LOADING.getCode().longValue());
-        status.add(CarWaybillEnum.WAIT_UNLOADING.getCode().longValue());
-        TableTops top2 = waybillOrderMapper.statistics(id, status);
-        top2.setName("执行");
-        top2.setValue(String.valueOf(NumberConstant.THREE));
-        status.clear();
-        status.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode().longValue());
-        status.add(CarWaybillEnum.APPROVAL_PASS.getCode().longValue());
-        TableTops top3 = waybillOrderMapper.statistics(id, status);
-        top3.setName("完结");
-        top3.setValue(String.valueOf(NumberConstant.FOUR));
-        list.add(top);
-        list.add(top1);
-        list.add(top2);
-        list.add(top3);
-        return HttpResult.ok(list);
-    }
-
-    /**
-     * 根据当前登录 id获取派给当前id的车辆运单
-     *
-     * @param id   司机id
-     * @param type 展示页签类型
-     * @return
-     */
-    public HttpResult getWaybillDriverDetail(Long id, String type) {
-        /**
-         * 当前司机端页面 页面【计划】=1；【出车】=2；【执行】=3；【完结】=4
-         * 计划:对应运单状态的[待接单]
-         * 出车:对应运单状态的[待出车]
-         * 执行:对应[已出车][到达装货地点]、[已装货]、[到达卸货地点]
-         * 完结: 对应[已卸货]、[已核单]
-         * */
-        HttpResult result = new HttpResult();
-        List<Long> tripStatus = new ArrayList<>();
-        List<Long> loopStatus = new ArrayList<>();
-        if (String.valueOf(NumberConstant.ONE).equals(type)) {
-            tripStatus.add(CarWaybillEnum.PENDING_ORDER.getCode().longValue());
-        } else if (String.valueOf(NumberConstant.TWO).equals(type)) {
-            tripStatus.add(CarWaybillEnum.PENDING_VEHICLE.getCode().longValue());
-            loopStatus.add(CarWaybillEnum.PENDING_VEHICLE.getCode().longValue());
-        } else if (String.valueOf(NumberConstant.THREE).equals(type)) {
-            tripStatus.add(CarWaybillEnum.EXIT_COMPLETED.getCode().longValue());
-            tripStatus.add(CarWaybillEnum.WAIT_LOADING.getCode().longValue());
-            tripStatus.add(CarWaybillEnum.COMPLETION_LOADING.getCode().longValue());
-            tripStatus.add(CarWaybillEnum.WAIT_UNLOADING.getCode().longValue());
-
-            loopStatus.add(CarWaybillEnum.EXIT_COMPLETED.getCode().longValue());
-            loopStatus.add(CarWaybillEnum.WAIT_LOADING.getCode().longValue());
-            loopStatus.add(CarWaybillEnum.COMPLETION_LOADING.getCode().longValue());
-            loopStatus.add(CarWaybillEnum.WAIT_UNLOADING.getCode().longValue());
-        } else if (String.valueOf(NumberConstant.FOUR).equals(type)) {
-            tripStatus.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode().longValue());
-            tripStatus.add(CarWaybillEnum.APPROVAL_PASS.getCode().longValue());
-
-            loopStatus.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode().longValue());
-            loopStatus.add(CarWaybillEnum.APPROVAL_PASS.getCode().longValue());
-        } else {
-            result.setMsg("类型错误");
-            result.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
-            return result;
-        }
-        List<WaybillOrderVO> orderVOList = new ArrayList<>();
-        /**趟次*/
-        tripPackageData(id, tripStatus, orderVOList);
-        /**循环*/
-        loopPackageData(id, loopStatus, orderVOList);
-        orderVOList = orderVOList.stream().sorted(Comparator.comparing(WaybillOrderVO::getCreateTime)).collect(Collectors.toList());
-        return HttpResult.ok(orderVOList);
-    }
-
-    /**
-     * 组装循环单据信息
-     * @param id
-     * @param loopStatus
-     * @param orderVOList
-     */
-    private void loopPackageData(Long id, List<Long> loopStatus, List<WaybillOrderVO> orderVOList) {
-        if (CollectionUtils.isEmpty(loopStatus)) {
-            List<KwtLogisticsOrderCirculate> list = logisticsOrderCirculateMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderCirculate>()
-                    .eq(KwtLogisticsOrderCirculate::getDriverId, id)
-                    .isNull(KwtLogisticsOrderCirculate::getWOrderId)
-                    .eq(KwtLogisticsOrderCirculate::getStatus, NumberConstant.ZERO));
-            if (CollectionUtils.isNotEmpty(list)) {
-                for (KwtLogisticsOrderCirculate circulate : list) {
-                    KwtLogisticsOrderAddress loadAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-                            .eq(KwtLogisticsOrderAddress::getLOrderId, circulate.getLOrderId()).eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE));
-                    KwtLogisticsOrderAddress unloadAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-                            .eq(KwtLogisticsOrderAddress::getLOrderId, circulate.getLOrderId()).eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO));
-                    KwtLogisticsOrderGoods orderGoods = logisticsOrderGoodsMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderGoods>()
-                            .eq(KwtLogisticsOrderGoods::getLOrderId, circulate.getLOrderId()));
-                    List<KwtWaybillOrder> waybillOrders = waybillOrderMapper.selectList(new LambdaQueryWrapper<KwtWaybillOrder>()
-                            .eq(KwtWaybillOrder::getLOrderId, circulate.getLOrderId()).eq(KwtWaybillOrder::getDriverId, id));
-                    for (KwtWaybillOrder waybill : waybillOrders) {
-                        WaybillOrderVO vo = new WaybillOrderVO();
-                        vo.setLOrderId(circulate.getLOrderId());
-                        vo.setLoadCityCode(loadAddress.getCityCode());
-                        vo.setLoadCityName(loadAddress.getCityName());
-                        vo.setLoadDetailAddress(loadAddress.getDetailAddress());
-                        vo.setUnloadCityName(unloadAddress.getCityName());
-                        vo.setUnloadCityCode(unloadAddress.getCityCode());
-                        vo.setEntId(String.valueOf(waybill.getEntId()));
-                        vo.setFirmName(remoteSystemService.queryEntCacheById(waybill.getEntId()).getFirmName());
-                        vo.setGoodsName(orderGoods == null ? null : (orderGoods.getGoodsName() == null ? null : orderGoods.getGoodsName()));
-                        vo.setGoodsCode(orderGoods == null ? null : (orderGoods.getSkuId() == null ? null : String.valueOf(orderGoods.getSkuId())));
-                        vo.setWOrderId(waybill.getId());
-                        vo.setWOrderNo(waybill.getWOrderNo());
-                        vo.setCreateTime(waybill.getCreateTime());
-                        vo.setStartTime(waybill.getStartTime());
-                        vo.setEndTime(waybill.getEndTime());
-                        /**查询车队服务dubbo 2023-07-24 司机端不展示 车队信息改为展示物流公司*/
-//                        remoteFleetService.findTruck()
-//                        vo.setFleetName();
-//                        vo.setFleetId();
-//                        vo.setTruckFleetName();
-                        vo.setEntrustAmount(waybill.getEntrustAmount());
-                        vo.setType(waybill.getType());
-                        vo.setTruckNo(waybill.getTruckNo());
-                        orderVOList.add(vo);
-                    }
-                }
-            }
-        } else {
-            List<Long> list = logisticsOrderCirculateMapper.selectDriverOrderByStatus(id, loopStatus);
-            if (CollectionUtils.isNotEmpty(list)) {
-                for (Long aLong : list) {
-                    KwtLogisticsOrderAddress loadAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-                            .eq(KwtLogisticsOrderAddress::getLOrderId, aLong).eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE));
-                    KwtLogisticsOrderAddress unloadAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-                            .eq(KwtLogisticsOrderAddress::getLOrderId, aLong).eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO));
-                    KwtLogisticsOrderGoods orderGoods = logisticsOrderGoodsMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderGoods>()
-                            .eq(KwtLogisticsOrderGoods::getLOrderId, aLong));
-                    List<KwtWaybillOrder> waybillOrders = waybillOrderMapper.selectList(new LambdaQueryWrapper<KwtWaybillOrder>()
-                            .eq(KwtWaybillOrder::getLOrderId, aLong).eq(KwtWaybillOrder::getDriverId, id));
-                    for (KwtWaybillOrder waybill : waybillOrders) {
-                        WaybillOrderVO vo = new WaybillOrderVO();
-                        vo.setLOrderId(aLong);
-                        vo.setLoadCityCode(loadAddress.getCityCode());
-                        vo.setLoadCityName(loadAddress.getCityName());
-                        vo.setLoadDetailAddress(loadAddress.getDetailAddress());
-                        vo.setUnloadCityName(unloadAddress.getCityName());
-                        vo.setUnloadCityCode(unloadAddress.getCityCode());
-                        vo.setEntId(String.valueOf(waybill.getEntId()));
-                        vo.setFirmName(remoteSystemService.queryEntCacheById(waybill.getEntId()).getFirmName());
-                        vo.setGoodsName(orderGoods == null ? null : (orderGoods.getGoodsName() == null ? null : orderGoods.getGoodsName()));
-                        vo.setGoodsCode(orderGoods == null ? null : (orderGoods.getSkuId() == null ? null : String.valueOf(orderGoods.getSkuId())));
-                        vo.setWOrderId(waybill.getId());
-                        vo.setWOrderNo(waybill.getWOrderNo());
-                        vo.setCreateTime(waybill.getCreateTime());
-                        vo.setStartTime(waybill.getStartTime());
-                        vo.setEndTime(waybill.getEndTime());
-                        /**查询车队服务dubbo 2023-07-24 司机端不展示 车队信息改为展示物流公司*/
-//                    vo.setFleetName();
-//                    vo.setFleetId();
-//                    vo.setTruckFleetName();
-                        vo.setEntrustAmount(waybill.getEntrustAmount());
-                        vo.setType(waybill.getType());
-                        vo.setTruckNo(waybill.getTruckNo());
-                        orderVOList.add(vo);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * 趟次展示数据组装
-     * @param id
-     * @param tripStatus
-     * @param orderVOList
-     */
-    private void tripPackageData(Long id, List<Long> tripStatus, List<WaybillOrderVO> orderVOList) {
-        List<Long> list = waybillOrderMapper.selectDriverOrder(id, tripStatus);
-        if (CollectionUtils.isNotEmpty(list)) {
-            for (Long aLong : list) {
-                KwtLogisticsOrderAddress loadAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-                        .eq(KwtLogisticsOrderAddress::getLOrderId, aLong).eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE));
-                KwtLogisticsOrderAddress unloadAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-                        .eq(KwtLogisticsOrderAddress::getLOrderId, aLong).eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO));
-                KwtLogisticsOrderGoods orderGoods = logisticsOrderGoodsMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderGoods>()
-                        .eq(KwtLogisticsOrderGoods::getLOrderId, aLong));
-                List<KwtWaybillOrder> waybillOrders = waybillOrderMapper.selectList(new LambdaQueryWrapper<KwtWaybillOrder>()
-                        .eq(KwtWaybillOrder::getLOrderId, aLong).eq(KwtWaybillOrder::getDriverId, id));
-                for (KwtWaybillOrder waybill : waybillOrders) {
-                    WaybillOrderVO vo = new WaybillOrderVO();
-                    vo.setLOrderId(aLong);
-                    vo.setLoadCityCode(loadAddress.getCityCode());
-                    vo.setLoadCityName(loadAddress.getCityName());
-                    vo.setLoadDetailAddress(loadAddress.getDetailAddress());
-                    vo.setUnloadCityName(unloadAddress.getCityName());
-                    vo.setUnloadCityCode(unloadAddress.getCityCode());
-                    vo.setEntId(String.valueOf(waybill.getEntId()));
-                    vo.setFirmName(remoteSystemService.queryEntCacheById(waybill.getEntId()).getFirmName());
-                    vo.setGoodsName(orderGoods == null ? null : (orderGoods.getGoodsName() == null ? null : orderGoods.getGoodsName()));
-                    vo.setGoodsCode(orderGoods == null ? null : (orderGoods.getSkuId() == null ? null : String.valueOf(orderGoods.getSkuId())));
-                    vo.setWOrderId(waybill.getId());
-                    vo.setWOrderNo(waybill.getWOrderNo());
-                    vo.setCreateTime(waybill.getCreateTime());
-                    vo.setStartTime(waybill.getStartTime());
-                    vo.setEndTime(waybill.getEndTime());
-                    //todo 查询车队服务dubbo
-//                    vo.setFleetName();
-//                    vo.setFleetId();
-//                    vo.setTruckFleetName();
-                    vo.setEntrustAmount(waybill.getEntrustAmount());
-                    vo.setType(waybill.getType());
-                    vo.setTruckNo(waybill.getTruckNo());
-                    orderVOList.add(vo);
-                }
-            }
-        }
-    }
-
-    /**
-     * 更换司机
-     *
-     * @param dto
-     * @return
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public HttpResult updateDriver(UpdateDriverCarDTO dto) {
-        HttpResult httpResult = new HttpResult();
-        httpResult.setCode(HttpStatus.SUCCESS_CODE);
-        HttpResult result = ValidUtil.serviceValid(dto);
-        if (HttpStatus.SUCCESS_CODE != result.getCode()) {
-            httpResult.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
-            httpResult.setMsg(result.getMsg());
-            return httpResult;
-        }
-        /**【不分循环趟次】更换司机：【待接单】、【待出车】、【已出车】、【到达装货地点】、【已装货】、【到达卸货地点】可修改*/
-        //更换司机（趟次派车(-卸货前)/循环派车(接单后-卸货前)）
-        KwtWaybillOrder waybillOrder = waybillOrderMapper.selectOne(new LambdaQueryWrapper<KwtWaybillOrder>()
-                .eq(KwtWaybillOrder::getStatus, dto.getWOrderId()));
-        if (ObjectUtils.isEmpty(waybillOrder)) {
-            throw new RuntimeException("运单不存在:" + dto.getWOrderNo());
-        }
-        if (waybillOrder.getStatus() > CarWaybillEnum.COMPLETION_UNLOADING.getCode()
-                || waybillOrder.getStatus() <= CarWaybillEnum.PENDING_ORDER.getCode()) {
-            throw new RuntimeException("该【" + dto.getWOrderNo() + "】运单不满足更换司机条件");
-        }
-        waybillOrderMapper.update(null, new LambdaUpdateWrapper<KwtWaybillOrder>()
-                .eq(KwtWaybillOrder::getId, dto.getWOrderId())
-                .set(KwtWaybillOrder::getDriverId, dto.getDriverId())
-                .set(KwtWaybillOrder::getUpdateBy, LoginUserHolder.getUserId())
-                .set(KwtWaybillOrder::getUpdateTime, new Date()));
-        SckwWaybillOrder sckwWaybillOrder = mongoTemplate.findById(dto.getWOrderId(), SckwWaybillOrder.class);
-        //更新mongodb
-        SckwWaybillOrder updateParam = BeanUtils.copyProperties(sckwWaybillOrder, SckwWaybillOrder.class);
-        updateParam.setDriverId(Long.valueOf(dto.getDriverId())).setDriverPhone(dto.getDriverPhone()).setDriverName(dto.getDriverName())
-                .setDriverIdcard(dto.getDriverIdCard()).setTruckId(Long.parseLong(dto.getTruckId())).setTruckNo(dto.getTruckNo()).setUpdateTime(new Date()).setUpdateBy(LoginUserHolder.getUserId())
-                .setUpdateByName(LoginUserHolder.getUserName()).setUpdateTime(new Date());
-        SckwBusSum busSum = new SckwBusSum();
-        busSum.setBusSumType(BusinessTypeEnum.WAYBILL_ORDER_TYPE.getName());
-        busSum.setMethod(NumberConstant.TWO);
-        busSum.setObject(updateParam);
-        streamBridge.send("sckw-busSum", JSON.toJSONString(busSum));
-        return httpResult;
-    }
-
-    /**
-     * 承运订单-更换车辆
-     *
-     * @param dto
-     * @return
-     */
-    public HttpResult updateCarCommit(UpdateDriverCarDTO dto) {
-        HttpResult httpResult = new HttpResult();
-        httpResult.setCode(HttpStatus.SUCCESS_CODE);
-        HttpResult result = ValidUtil.serviceValid(dto);
-        if (HttpStatus.SUCCESS_CODE != result.getCode()) {
-            httpResult.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
-            httpResult.setMsg(result.getMsg());
-            return httpResult;
-        }
-        /**【不分循环趟次】更换车辆：【待接单】、【待出车】可修改*/
-        KwtWaybillOrder waybillOrder = waybillOrderMapper.selectOne(new LambdaQueryWrapper<KwtWaybillOrder>()
-                .eq(KwtWaybillOrder::getStatus, dto.getWOrderId()));
-        if (ObjectUtils.isEmpty(waybillOrder)) {
-            throw new RuntimeException("运单不存在:" + dto.getWOrderNo());
-        }
-        if (waybillOrder.getStatus() > CarWaybillEnum.PENDING_VEHICLE.getCode()) {
-            throw new RuntimeException("该【" + dto.getWOrderNo() + "】运单不满足更换车辆条件");
-        }
-        waybillOrderMapper.update(null, new LambdaUpdateWrapper<KwtWaybillOrder>()
-                .eq(KwtWaybillOrder::getId, dto.getWOrderId())
-                .set(KwtWaybillOrder::getTruckNo, dto.getTruckNo())
-                .set(KwtWaybillOrder::getUpdateBy, LoginUserHolder.getUserId())
-                .set(KwtWaybillOrder::getUpdateTime, new Date()));
-        SckwWaybillOrder sckwWaybillOrder = mongoTemplate.findById(dto.getWOrderId(), SckwWaybillOrder.class);
-        //更新mongodb
-        SckwWaybillOrder updateParam = BeanUtils.copyProperties(sckwWaybillOrder, SckwWaybillOrder.class);
-        updateParam.setTruckId(Long.parseLong(dto.getTruckId())).setTruckNo(dto.getTruckNo())
-                .setTruckType(dto.getCarType()).setUpdateTime(new Date()).setUpdateBy(LoginUserHolder.getUserId())
-                .setUpdateByName(LoginUserHolder.getUserName()).setUpdateTime(new Date());
-        SckwBusSum busSum = new SckwBusSum();
-        busSum.setBusSumType(BusinessTypeEnum.WAYBILL_ORDER_TYPE.getName());
-        busSum.setMethod(NumberConstant.TWO);
-        busSum.setObject(updateParam);
-        streamBridge.send("sckw-busSum", JSON.toJSONString(busSum));
-        return httpResult;
-    }
-}

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

@@ -90,7 +90,7 @@ import static com.sckw.excel.utils.DateUtil.DEF_DATE_FORMAT;
 @Slf4j
 @Service
 @RequiredArgsConstructor
-public class AcceptCarriageOrderService {
+public class KwtAcceptCarriageOrderService {
 
     @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 8000)
     RemoteSystemService remoteSystemService;
@@ -113,7 +113,7 @@ public class AcceptCarriageOrderService {
     PaymentDubboService paymentDubboService;
 
     @Autowired
-    TransportCommonService transportCommonService;
+    KwtTransportCommonService transportCommonService;
 
     @Autowired
     private MessageUrlConfig messageUrlConfig;
@@ -124,6 +124,9 @@ public class AcceptCarriageOrderService {
     @Autowired
     public KwtWaybillOrderService waybillOrderService;
 
+    @Autowired
+    public KwtLogisticsOrderGoodsService logisticsOrderGoodsService;
+
     @Resource
     private StreamBridge streamBridge;
 
@@ -273,7 +276,7 @@ public class AcceptCarriageOrderService {
                     throw new RuntimeException("生成物流托运合同异常");
                 }
                 //主体信息保存
-                insertSubcontractLogisticsGoods(bo, lOrderNo, orderId);
+                logisticsOrderGoodsService.insertSubcontractLogisticsGoods(bo, lOrderNo, orderId);
                 insertSubcontractLogisticsOrder(bo, lOrderNo, order, orderId, pids, orderStatus, logisticsOrder);
                 insertSubcontractLogisticsOrderContract(bo, orderId, infoResDto);
                 insertSubcontractLogisticsOrderUnit(bo, orderId);
@@ -671,28 +674,6 @@ public class AcceptCarriageOrderService {
         logisticsOrderMapper.insert(order);
     }
 
-    /**
-     * 分包托运-承运订单-商品信息
-     *
-     * @param bo
-     * @param lOrderNo
-     * @param orderId
-     */
-    private void insertSubcontractLogisticsGoods(SubcontractConsignmentDTO bo, String lOrderNo, Long orderId) {
-        KwtLogisticsOrderGoods kwtLogisticsOrderGoods = new KwtLogisticsOrderGoods();
-        kwtLogisticsOrderGoods.setId(new IdWorker(NumberConstant.ONE).nextId());
-        kwtLogisticsOrderGoods.setGoodsId(bo.getGoodsId() == null ? null : Long.parseLong(bo.getGoodsId()));
-        kwtLogisticsOrderGoods.setGoodsName(bo.getGoodsName());
-        kwtLogisticsOrderGoods.setLOrderId(orderId);
-        kwtLogisticsOrderGoods.setLOrderNo(lOrderNo);
-        kwtLogisticsOrderGoods.setUpdateBy(LoginUserHolder.getUserId());
-        kwtLogisticsOrderGoods.setUpdateTime(new Date());
-        kwtLogisticsOrderGoods.setCreateBy(LoginUserHolder.getUserId());
-        kwtLogisticsOrderGoods.setCreateTime(new Date());
-        kwtLogisticsOrderGoodsMapper.insert(kwtLogisticsOrderGoods);
-    }
-
-
     /**
      * 是否接单
      *
@@ -2028,7 +2009,7 @@ public class AcceptCarriageOrderService {
 //        }
         saveLogisticsOrder(orderDTO, lOrderId, orderStatus, lOrderNo);
         saveLogisticsOrderAddress(orderDTO, lOrderId);
-        saveLogisticsOrderGoods(orderDTO, lOrderId, lOrderNo);
+        logisticsOrderGoodsService.saveLogisticsOrderGoods(orderDTO, lOrderId, lOrderNo);
         saveLogisticsOrderContract(orderDTO, lOrderId, infoResDto);
         saveLogisticsOrderTrack(lOrderId, orderStatus);
         saveLogisticsOrderUnit(orderDTO, lOrderId);
@@ -2066,29 +2047,6 @@ public class AcceptCarriageOrderService {
         return HttpResult.ok();
     }
 
-    /**
-     * 承运订单-页面新增订单-商品信息
-     *
-     * @param orderDTO 页面参数
-     * @param lOrderId 订单id
-     * @param lOrderNo 订单编号
-     */
-    private void saveLogisticsOrderGoods(AddOrderDTO orderDTO, Long lOrderId, String lOrderNo) {
-        KwtLogisticsOrderGoods goods = new KwtLogisticsOrderGoods();
-        goods.setId(new IdWorker(NumberConstant.ONE).nextId());
-        goods.setLOrderId(lOrderId);
-        goods.setLOrderNo(lOrderNo);
-//        goods.setGoodsId();
-        goods.setGoodsName(orderDTO.getGoodsName());
-        goods.setGoodsType(orderDTO.getGoodsType());
-        goods.setStatus(NumberConstant.ZERO);
-        goods.setCreateBy(LoginUserHolder.getUserId());
-        goods.setCreateTime(new Date());
-        goods.setUpdateBy(LoginUserHolder.getUserId());
-        goods.setUpdateTime(new Date());
-        kwtLogisticsOrderGoodsMapper.insert(goods);
-    }
-
     /**
      * 校验请求参数
      *
@@ -2627,12 +2585,6 @@ public class AcceptCarriageOrderService {
      * @author zk
      * @date 2023/7/24
      **/
-    public int logisticsLevel(KwtLogisticsOrder logisticsOrder) {
-        String pids = logisticsOrder.getPids();
-        String[] idArrays = StringUtils.isBlank(pids) ? new String[0] : pids.split(Global.COMMA);
-        return idArrays.length <= 1 ? Global.NUMERICAL_ONE : (idArrays.length - Global.NUMERICAL_ONE);
-    }
-
     public int newLogisticsLevel(KwtLogisticsOrder logisticsOrder) {
         String pids = logisticsOrder.getPids();
         String[] idArrays = StringUtils.isBlank(pids) ? new String[0] : pids.split(Global.COMMA);

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

@@ -86,7 +86,7 @@ import static com.sckw.excel.utils.DateUtil.DEF_DATE_FORMAT;
  */
 @Slf4j
 @Service
-public class ConsignOrderService {
+public class KwtConsignOrderService {
 
     @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
     TradeOrderInfoService tradeOrderInfoService;
@@ -151,7 +151,7 @@ public class ConsignOrderService {
     public KwtLogisticsOrderCirculateMapper kwtLogisticsOrderCirculateMapper;
 
     @Autowired
-    public TransportCommonService transportCommonService;
+    public KwtTransportCommonService transportCommonService;
 
     @Autowired
     KwtWaybillOrderService waybillOrderService;

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/LogisticsConsignmentService.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtLogisticsConsignmentService.java

@@ -74,7 +74,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
-public class LogisticsConsignmentService {
+public class KwtLogisticsConsignmentService {
 
     @Resource
     private StreamBridge streamBridge;
@@ -83,11 +83,14 @@ public class LogisticsConsignmentService {
     RedisLockUtil redisLockUtil;
 
     @Autowired
-    public TransportCommonService transportCommonService;
+    public KwtTransportCommonService transportCommonService;
 
     @Autowired
     KwtWaybillOrderService waybillOrderService;
 
+    @Autowired
+    KwtLogisticsOrderGoodsService logisticsOrderGoodsService;
+
     @Autowired
     MessageUrlConfig messageUrlConfig;
 
@@ -238,7 +241,7 @@ public class LogisticsConsignmentService {
             log.info("物流托运创建订单异常");
             throw new BusinessException("物流托运创建订单异常");
         }
-        insertLogisticsGoods(bo, lOrderNo, orderId);
+        logisticsOrderGoodsService.insertLogisticsGoods(bo, lOrderNo, orderId);
         insertLogisticsOrder(bo, lOrderNo, order, tradeOrder, orderId, orderStatus);
         insertLogisticsOrderContract(bo, orderId);
         insertLogisticsOrderUnit(bo, orderId);
@@ -511,28 +514,6 @@ public class LogisticsConsignmentService {
         kwtLogisticsOrderTrackMapper.insert(entity);
     }
 
-    /**
-     * 物流订单-商品信息
-     *
-     * @param bo       页面请求数据
-     * @param lOrderNo 物流订单编号
-     * @param orderId  物流订单表编号
-     */
-    private void insertLogisticsGoods(LogisticsConsignmentParam bo, String lOrderNo, Long orderId) {
-        KwtLogisticsOrderGoods kwtLogisticsOrderGoods = new KwtLogisticsOrderGoods();
-        kwtLogisticsOrderGoods.setId(new IdWorker(NumberConstant.ONE).nextId());
-        kwtLogisticsOrderGoods.setGoodsId(Long.parseLong(bo.getGoodsId()));
-        kwtLogisticsOrderGoods.setGoodsName(bo.getGoodsName());
-        kwtLogisticsOrderGoods.setSkuId(StringUtils.isBlank(bo.getSkuId()) ? null : Long.parseLong(bo.getSkuId()));
-        kwtLogisticsOrderGoods.setLOrderId(orderId);
-        kwtLogisticsOrderGoods.setLOrderNo(lOrderNo);
-        kwtLogisticsOrderGoods.setUpdateBy(LoginUserHolder.getUserId());
-        kwtLogisticsOrderGoods.setUpdateTime(new Date());
-        kwtLogisticsOrderGoods.setCreateBy(LoginUserHolder.getUserId());
-        kwtLogisticsOrderGoods.setCreateTime(new Date());
-        kwtLogisticsOrderGoodsMapper.insert(kwtLogisticsOrderGoods);
-    }
-
     /**
      * 物流订单-主体
      *

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

@@ -0,0 +1,91 @@
+package com.sckw.transport.service;
+
+import com.sckw.core.model.constant.NumberConstant;
+import com.sckw.core.utils.IdWorker;
+import com.sckw.core.utils.StringUtils;
+import com.sckw.core.web.context.LoginUserHolder;
+import com.sckw.transport.dao.KwtLogisticsOrderGoodsMapper;
+import com.sckw.transport.model.KwtLogisticsOrderGoods;
+import com.sckw.transport.model.dto.AddOrderDTO;
+import com.sckw.transport.model.dto.SubcontractConsignmentDTO;
+import com.sckw.transport.model.param.LogisticsConsignmentParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+
+/**
+ * @desc 物流订单关联商品信息
+ * @author zk
+ * @date 2023/12/6 0006
+ */
+@Slf4j
+@Service
+@SuppressWarnings("all")
+public class KwtLogisticsOrderGoodsService {
+
+    @Autowired
+    public KwtLogisticsOrderGoodsMapper kwtLogisticsOrderGoodsMapper;
+
+    /**
+     * 物流订单-商品信息
+     * @param bo       页面请求数据
+     * @param lOrderNo 物流订单编号
+     * @param orderId  物流订单表编号
+     */
+    public void insertLogisticsGoods(LogisticsConsignmentParam bo, String lOrderNo, Long orderId) {
+        KwtLogisticsOrderGoods kwtLogisticsOrderGoods = new KwtLogisticsOrderGoods();
+        kwtLogisticsOrderGoods.setId(new IdWorker(NumberConstant.ONE).nextId());
+        kwtLogisticsOrderGoods.setGoodsId(Long.parseLong(bo.getGoodsId()));
+        kwtLogisticsOrderGoods.setGoodsName(bo.getGoodsName());
+        kwtLogisticsOrderGoods.setSkuId(StringUtils.isBlank(bo.getSkuId()) ? null : Long.parseLong(bo.getSkuId()));
+        kwtLogisticsOrderGoods.setLOrderId(orderId);
+        kwtLogisticsOrderGoods.setLOrderNo(lOrderNo);
+        kwtLogisticsOrderGoods.setUpdateBy(LoginUserHolder.getUserId());
+        kwtLogisticsOrderGoods.setUpdateTime(new Date());
+        kwtLogisticsOrderGoods.setCreateBy(LoginUserHolder.getUserId());
+        kwtLogisticsOrderGoods.setCreateTime(new Date());
+        kwtLogisticsOrderGoodsMapper.insert(kwtLogisticsOrderGoods);
+    }
+
+    /**
+     * 分包托运-承运订单-商品信息
+     * @param bo
+     * @param lOrderNo
+     * @param orderId
+     */
+    public void insertSubcontractLogisticsGoods(SubcontractConsignmentDTO bo, String lOrderNo, Long orderId) {
+        KwtLogisticsOrderGoods kwtLogisticsOrderGoods = new KwtLogisticsOrderGoods();
+        kwtLogisticsOrderGoods.setId(new IdWorker(NumberConstant.ONE).nextId());
+        kwtLogisticsOrderGoods.setGoodsId(bo.getGoodsId() == null ? null : Long.parseLong(bo.getGoodsId()));
+        kwtLogisticsOrderGoods.setGoodsName(bo.getGoodsName());
+        kwtLogisticsOrderGoods.setLOrderId(orderId);
+        kwtLogisticsOrderGoods.setLOrderNo(lOrderNo);
+        kwtLogisticsOrderGoods.setUpdateBy(LoginUserHolder.getUserId());
+        kwtLogisticsOrderGoods.setUpdateTime(new Date());
+        kwtLogisticsOrderGoods.setCreateBy(LoginUserHolder.getUserId());
+        kwtLogisticsOrderGoods.setCreateTime(new Date());
+        kwtLogisticsOrderGoodsMapper.insert(kwtLogisticsOrderGoods);
+    }
+
+    /**
+     * 承运订单-页面新增订单-商品信息
+     * @param orderDTO 页面参数
+     * @param lOrderId 订单id
+     * @param lOrderNo 订单编号
+     */
+    public void saveLogisticsOrderGoods(AddOrderDTO orderDTO, Long lOrderId, String lOrderNo) {
+        KwtLogisticsOrderGoods goods = new KwtLogisticsOrderGoods();
+        goods.setId(new IdWorker(NumberConstant.ONE).nextId());
+        goods.setLOrderId(lOrderId);
+        goods.setLOrderNo(lOrderNo);
+        goods.setGoodsName(orderDTO.getGoodsName());
+        goods.setGoodsType(orderDTO.getGoodsType());
+        goods.setStatus(NumberConstant.ZERO);
+        goods.setCreateBy(LoginUserHolder.getUserId());
+        goods.setCreateTime(new Date());
+        goods.setUpdateBy(LoginUserHolder.getUserId());
+        goods.setUpdateTime(new Date());
+        kwtLogisticsOrderGoodsMapper.insert(goods);
+    }
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/ManagementLogisticsOrderService.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtManagementLogisticsOrderService.java

@@ -54,7 +54,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
-public class ManagementLogisticsOrderService {
+public class KwtManagementLogisticsOrderService {
 
     @Autowired
     CommonService commonService;

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/ManagementWaybillOrderService.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtManagementWaybillOrderService.java

@@ -40,7 +40,7 @@ import java.util.regex.Pattern;
  **/
 @Slf4j
 @Service
-public class ManagementWaybillOrderService {
+public class KwtManagementWaybillOrderService {
 
     @Autowired
     private MongoTemplate mongoTemplate;
@@ -49,7 +49,7 @@ public class ManagementWaybillOrderService {
     private CommonService commonService;
 
     @Autowired
-    private WaybillManagementService waybillManagementService;
+    private KwtWaybillManagementService waybillManagementService;
 
     /**
      * 构造运单关联查询条件

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/TransportCommonService.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtTransportCommonService.java

@@ -62,7 +62,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
-public class TransportCommonService {
+public class KwtTransportCommonService {
 
     @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 10000)
     RemoteSystemService remoteSystemService;

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

@@ -47,7 +47,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
-public class WaybillManagementService {
+public class KwtWaybillManagementService {
 
     @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteFleetService remoteFleetService;

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

@@ -49,7 +49,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
-
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
@@ -219,7 +218,6 @@ public class KwtWaybillOrderService {
             result.put("driverName", circulate.getDriverName());
         }
 
-
         Object truckId = result.get("truckId");
         if (truckId != null) {
             RTruckVo truck = findTruck(Long.parseLong(String.valueOf(truckId)));