remove stream

sckw-modules/sckw-transport/pom.xml

@@ -98,11 +98,11 @@
             <version>${basic.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.sckw</groupId>
-            <artifactId>sckw-common-stream</artifactId>
-            <version>${basic.version}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.sckw</groupId>-->
+<!--            <artifactId>sckw-common-stream</artifactId>-->
+<!--            <version>${basic.version}</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.sckw</groupId>

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/TransPortApplication.java

@@ -5,7 +5,6 @@ import com.sckw.startup.annotation.SckwCloudApplication;
 import io.seata.spring.annotation.datasource.EnableAutoDataSourceProxy;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
-import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
@@ -17,7 +16,10 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableAutoDataSourceProxy
 @SckwRemoteApplication
 @SckwCloudApplication
-@MapperScan("com.sckw.transport.dao")
+@MapperScan({
+        "com.sckw.transport.dao",
+        "com.sckw.transport.five.mapper"
+})
 @EnableScheduling
 @EnableAsync
 public class TransPortApplication {

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

@@ -1,21 +1,18 @@
 package com.sckw.transport.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.sckw.core.annotation.Log;
 import com.sckw.core.annotation.RepeatSubmit;
 import com.sckw.core.exception.CustomPromptException;
-import com.sckw.core.model.enums.OrderRuleEnum;
-import com.sckw.core.model.enums.RedisOrderGenerateEnum;
 import com.sckw.core.model.page.PageRes;
-import com.sckw.core.model.vo.BaseList;
-import com.sckw.core.utils.OrderGenerateSeqNoUtils;
-import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.config.easyexcel.RequestHolder;
 import com.sckw.excel.utils.ExcelUtil;
-import com.sckw.transport.model.dto.*;
-import com.sckw.transport.model.param.*;
+import com.sckw.transport.model.dto.DocumentParamDTO;
+import com.sckw.transport.model.dto.StopOrderTakingDTO;
+import com.sckw.transport.model.param.AcceptCarriageOrderQuery;
+import com.sckw.transport.model.param.ContractParam;
+import com.sckw.transport.model.param.LogisticsOrderStatisticsParam;
 import com.sckw.transport.model.vo.execlVo.AcceptCarriageOrderExcelVo;
 import com.sckw.transport.service.Import.KwtAcceptCarriageOrderImportService;
 import com.sckw.transport.service.KwtAcceptCarriageOrderService;
@@ -31,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.util.List;
 
 /**
@@ -74,21 +72,7 @@ public class KwtAcceptCarriageOrderController {
         }
     }
 
-    /**
-     * 承运订单top统计
-     *
-     * @param query 查询参数
-     * @return  响应结果
-     */
-    @RequestMapping(value = "/statisticsAcceptCarriage", method = RequestMethod.POST)
-    public HttpResult statisticsAcceptCarriage(@Valid @RequestBody AcceptCarriageOrderQuery query) {
-        try {
-            return acceptCarriageOrderService.statisticsAcceptCarriage(query, "2");
-        } catch (Exception e) {
-            log.error("承运订单top统计 查询失败:{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
+
 
     /**
      * 承运订单导出
@@ -151,70 +135,7 @@ public class KwtAcceptCarriageOrderController {
         }
     }
 
-    /**
-     * 托运订单/承运订单-撤销托运
-     *
-     * @param orderDto  订单请求数据
-     * @return  响应结果
-     */
-    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
-    @RequestMapping(value = "/cancelConsign", method = RequestMethod.POST)
-    public HttpResult cancelConsign(@Validated @RequestBody CancelOrderDTO orderDto) {
-        try {
-            return transportCommonService.cancelConsign(orderDto);
-        } catch (Exception e) {
-            log.error("托运订单-撤销托运运单失败:订单id {},error {} ", orderDto.getId(), e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
 
-    /**
-     * 对账管理-运费收款对账界面查询接口
-     *
-     * @param logisticsOrderParam   物流请求数据
-     * @return  物流订单响应结果
-     */
-    @RequestMapping(value = "/getAcceptCarriageOrder", method = RequestMethod.POST)
-    public HttpResult getAcceptCarriageOrder(@RequestBody @Valid LogisticsOrderParam logisticsOrderParam) {
-        log.info("对账管理查询物流订单信息:{}", JSONObject.toJSONString(logisticsOrderParam));
-        try {
-            return transportCommonService.getAcceptCarriageOrder(logisticsOrderParam);
-        } catch (Exception e) {
-            log.error("对账管理-运费收款对账界面查询接口 error:{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-
-    }
-
-    /**
-     * 承运订单-接单
-     *
-     * @param orderDTO  物流订单接单请求数据
-     * @return  接单响应结果
-     */
-    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
-    @RequestMapping(value = "/orderTaking", method = RequestMethod.POST)
-    public HttpResult orderTaking(@Validated @RequestBody OrderTakingDTO orderDTO) {
-        return acceptCarriageOrderService.orderTaking(orderDTO);
-    }
-
-    /**
-     * 承运订单-分包托运
-     *
-     * @param query 请求参数
-     * @return 操作响应数据
-     */
-    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
-    @RequestMapping(value = "/subcontractConsignment", method = RequestMethod.POST)
-    public HttpResult subcontractConsignment(@RequestBody SubcontractConsignmentDTO query) {
-        try {
-            return acceptCarriageOrderService.subcontractConsignment(query);
-        } catch (Exception e) {
-//            OrderGenerateSeqNoUtils.getSeqNoMinusOne(RedisOrderGenerateEnum.LOGISTICS_ORDER, OrderRuleEnum.LOGISTICS_ORDER);
-            log.error("分包托运 error:{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
 
     /**
      * 承运订单-分包托运-订单详情
@@ -284,21 +205,6 @@ public class KwtAcceptCarriageOrderController {
         }
     }
 
-    /**
-     * 承运订单-停止接单-查询
-     * @param driverParam   查询订单数据
-     * @return  查询结果数据
-     */
-    @RequestMapping(value = "/acceptStopDocumentDetail", method = RequestMethod.POST)
-    public HttpResult stopDocumentDetail(@Validated @RequestBody DriverParam driverParam) {
-        log.info("承运订单-设置停止接单-查询 请求参数:{}", JSONObject.toJSONString(driverParam));
-        try {
-            return acceptCarriageOrderService.stopDocumentDetail(driverParam);
-        } catch (Exception e) {
-            log.error("承运订单-设置停止接单-查询 error:{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
 
     /**
      * 承运订单-设置停止接单-循环单提交
@@ -318,23 +224,6 @@ public class KwtAcceptCarriageOrderController {
         }
     }
 
-    /**
-     * 承运订单-取消派车(撤回派车)/单趟撤回
-     *
-     * @param baseList 车辆运单id
-     * @return  响应结果
-     */
-    @RequestMapping(value = "/cancelDelivery", method = RequestMethod.POST)
-    public HttpResult cancelDelivery(@Valid @RequestBody BaseList baseList) {
-        log.info("承运订单-取消派车(撤回派车)/单趟撤回请求参数:{}", JSONObject.toJSONString(baseList));
-        List<String> lists = StringUtils.splitStrToList(baseList.getIds(), ",", String.class);
-        try {
-            return acceptCarriageOrderService.cancelDelivery(lists, baseList.getIds());
-        } catch (Exception e) {
-            log.error("承运订单-单趟撤回 error:{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
 
     /**
      * 承运订单-完结订单-页面数据查询
@@ -354,23 +243,7 @@ public class KwtAcceptCarriageOrderController {
         }
     }
 
-    /**
-     * 承运订单-完结订单
-     *
-     * @param orderFinishDTO    物流订单请求参数
-     * @return  响应结果
-     */
-    @RequestMapping(value = "/commitAcceptCarriageOrderFinish", method = RequestMethod.POST)
-    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
-    public HttpResult commitAcceptCarriageOrderFinish(@Valid @RequestBody OrderManualCompletionDto orderFinishDTO) {
-        try {
-            //return acceptCarriageOrderService.commitAcceptCarriageOrderFinish(orderFinishDTO);
-            return transportCommonService.orderFinish(orderFinishDTO);
-        } catch (Exception e) {
-            log.error("托运订单-完结订单失败:订单id {},error {} ", orderFinishDTO.getId(), e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
+
 
     /**
      * 承运订单-查看撤销原因+驳回原因
@@ -389,24 +262,7 @@ public class KwtAcceptCarriageOrderController {
         }
     }
 
-    /**
-     * 承运订单-新建订单
-     *
-     * @param addOrderDTO 页面传递参数
-     * @return  响应结果
-     */
-    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
-    @RequestMapping(value = "/addOrder", method = RequestMethod.POST)
-    public HttpResult addOrder(@Valid @RequestBody AddOrderDTO addOrderDTO) {
-        log.info("承运订单-页面新建订单 add {}", JSONObject.toJSONString(addOrderDTO));
-        try {
-            return acceptCarriageOrderService.addOrder(addOrderDTO);
-        } catch (Exception e) {
-            OrderGenerateSeqNoUtils.getSeqNoMinusOne(RedisOrderGenerateEnum.LOGISTICS_ORDER, OrderRuleEnum.LOGISTICS_ORDER);
-            log.error("承运订单-新建订单 error:{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
+
 
     /**
      * 承运订单数据导入(外部数据)-批量导入
@@ -414,7 +270,6 @@ public class KwtAcceptCarriageOrderController {
      * @param file 文件
      * @return  响应结果
      */
-    @Log(description = "承运订单数据导入(外部数据)")
     @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
     @RequestMapping(value = "/externalImportExcel", method = RequestMethod.POST)
     public HttpResult externalImportExcel(@RequestParam("file") MultipartFile file) {

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

@@ -52,68 +52,7 @@ public class KwtConsignOrderController {
     @Autowired
     KwtTransportCommonService transportCommonService;
 
-    /**
-     * 托运订单首页条件查询
-     *
-     * @param query 查询参数
-     * @return  响应结果
-     */
-    @RequestMapping(value = "/selectConsignOrderList", method = RequestMethod.POST)
-    public HttpResult selectConsignOrderList(@Valid @RequestBody AcceptCarriageOrderQuery query) {
-        try {
-            PageRes result = consignOrderService.selectConsignOrderList(query, "1");
-            return HttpResult.ok(result);
-        } catch (Exception e) {
-            log.error("托运订单首页条件查询 查询失败:{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
 
-    /**
-     * 托运订单-top统计
-     *
-     * @param query 查询参数
-     * @return  响应结果
-     */
-    @RequestMapping(value = "/statisticsConsign", method = RequestMethod.POST)
-    public HttpResult statisticsConsign(@Valid @RequestBody AcceptCarriageOrderQuery query) {
-        try {
-            return consignOrderService.statisticsConsign(query, "1");
-        } catch (Exception e) {
-            log.error("托运订单-top统计 查询失败:{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
-
-    /**
-     *  托运订单-导出
-     * @param query 查询参数
-     */
-    @RequestMapping(value = "/consignExport", method = RequestMethod.POST)
-    public void exportConsign(@Validated @RequestBody ConsignOrderQuery query) {
-        HttpServletResponse response = RequestHolder.getResponse();
-        List<ConsignOrderExcelVo> list = consignOrderService.exportConsign(query, "1");
-        if (CollectionUtils.isEmpty(list)) {
-            throw new CustomPromptException(HttpStatus.SUCCESS_CODE, "暂无数据，请确认");
-        }
-        ExcelUtil.downData(response, ConsignOrderExcelVo.class, list);
-    }
-
-    /**
-     * 托运订单/承运订单-获取车辆运单
-     * @param orderDto  物流订单请求数据
-     * @return  车辆运单响应结果
-     */
-    @RequestMapping(value = "/getCarWaybillByOrder", method = RequestMethod.POST)
-    public HttpResult getCarWaybillByOrder(@Validated @RequestBody OrderDTO orderDto) {
-        log.info("托运订单/承运订单-获取车辆运单 query {}", JSONObject.toJSONString(orderDto));
-        try {
-            return consignOrderService.getCarWaybillByOrder(orderDto);
-        } catch (Exception e) {
-            log.error("托运订单获取车辆运单失败:订单ids {},error {} ", JSONObject.toJSONString(orderDto), e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
 
     /**
      * 托运订单-设置停止接单-物流订单id查询-针对循环单
@@ -229,41 +168,9 @@ public class KwtConsignOrderController {
         }
     }
 
-    /**
-     * 托运订单-完结订单
-     *
-     * @param orderFinishDTO    物流订单请求参数
-     * @return  响应结果
-     */
-    @RequestMapping(value = "/commitConsignOrderFinish", method = RequestMethod.POST)
-    public HttpResult commitConsignOrderFinish(@Validated @RequestBody OrderManualCompletionDto orderFinishDTO) {
-        log.info("托运订单-完结订单:订单 {}", JSONObject.toJSONString(orderFinishDTO));
-        try {
-            //return consignOrderService.commitConsignOrderFinish(orderFinishDTO);
-            return transportCommonService.orderFinish(orderFinishDTO);
-        } catch (Exception e) {
-            log.error("托运订单-完结订单失败:订单id {},error {} ", orderFinishDTO.getId(), e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
 
-    /**
-     * 托运订单-新建订单
-     *
-     * @param addOrderDTO 页面传递参数
-     * @return  响应结果
-     */
-    @RequestMapping(value = "/addOrder", method = RequestMethod.POST)
-    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
-    public HttpResult addOrder(@Valid @RequestBody AddOrderDTO addOrderDTO) {
-        try {
-            return consignOrderService.addOrder(addOrderDTO);
-        } catch (Exception e) {
-            OrderGenerateSeqNoUtils.getSeqNoMinusOne(RedisOrderGenerateEnum.LOGISTICS_ORDER, OrderRuleEnum.LOGISTICS_ORDER);
-            log.error("托运订单-新建订单 error:{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
+
+
 
     /**
      * 托运订单/承运订单-获取装卸货地址信息

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

@@ -52,41 +52,6 @@ public class KwtLogisticsConsignmentController {
     @Autowired
     KwtTransportCommonService transportCommonService;
 
-    /**
-     * 采购订单-物流托运生成托运订单
-     *
-     * @param logisticsConsignmentParam 页面请求参数
-     * @return  响应结果
-     */
-    @Validated
-    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
-    @RequestMapping(value = "/purchaseLogisticsConsignment", method = RequestMethod.POST)
-    public HttpResult purchaseLogisticsConsignment(@Valid @RequestBody LogisticsConsignmentParam logisticsConsignmentParam) {
-        log.info("采购订单传递参数信息:{}", JSONObject.toJSONString(logisticsConsignmentParam));
-        try {
-            return logisticsConsignmentService.logisticsConsignment(logisticsConsignmentParam,NumberConstant.ONE);
-        } catch (Exception e) {
-            log.error("采购订单-物流托运生成托运订单 error :{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
-
-    /**
-     * 采购订单-托运订单列表-销售订单id
-     *
-     * @param orderQuery 销售订单id
-     * @return  查询物流订单结果
-     */
-    @RequestMapping(value = "/purchaseLogisticsOrder", method = RequestMethod.POST)
-    public HttpResult purchaseLogisticsOrder(@RequestBody @Valid OrderQuery orderQuery) {
-        log.info("采购订单-托运订单列表 传递参数信息:{}", JSONObject.toJSONString(orderQuery));
-        try {
-            return logisticsConsignmentService.logisticsOrder(orderQuery.getIds(), orderQuery.getPage(), orderQuery.getPageSize(), "1");
-        } catch (Exception e) {
-            log.error("采购订单-托运订单列表 error :{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
 
     /**
      * 采购订单-托运订单列表-下方数据统计-贸易订单id
@@ -106,26 +71,7 @@ public class KwtLogisticsConsignmentController {
         }
     }
 
-    /**
-     * 采购订单-托运订单列表-撤销托运
-     *
-     * @param baseList 物流运单ids
-     * @return  操作结果
-     */
-    @Validated
-    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
-    @RequestMapping(value = "/purchaseCancelConsign", method = RequestMethod.POST)
-    @GlobalTransactional(name = "default_tx_group")
-    public HttpResult purchaseCancelConsign(@Valid @RequestBody BaseList baseList) {
-        log.info("采购订单-托运订单列表-撤销托运:{}", JSONObject.toJSONString(baseList));
-        try {
-            List<String> stringList = StringUtils.splitStrToList(baseList.getIds(), String.class);
-            return logisticsConsignmentService.cancelConsign(stringList, baseList.getRemark(), "1");
-        } catch (Exception e) {
-            log.error("采购订单-托运订单列表-撤销托运 error :{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
+
 
     /**
      * 采购购订单-车辆信息-销售订单ids
@@ -182,61 +128,7 @@ public class KwtLogisticsConsignmentController {
         }
     }
 
-    /**
-     * 采购订单-托运订单列表-完结订单
-     *
-     * @param orderFinishDTO    物流订单完结-页面请求参数
-     * @return  响应结果
-     */
-    @Validated
-    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
-    @RequestMapping(value = "/purchaseOrderFinish", method = RequestMethod.POST)
-    public HttpResult purchaseOrderFinish(@RequestBody @Validated OrderManualCompletionDto orderFinishDTO) {
-        log.info("采购订单-托运订单列表-完结订单 传递参数信息:{}", JSONObject.toJSONString(orderFinishDTO));
-        try {
-            //return logisticsConsignmentService.orderFinish(orderFinishDTO, "1");
-            return transportCommonService.orderFinish(orderFinishDTO);
-        } catch (Exception e) {
-            log.error("采购订单-托运订单列表-完结订单 error :{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
-
-    /**
-     * 销售订单-物流托运生成托运订单
-     *
-     * @param logisticsConsignmentParam 页面请求参数
-     * @return  响应结果
-     */
-    @RequestMapping(value = "/sellLogisticsConsignment", method = RequestMethod.POST)
-    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
-    public HttpResult sellLogisticsConsignment(@Valid @RequestBody LogisticsConsignmentParam logisticsConsignmentParam) {
-        log.info("销售订单-物流托运生成托运订单 传递参数信息:{}", JSONObject.toJSONString(logisticsConsignmentParam));
-        try {
-            return logisticsConsignmentService.logisticsConsignment(logisticsConsignmentParam, NumberConstant.TWO);
-        } catch (Exception e) {
-            OrderGenerateSeqNoUtils.getSeqNoMinusOne(RedisOrderGenerateEnum.LOGISTICS_ORDER,OrderRuleEnum.LOGISTICS_ORDER);
-            log.error("物流托运 error :{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
 
-    /**
-     * 销售订单-托运订单列表-销售订单id
-     *
-     * @param query 订单查询
-     * @return  响应结果
-     */
-    @RequestMapping(value = "/sellLogisticsOrder", method = RequestMethod.POST)
-    public HttpResult sellLogisticsOrder(@Valid @RequestBody OrderQuery query) {
-        log.info("销售订单-托运订单列表 传递参数信息:{}", JSONObject.toJSONString(query));
-        try {
-            return logisticsConsignmentService.logisticsOrder(query.getIds(), query.getPage(), query.getPageSize(), "2");
-        } catch (Exception e) {
-            log.error("销售订单-托运订单列表 error :{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
 
     /**
      * 销售订单-托运订单列表-下方数据统计-贸易订单id
@@ -273,25 +165,6 @@ public class KwtLogisticsConsignmentController {
         }
     }
 
-    /**
-     * 销售订单-托运订单列表-撤销托运
-     *
-     * @param baseList 物流订单id
-     * @return  响应结果
-     */
-    @RequestMapping(value = "/sellCancelConsign", method = RequestMethod.POST)
-    @GlobalTransactional(name = "default_tx_group")
-    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
-    public HttpResult sellCancelConsign(@Valid @RequestBody BaseList baseList) {
-        log.info("销售订单-托运订单列表-撤销托运:{}", JSONObject.toJSONString(baseList));
-        try {
-            List<String> stringList = StringUtils.splitStrToList(baseList.getIds(), String.class);
-            return logisticsConsignmentService.cancelConsign(stringList, baseList.getRemark(), "2");
-        } catch (Exception e) {
-            log.error("销售订单-车辆列表 error :{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
 
     /**
      * 销售订单-托运订单列表-订单完结-数据查询
@@ -312,25 +185,7 @@ public class KwtLogisticsConsignmentController {
         }
     }
 
-    /**
-     * 销售订单-托运订单列表-完结订单
-     *
-     * @param orderFinishDTO    完结数据页面请求参数
-     * @return  响应结果
-     */
-    @Validated
-    @RequestMapping(value = "/sellOrderFinish", method = RequestMethod.POST)
-    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
-    public HttpResult sellOrderFinish(@RequestBody @Validated OrderManualCompletionDto orderFinishDTO) {
-        log.info("销售订单-托运订单列表-完结订单 传递参数信息:{}", JSONObject.toJSONString(orderFinishDTO));
-        try {
-            //return logisticsConsignmentService.orderFinish(orderFinishDTO, "2");
-            return transportCommonService.orderFinish(orderFinishDTO);
-        } catch (Exception e) {
-            log.error("销售订单-托运订单列表-完结订单 error :{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
+
 
     /**
      * @desc: 采购订单-托运运单列表导出
@@ -365,23 +220,6 @@ public class KwtLogisticsConsignmentController {
     }
 
 
-    /**
-     * 采购订单/销售订单-物流托运-V4.2
-     *
-     * @param logisticsConsignmentDto 页面请求参数
-     * @return  响应结果
-     */
-    @Validated
-    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
-    @RequestMapping(value = "/logisticsOrderConsignment", method = RequestMethod.POST)
-    public HttpResult logisticsOrderConsignment(@Valid @RequestBody LogisticsConsignmentDto logisticsConsignmentDto) {
-        log.info("采购订单/销售订单-物流托运传递参数信息:{}", JSONObject.toJSONString(logisticsConsignmentDto));
-        try {
-            return logisticsConsignmentService.logisticsOrderConsignment(logisticsConsignmentDto);
-        } catch (Exception e) {
-            log.error("采购订单/销售订单-物流托运生成托运订单 error :{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
+
 
 }

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

@@ -48,84 +48,6 @@ public class KwtLogisticsOrderController {
     KwtTransportCommonService transportCommonService;
 
 
-    /**
-     * 采购订单/销售订单-物流托运-V4.2
-     *
-     * @param logisticsConsignmentDto 页面请求参数
-     * @return 响应结果
-     */
-    @Validated
-    @RepeatSubmit(interval = 1000, message = "前方拥堵，请稍后尝试")
-    @RequestMapping(value = "/consignment", method = RequestMethod.POST)
-    public HttpResult logisticsOrderConsignment(@Valid @RequestBody LogisticsConsignmentDto logisticsConsignmentDto) {
-        log.info("采购订单/销售订单-物流托运传递参数信息:{}", JSONObject.toJSONString(logisticsConsignmentDto));
-        try {
-            return logisticsConsignmentService.logisticsOrderConsignment(logisticsConsignmentDto);
-        } catch (Exception e) {
-            log.error("采购订单/销售订单-物流托运生成托运订单 error :{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
-
-
-    /**
-     * 承运订单/托运订单-自建物流订单 V4.2
-     *
-     * @param addLogisticsOrderParam 页面请求参数
-     * @return 响应结果
-     */
-    @Validated
-    @RepeatSubmit(interval = 1000, message = "前方拥堵，请稍后尝试")
-    @RequestMapping(value = "/createOrder", method = RequestMethod.POST)
-    public HttpResult addLogisticsOrder(@Valid @RequestBody AddLogisticsOrderParam addLogisticsOrderParam) {
-        log.info("承运订单/托运订单-自建物流订单传递参数信息:{}", JSONObject.toJSONString(addLogisticsOrderParam));
-        try {
-            return logisticsConsignmentService.addLogisticsOrder(addLogisticsOrderParam);
-        } catch (Exception e) {
-            log.error("承运订单/托运订单-自建物流订单 error :{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
-
-
-    /**
-     * 物流订单-分包托运-V4.2
-     *
-     * @param logisticsOrderSubcontractDto 页面请求参数
-     * @return 响应结果
-     */
-    @Validated
-    @RepeatSubmit(interval = 1000, message = "前方拥堵，请稍后尝试")
-    @RequestMapping(value = "/subcontract", method = RequestMethod.POST)
-    public HttpResult logisticsOrderSubcontract(@Valid @RequestBody LogisticsOrderSubcontractDto logisticsOrderSubcontractDto) {
-        log.info("物流订单-分包托运传递参数信息:{}", JSONObject.toJSONString(logisticsOrderSubcontractDto));
-        try {
-            return logisticsConsignmentService.logisticsOrderSubcontract(logisticsOrderSubcontractDto);
-        } catch (Exception e) {
-            log.error("物流订单-分包托运 error :{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
-
-    /**
-     * 物流订单-完结订单-V4.2
-     *
-     * @param logisticsOrderSubcontractDto 页面请求参数
-     * @return 响应结果
-     */
-    @Validated
-    @RepeatSubmit(interval = 1000, message = "前方拥堵，请稍后尝试")
-    @RequestMapping(value = "/logisticsOrderFinish", method = RequestMethod.POST)
-    public HttpResult logisticsOrderFinish(@Valid @RequestBody LogisticsOrderFinishDto logisticsOrderSubcontractDto) {
-        log.info("物流订单-完结订单传递参数信息:{}", JSONObject.toJSONString(logisticsOrderSubcontractDto));
-        try {
-            return transportCommonService.logisticsOrderFinish(logisticsOrderSubcontractDto);
-        } catch (Exception e) {
-            log.error("物流订单-完结订单 error :{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
-
     /**
      * 分页查询物流订单
      */

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

@@ -28,16 +28,6 @@ public class KwtWaybillManagementController {
     @Autowired
     KwtWaybillManagementService waybillManagementService;
 
-    @Valid
-    @RequestMapping(name = "运单详情", value = "/waybillData", method = RequestMethod.GET)
-    public HttpResult waybillData(@RequestParam("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());
-        }
-    }
 
     @Valid
     @RequestMapping(name = "简洁版运单详情", value = "/waybillSimpleData", method = RequestMethod.GET)
@@ -50,15 +40,6 @@ public class KwtWaybillManagementController {
         }
     }
 
-    @RequestMapping(name = "运单看板", value = "/waybillIndex", method = RequestMethod.POST)
-    public HttpResult waybillIndex(@Validated @RequestBody WaybillOrderDTO waybillOrderDTO) {
-        try {
-            return waybillManagementService.waybillIndex(waybillOrderDTO);
-        } catch (Exception e) {
-            log.error("运单看板:订单id {},error {} ", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
 
     @RequestMapping(name = "运单看板TOP", value = "/waybillIndexStatistics", method = RequestMethod.POST)
     public HttpResult waybillIndexStatistics(@Validated @RequestBody WaybillOrderDTO waybillOrderDTO) {

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

@@ -297,19 +297,7 @@ public class KwtWaybillOrderController {
         }
     }
 
-    /**
-     * @param params {}
-     * @desc 派车-趟次/循环
-     * @author zk
-     * @date 2023/5/30
-     **/
-    @PostMapping("/sendCar")
-    public HttpResult sendCar(@RequestBody @Valid ValiList<SendCarDto1> params){
-        if (CollectionUtils.isEmpty(params)) {
-            return HttpResult.error("请选择委派车辆信息！");
-        }
-        return waybillOrderService.sendCar(params);
-    }
+
 
     /**
      * @param params {}
@@ -323,17 +311,6 @@ public class KwtWaybillOrderController {
     }
 
 
-    /**
-     * @param ids 车辆运单主键ID，多个已逗号隔开
-     * @desc 取消派车
-     * @author zk
-     * @date 2023/7/24
-     **/
-    @PostMapping("/cancelSendCar")
-    public HttpResult cancelSendCar(@RequestBody List<Long> ids){
-        return waybillOrderService.cancelSendCarV1(ids);
-    }
-
     /**
      * @param ids 车辆运单主键ID，多个已逗号隔开
      * @desc 取消派车
@@ -346,16 +323,7 @@ public class KwtWaybillOrderController {
     }
 
 
-    /**
-     * @param params {}
-     * @desc 确认接单
-     * @author zk
-     * @date 2023/7/24
-     **/
-    @PostMapping("/confirmSendCar")
-    public HttpResult confirmSendCar(@RequestBody @Valid OperateSendCarDto params){
-        return waybillOrderService.confirmSendCar(params);
-    }
+
 
     /**
      * @param params {}
@@ -369,16 +337,7 @@ public class KwtWaybillOrderController {
     }
 
 
-    /**
-     * @param params {}
-     * @desc 拒绝接单
-     * @author zk
-     * @date 2023/7/24
-     **/
-    @PostMapping("/refuseSendCar")
-    public HttpResult refuseSendCar(@RequestBody @Valid OperateSendCarDto params){
-        return waybillOrderService.refuseSendCar(params);
-    }
+
 
     /**
      * @param params {}
@@ -392,17 +351,6 @@ public class KwtWaybillOrderController {
     }
 
 
-    /**
-     * @param params {}
-     * @desc 确认出车
-     * @author zk
-     * @date 2023/7/26
-     **/
-    @PostMapping("/confirmDeparture")
-    public HttpResult confirmDeparture(@RequestBody @Valid OperateWaybillDto params){
-        return waybillOrderService.confirmDeparture(params);
-    }
-
     /**
      * @param params {}
      * @desc 确认出车
@@ -415,16 +363,7 @@ public class KwtWaybillOrderController {
     }
 
 
-    /**
-     * @param params {}
-     * @desc 拒绝出车
-     * @author zk
-     * @date 2023/7/26
-     **/
-    @PostMapping("/refuseDeparture")
-    public HttpResult refuseDeparture(@RequestBody @Valid OperateWaybillDto params){
-        return waybillOrderService.refuseDeparture(params);
-    }
+
 
     /**
      * @param params {}
@@ -438,16 +377,6 @@ public class KwtWaybillOrderController {
     }
 
 
-    /**
-     * @param params {}
-     * @desc 到达装货地点
-     * @author zk
-     * @date 2023/7/26
-     **/
-    @PostMapping("/arriveLoadLocation")
-    public HttpResult arriveLoadLocation(@RequestBody @Valid OperateWaybillDto params){
-        return waybillOrderService.arriveLoadLocation(params);
-    }
 
     /**
      * @param params {}
@@ -461,16 +390,6 @@ public class KwtWaybillOrderController {
     }
 
 
-    /**
-     * @param params {}
-     * @desc 装货
-     * @author zk
-     * @date 2023/7/26
-     **/
-    @PostMapping("/loading")
-    public HttpResult loading(@RequestBody @Valid WaybillOrderTicketV2Dto params){
-        return waybillOrderService.loadingV1(params);
-    }
 
     /**
      * @param params {}
@@ -484,16 +403,6 @@ public class KwtWaybillOrderController {
     }
 
 
-    /**
-     * @param params {}
-     * @desc 到达卸货地点
-     * @author zk
-     * @date 2023/7/26
-     **/
-    @PostMapping("/arriveUnloadLocation")
-    public HttpResult arriveUnloadLocation(@RequestBody @Valid OperateWaybillDto params){
-        return waybillOrderService.arriveUnloadLocation(params);
-    }
 
     /**
      * @param params {}
@@ -507,16 +416,6 @@ public class KwtWaybillOrderController {
     }
 
 
-    /**
-     * @param params {}
-     * @desc 卸货
-     * @author zk
-     * @date 2023/7/26
-     **/
-    @PostMapping("/unloading")
-    public HttpResult unloading(@RequestBody @Valid WaybillOrderTicketV2Dto params){
-        return waybillOrderService.unloadingV1(params);
-    }
 
     /**
      * @param params {}
@@ -530,38 +429,6 @@ public class KwtWaybillOrderController {
     }
 
 
-    /**
-     * @param params {}
-     * @desc 修改单证
-     * @author zk
-     * @date 2023/7/26
-     **/
-    @PostMapping("/editTicket")
-    public HttpResult editTicket(@RequestBody @Valid WaybillOrderTicketDto params){
-        return waybillOrderService.editTicket(params);
-    }
-
-    /**
-     * @param params {}
-     * @desc 修改单证-装卸货一起修改
-     * @author zk
-     * @date 2023/7/26
-     **/
-    @PostMapping("/editTicketV1")
-    public HttpResult editTicketV1(@RequestBody @Valid WaybillOrderTicketV1Dto params){
-        return waybillOrderService.editTicket(params);
-    }
-
-    /**
-     * @param params {}
-     * @desc 修改单证-装卸货一起修改
-     * @author zk
-     * @date 2023/7/26
-     **/
-    @PostMapping("/editTicketV2")
-    public HttpResult editTicketV1(@RequestBody @Valid WaybillOrderTicketV3Dto params){
-        return waybillOrderService.editTicketV1(params);
-    }
 
     /**
      * @param params {}
@@ -611,17 +478,6 @@ public class KwtWaybillOrderController {
     }
 
 
-    /**
-     * @param params {}
-     * @desc 单证审核
-     * @author zk
-     * @date 2023/7/26
-     **/
-    @PostMapping("/approvalTicket")
-    public HttpResult approvalTicket(@RequestBody @Valid WaybillOrderApprovalDto params){
-        return waybillOrderService.approvalTicket(params);
-    }
-
     /**
      * @param params {}
      * @desc 单证审核-驳回
@@ -634,16 +490,7 @@ public class KwtWaybillOrderController {
     }
 
 
-    /**
-     * @param params {}
-     * @desc 单证审核（编辑单证）
-     * @author zk
-     * @date 2023/7/26
-     **/
-    @PostMapping("/approvalEditTicket")
-    public HttpResult approvalEditTicket(@RequestBody @Valid WaybillOrderTicketApprovalV1Dto params){
-        return waybillOrderService.approvalEditTicketV1(params);
-    }
+
 
     /**
      * @param params {}

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

@@ -27,16 +27,7 @@ public class AppAcceptCarriageController {
     @Autowired
     private KwtWaybillOrderService waybillOrderService;
 
-    @RequestMapping(name = "企业app订单管理数据承运订单统计", path = "/statisticsCarriage", method = RequestMethod.POST)
-    public HttpResult statisticsCarriage(@Valid @RequestBody AcceptCarriageOrderQuery query) {
-        log.info("企业app订单管理数据承运订单统计 query :{}", JSONObject.toJSONString(query));
-        try {
-            return HttpResult.ok(carriageOrderService.statisticsCarriage(query));
-        } catch (Exception e) {
-            log.error("企业app订单管理数据承运订单统计失败  query:{}, error:{}", JSONObject.toJSONString(query), e.getMessage(), e);
-            return HttpResult.error(e.getMessage());
-        }
-    }
+
 
     @RequestMapping(name = "企业app承运订单详情统计", path = "/statisticsCarriageByOrderId", method = RequestMethod.GET)
     public HttpResult statisticsCarriageByOrderId(@NotBlank(message = "订单id不能为空") @RequestParam("orderId") String orderId) {

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

@@ -30,21 +30,7 @@ public class AppConsignController {
     @Autowired
     private KwtWaybillOrderService waybillOrderService;
 
-    /**
-     * 企业app订单管理数据托运订单统计
-     * @param query 请求参数
-     * @return  统计响应结果
-     */
-    @RequestMapping(name = "企业app订单管理数据托运订单统计", path = "/statisticsConsign", method = RequestMethod.POST)
-    public HttpResult statisticsConsign(@Valid  @RequestBody AcceptCarriageOrderQuery query) {
-        log.info("企业app订单管理数据托运订单统计 query :{}", JSONObject.toJSONString(query));
-        try {
-            return HttpResult.ok(consignOrderService.statisticsConsignByApp(query));
-        } catch (Exception e) {
-            log.error("企业app订单管理数据托运订单统计失败  query:{}, error:{}", JSONObject.toJSONString(query), e.getMessage(), e);
-            return HttpResult.error(e.getMessage());
-        }
-    }
+
 
     /**
      * 企业app托运订单详情统计-统计车辆运单

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

@@ -76,69 +76,7 @@ public class AppWayBillController {
         }
     }
 
-    /**
-     * APP 运单列表 - [运输中|已完成]
-     * @param waybillOrderDTO   运单查询请求dto
-     * @return  运单查询结果
-     */
-    @Valid
-    @RequestMapping(name = "APP运单列表", value = "/waybillData", method = RequestMethod.POST)
-    public HttpResult waybillData(@Validated @RequestBody WaybillListAppDTO waybillOrderDTO) {
-        try {
-            return waybillManagementService.waybillDataApp(waybillOrderDTO);
-        } catch (Exception e) {
-            log.error("APP运单列表:error-msg: {} ,e: {}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
 
-    /**
-     * APP 运单列表吨量统计 - [运输中|已完成]
-     * @param waybillOrderDTO   统计运单数据查询
-     * @return  运单重量响应结果
-     */
-    @Valid
-    @RequestMapping(name = "APP运单吨量统计", value = "/waybillAmountStatistic2", method = RequestMethod.POST)
-    public HttpResult waybillAmountStatistic(@Validated @RequestBody WaybillListAppDTO waybillOrderDTO) {
-        try {
-            return waybillManagementService.waybillAmountStatistic(waybillOrderDTO);
-        } catch (Exception e) {
-            log.error("APP运单列表:订单id {},error {} ", waybillOrderDTO, e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
-
-    /**
-     * APP 运单列表吨量统计 - [运输中|已完成] - mongo
-     * @param waybillOrderDTO   统计运单数据查询
-     * @return  运单重量响应结果
-     */
-    @Valid
-    @RequestMapping(name = "APP运单吨量统计", value = "/waybillAmountStatistic", method = RequestMethod.POST)
-    public HttpResult waybillAmountStatisticCount(@Validated @RequestBody WaybillListAppDTO waybillOrderDTO) {
-        try {
-            return waybillManagementService.waybillAmountStatisticCount(waybillOrderDTO);
-        } catch (Exception e) {
-            log.error("APP运单列表:订单id {},error {} ", waybillOrderDTO, e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
-
-    /**
-     * APP 物流订单-运单列表
-     * @param waybillOrderDTO   物流订单查询
-     * @return  车辆运单响应结果
-     */
-    @Valid
-    @RequestMapping(name = "物流订单-运单列表", value = "/logisticOrderWaybillData", method = RequestMethod.POST)
-    public HttpResult logisticOrderWaybillData(@Validated @RequestBody WaybillListAppDTO waybillOrderDTO) {
-        try {
-            return waybillManagementService.logisticOrderWaybillData(waybillOrderDTO);
-        } catch (Exception e) {
-            log.error("物流订单-运单列表:订单id {},error {} ", waybillOrderDTO, e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
 
 
 
@@ -224,7 +162,7 @@ public class AppWayBillController {
         PageDataResult<LogisticsOrderResp> LogisticsOrderList = waybillOrderService.queryTruckLogisticsOrder(param);
         return BaseResult.success(LogisticsOrderList);
     }
-    
+
     /**
      * 分页查询运单
      *

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

@@ -41,57 +41,7 @@ public class ManagementLogisticsOrderController {
     KwtManagementLogisticsOrderService managementLogisticsOrderService;
 
 
-    /**
-     * 运营管理端-物流订单-首页条件查询
-     *
-     * @param query 查询参数
-     * @return  物流订单数据查询结果
-     */
-    @RequestMapping(value = "/select", method = RequestMethod.POST)
-    public HttpResult selectLogisticsOrder(@Valid @RequestBody ManagementLogisticsOrderQuery query) {
-        log.error("运营管理端-物流订单-首页条件查询 :{}", JSONObject.toJSONString(query));
-        try {
-            PageRes result = managementLogisticsOrderService.selectLogisticsOrder(query);
-            return HttpResult.ok(result);
-        } catch (Exception e) {
-            log.error("运营管理端-物流订单-首页条件查询 查询失败:{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
-
-
-    /**
-     * 运营管理端-物流订单-top统计
-     *
-     * @param query 查询参数
-     * @return  物流订单统计结果
-     */
-    @RequestMapping(value = "/statistics", method = RequestMethod.POST)
-    public HttpResult statisticsLogisticsOrder(@Valid @RequestBody ManagementLogisticsOrderQuery query) {
-        log.info("运营管理端-物流订单-top统计 查询 :{}", JSONObject.toJSONString(query));
-        try {
-            return managementLogisticsOrderService.statisticsLogisticsOrder(query);
-        } catch (Exception e) {
-            log.error("运营管理端-物流订单-top统计 失败 :{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
 
-    /**
-     * 运营管理端-物流订单-导出
-     * @param query 查询参数
-     */
-    @RequestMapping(value = "/export", method = RequestMethod.POST)
-    public void exportLogisticsOrder(@Validated @RequestBody ManagementLogisticsOrderQuery query) {
-        log.error("运营管理端-物流订单-导出 query :{}", JSONObject.toJSONString(query));
-        HttpServletResponse response = RequestHolder.getResponse();
-        List<ManagementLogisticsOrderExcelVo> list = managementLogisticsOrderService.exportLogisticsOrder(query);
-        if (CollectionUtils.isEmpty(list)) {
-            throw new CustomPromptException(HttpStatus.SUCCESS_CODE, "暂无数据，请确认");
-        }
-//      Translator.translate(list);
-        ExcelUtil.downData(response, ManagementLogisticsOrderExcelVo.class, list);
-    }
 
 
     /**
@@ -130,39 +80,5 @@ public class ManagementLogisticsOrderController {
         }
     }
 
-    /**
-     * 基础档案-物流合同档案-根据合同id获取托运订单列表
-     *
-     * @param contractParam 请求参数[合同ids]
-     * @return  物流订单数据
-     */
-    @RequestMapping(value = "/getLogisticsContract", method = RequestMethod.POST)
-    public HttpResult getLogisticsContract(@Valid @RequestBody ManagementContractParam contractParam) {
-        log.info("基础档案-物流合同档案-根据合同id获取托运订单列表 query:{}", JSONObject.toJSONString(contractParam));
-        try {
-            return managementLogisticsOrderService.getLogisticsContract(contractParam);
-        } catch (Exception e) {
-            log.error("基础档案-物流合同档案-根据合同id获取托运订单列表 error:{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
-
-
-    /**
-     * 运营端-贸易订单-获取物流订单
-     *
-     * @param query 订单查询
-     * @return  物流订单数据
-     */
-    @RequestMapping(value = "/selectLogisticsOrder", method = RequestMethod.POST)
-    public HttpResult selectLogisticsOrderByTradeOrder(@Valid @RequestBody OrderQuery query) {
-        log.info("运营端-贸易订单-获取物流订单 传递参数信息:{}", JSONObject.toJSONString(query));
-        try {
-            return managementLogisticsOrderService.selectLogisticsOrderByTradeOrder(query.getIds(), query.getPage(), query.getPageSize());
-        } catch (Exception e) {
-            log.error("运营端-贸易订单-获取物流订单 error :{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
 
 }

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

@@ -53,21 +53,7 @@ public class ManagementWaybillOrderController {
     KwtWaybillOrderV1Service waybillOrderV1Service;
 
 
-    /**
-     * 运营管理端-运单-首页条件查询
-     *
-     * @param query 查询参数
-     * @return  运单响应结果数据
-     */
-    @RequestMapping(value = "/select", method = RequestMethod.POST)
-    public HttpResult selectWaybillOrder(@Valid @RequestBody ManagementWaybillOrderQuery query) {
-        try {
-            return managementWaybillOrderService.selectWaybillOrder(query);
-        } catch (Exception e) {
-            log.error("运营管理端-运单-首页条件查询 查询失败:{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
+
 
     /**
      * 运营管理端-运单-首页条件查询
@@ -180,21 +166,7 @@ public class ManagementWaybillOrderController {
     }
 
 
-    /**
-     * 运营端-运单-获取订单详情
-     *
-     * @param id 订单id
-     * @return  订单数据
-     */
-    @RequestMapping(value = "/getOrderDetail", method = RequestMethod.GET)
-    public HttpResult getOrderDetail(@RequestParam("id") Long id) {
-        try {
-            return managementWaybillOrderService.getOrderDetail(id);
-        } catch (Exception e) {
-            log.error("运营端-运单-获取订单详情失败:error :单据id:{}, errorMessage:{}", id, e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
+
 
     /**
      * 运营端-运单-获取订单详情

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

@@ -1,8 +1,12 @@
 package com.sckw.transport.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.transport.five.pojo.UnloadCar;
 import com.sckw.transport.model.KwtForkliftWaybillOrder;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @author zk
@@ -12,5 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface KwtForkliftWaybillOrderMapper extends BaseMapper<KwtForkliftWaybillOrder> {
 
-
-}
+    List<UnloadCar> unloadCar(@Param("productId") List<Long> productId);
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dubbo/TransportServiceImpl.java

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -12,7 +11,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.sckw.core.common.enums.enums.DictEnum;
-import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.constant.NumberConstant;
@@ -23,7 +21,6 @@ import com.sckw.core.model.enums.LogisticsOrderEnum;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.DateUtils;
 import com.sckw.core.utils.IdWorker;
-import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
@@ -31,19 +28,12 @@ import com.sckw.fleet.api.RemoteFleetService;
 import com.sckw.fleet.api.model.vo.RTruckVo;
 import com.sckw.manage.api.RemoteManageService;
 import com.sckw.manage.api.model.dto.res.LineFreightAddressRes;
-import com.sckw.mongo.enums.BusinessTypeEnum;
-import com.sckw.mongo.model.SckwLogisticsOrder;
 import com.sckw.order.api.dubbo.TradeOrderInfoService;
-import com.sckw.order.api.model.OrderDetailRes;
-import com.sckw.order.api.model.UnitInfoDetailRes;
 import com.sckw.redis.constant.RedisConstant;
-import com.sckw.redis.utils.RedissonUtils;
-import com.sckw.stream.model.SckwBusSum;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.transport.api.dubbo.TransportRemoteService;
 import com.sckw.transport.api.model.dto.AcceptCarriageLogisticsOrderDto;
-import com.sckw.transport.api.model.dto.AccountCheckingBindDTO;
 import com.sckw.transport.api.model.dto.RWaybillOrderDto;
 import com.sckw.transport.api.model.param.*;
 import com.sckw.transport.api.model.vo.*;
@@ -60,7 +50,6 @@ import com.sckw.transport.model.vo.StatisticsWaybillResp;
 import com.sckw.transport.model.vo.WaybillOrderDetailResp;
 import com.sckw.transport.repository.*;
 import com.sckw.transport.service.KwtAcceptCarriageOrderService;
-import com.sckw.transport.service.KwtCommonService;
 import com.sckw.transport.service.KwtLogisticsConsignmentService;
 import com.sckw.transport.service.KwtWaybillOrderV1Service;
 import jakarta.annotation.Resource;
@@ -72,7 +61,6 @@ import org.apache.dubbo.config.annotation.DubboService;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.stream.function.StreamBridge;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -96,11 +84,7 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class TransportServiceImpl implements TransportRemoteService {
 
-    @Autowired
-    public KwtCommonService commonService;
 
-    @Resource
-    private StreamBridge streamBridge;
 
     @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteSystemService remoteSystemService;
@@ -193,167 +177,7 @@ public class TransportServiceImpl implements TransportRemoteService {
         return list;
     }
 
-    /**
-     * 对账页面数据接口
-     *
-     * @param ids
-     * @return
-     */
-    @Override
-    public List<AcceptCarriageLogisticsOrderDto> getAcceptCarriageOrderList(List<String> ids) {
-        List<AcceptCarriageLogisticsOrderDto> list = logisticsOrderMapper.selectLogisticOrderList(ids, LogisticsOrderEnum.HAVE_FINISHED.getCode());
-        /**计量单位*/
-        Map<String, String> unitTypeDictData = getDictData(DictTypeEnum.UNIT_TYPE.getType());
-        /**运价方式*/
-        Map<String, String> priceDictData = getDictData(DictTypeEnum.PRICE_TYPE.getType());
-        /**计费方式*/
-        Map<String, String> chargingDictData = getDictData(DictTypeEnum.CHARGING_TYPE.getType());
-        /**结算周期*/
-        Map<String, String> settlementDictData = getDictData(DictTypeEnum.SETTLEMENT_CYCLE.getType());
-        /**合理损耗*/
-        Map<String, String> taxRateTypeDictData = getDictData(DictTypeEnum.TAX_RATE_TYPE.getType());
-        if (CollectionUtils.isNotEmpty(list)) {
-
-            List<AcceptCarriageLogisticsOrderDto> collect = list.stream().filter(item -> item.getBillingMode().equals(DictEnum.CHARGING_TYPE_4.getValue())).collect(Collectors.toList());
-            Map<Long, List<KwtLogisticsOrderLineFreightRate>> collect1 = new HashMap<>();
-            if (CollectionUtils.isNotEmpty(collect)) {
-                List<KwtLogisticsOrderLineFreightRate> kwtLogisticsOrderLineFreightRates = lineFreightRateMapper.selectListByOrderIdList(collect.stream().map(AcceptCarriageLogisticsOrderDto::getLOrderId).map(Long::parseLong).toList());
-                if (CollectionUtils.isNotEmpty(kwtLogisticsOrderLineFreightRates)) {
-                    collect1 = kwtLogisticsOrderLineFreightRates.stream().collect(Collectors.groupingBy(KwtLogisticsOrderLineFreightRate::getLOrderId));
-                }
-            }
 
-            for (AcceptCarriageLogisticsOrderDto logisticsOrderDTO : list) {
-
-                List<KwtLogisticsOrderLineFreightRate> kwtLogisticsOrderLineFreightRates = collect1.get(Long.parseLong(logisticsOrderDTO.getLOrderId()));
-                if (CollectionUtils.isNotEmpty(kwtLogisticsOrderLineFreightRates)) {
-                    logisticsOrderDTO.setPrices(kwtLogisticsOrderLineFreightRates.stream().map(item -> item.getName() + " " + item.getTransportPrice()).toList());
-                }
-
-                String tOrderId = logisticsOrderDTO.getTOrderId();
-                if (StringUtils.isNotBlank(tOrderId)) {
-                    try {
-                        OrderDetailRes orderDetailById = tradeOrderInfoService.getOrderDetailById(Long.parseLong(tOrderId));
-                        if (orderDetailById != null) {
-                            List<UnitInfoDetailRes> unitInfo = orderDetailById.getUnitInfo();
-                            if (CollectionUtils.isNotEmpty(unitInfo)) {
-                                for (UnitInfoDetailRes detailRes : unitInfo) {
-                                    if ("1".equals(detailRes.getUnitType())) {
-                                        logisticsOrderDTO.setConsignee(detailRes.getFirmName());
-                                    }
-                                    if ("2".equals(detailRes.getUnitType())) {
-                                        logisticsOrderDTO.setForwardingUnit(detailRes.getFirmName());
-                                    }
-                                }
-                            }
-                        }
-                    } catch (NumberFormatException e) {
-                        System.out.println("查询不到贸易订单数据,id" + tOrderId);
-                    }
-                }
-
-                KwtLogisticsOrderUnit consignOrderUnit = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>()
-                        .eq(KwtLogisticsOrderUnit::getLOrderId, logisticsOrderDTO.getLOrderId())
-                        .eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.ONE));
-                KwtLogisticsOrderUnit carrierOrderUnit = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>()
-                        .eq(KwtLogisticsOrderUnit::getLOrderId, logisticsOrderDTO.getLOrderId())
-                        .eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.TWO));
-//                KwtLogisticsOrderAddress loadOrderAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-//                        .eq(KwtLogisticsOrderAddress::getLOrderId, logisticsOrderDTO.getLOrderId())
-//                        .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE)
-//                );
-//                KwtLogisticsOrderAddress unloadOrderAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-//                        .eq(KwtLogisticsOrderAddress::getLOrderId, logisticsOrderDTO.getLOrderId())
-//                        .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO)
-//                );
-                KwtLogisticsOrderContract contract = logisticsOrderContractMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderContract>()
-                        .eq(KwtLogisticsOrderContract::getLOrderId, logisticsOrderDTO.getLOrderId())
-                );
-
-                KwtLogisticsOrderGoods orderGoods = logisticsOrderGoodsMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderGoods>()
-                        .eq(KwtLogisticsOrderGoods::getLOrderId, logisticsOrderDTO.getLOrderId())
-                );
-                logisticsOrderDTO.setGoodsName(orderGoods == null ? null : orderGoods.getGoodsName());
-                String billingMode = logisticsOrderDTO.getBillingMode();
-
-                /**
-                 * 一、罚款值计算：
-                 * 1、合理损耗值=实装量*合理损耗（‰）
-                 *  1.1 亏吨量= 实装量-实卸量
-                 * 2、扣亏量=亏吨量-合理损耗值【要求大于0，如果小于0则扣亏货量取0】
-                 * 3、罚款值=扣亏量 * 扣亏货值
-                 *
-                 * 二、运价计算：
-                 * 1、按装货量：总运价=实装量*运价-罚款值
-                 * 2、按卸货量：总运价=实卸量*运价-罚款值
-                 * 3、按趟次：总运价=运价*趟次【后期加】
-                 */
-                //运价
-                BigDecimal price = logisticsOrderDTO.getPrice() == null ? NumberConstant.ZERO_TWO : logisticsOrderDTO.getPrice();
-
-
-                /**亏吨量/吨->装货量-卸货量
-                 扣亏量/吨->亏吨量-合理损耗值
-                 扣亏量/吨->亏吨量-合理损耗值(装货量*合理损耗)*/
-                BigDecimal loadAmount = logisticsOrderDTO.getTotalLoadAmount() == null ? NumberConstant.ZERO_TWO : logisticsOrderDTO.getTotalLoadAmount();
-                BigDecimal unloadAmount = logisticsOrderDTO.getTotalUnloadAmount() == null ? NumberConstant.ZERO_TWO : logisticsOrderDTO.getTotalUnloadAmount();
-
-                BigDecimal loss = logisticsOrderDTO.getLoss() == null ? NumberConstant.ZERO_TWO : logisticsOrderDTO.getLoss();
-                //亏吨量
-                BigDecimal defectiveWeighNumber = loadAmount.subtract(unloadAmount);
-                //合理损耗值
-                BigDecimal lossAmount = loadAmount.multiply(logisticsOrderDTO.getLoss() == null ? NumberConstant.ZERO_TWO : logisticsOrderDTO.getLoss());
-                //扣亏量
-//                BigDecimal deductWeighNumber = defectiveWeighNumber.subtract(lossAmount);
-                BigDecimal deductWeighNumber = commonService.deficitLossAmount(loadAmount, defectiveWeighNumber, loss, logisticsOrderDTO.getLossUnit());
-                if (deductWeighNumber.compareTo(new BigDecimal("0")) < 0) {
-                    deductWeighNumber = NumberConstant.ZERO_TWO;
-                }
-                //罚款值
-                BigDecimal fineValue = (logisticsOrderDTO.getGoodsPrice() == null ? NumberConstant.ZERO_TWO : logisticsOrderDTO.getGoodsPrice()).multiply(deductWeighNumber);
-                /**
-                 *
-                 * 二、运价计算：
-                 * 1、按装货量：总运价=实装量*运价-罚款值
-                 * 2、按卸货量：总运价=实卸量*运价-罚款值
-                 * 3、按趟次：总运价=运价*趟次【后期加】
-                 */
-                //todo 2023-10-10 含税金额不减去罚款值 另指定罚款值进行返回数据
-                BigDecimal actualAmount = NumberConstant.ZERO_TWO;
-                actualAmount = computeAmount(actualAmount, logisticsOrderDTO, billingMode, price);
-                logisticsOrderDTO.setDeductPrice(fineValue);
-                logisticsOrderDTO.setTaxMoney(actualAmount);
-                logisticsOrderDTO.setContractName(contract.getContractName());
-                logisticsOrderDTO.setContractNo(contract.getContractNo());
-                logisticsOrderDTO.setGoodsPriceLabel(priceDictData.get(logisticsOrderDTO.getPriceType()));
-                logisticsOrderDTO.setCreateByName(remoteSystemService.queryUserCacheById(logisticsOrderDTO.getCreateBy()) == null ? null : remoteSystemService.queryUserCacheById(logisticsOrderDTO.getCreateBy()).getName());
-//                logisticsOrderDTO.setLoadAddress(loadOrderAddress.getDetailAddress());
-//                logisticsOrderDTO.setLoadName(loadOrderAddress.getName());
-//                logisticsOrderDTO.setLoadContacts(loadOrderAddress.getContacts());
-//                logisticsOrderDTO.setLoadPhone(loadOrderAddress.getPhone());
-//                logisticsOrderDTO.setUnloadAddress(unloadOrderAddress.getDetailAddress());
-//                logisticsOrderDTO.setUnloadName(unloadOrderAddress.getName());
-//                logisticsOrderDTO.setUnloadContacts(unloadOrderAddress.getContacts());
-//                logisticsOrderDTO.setUnloadPhone(unloadOrderAddress.getPhone());
-                logisticsOrderDTO.setCarrierCompany(carrierOrderUnit == null ? null : carrierOrderUnit.getFirmName());
-                logisticsOrderDTO.setCarrierPhone(carrierOrderUnit == null ? null : carrierOrderUnit.getPhone());
-                logisticsOrderDTO.setCarrierContacts(carrierOrderUnit == null ? null : carrierOrderUnit.getContacts());
-                logisticsOrderDTO.setConsignCompany(consignOrderUnit == null ? null : consignOrderUnit.getFirmName());
-                logisticsOrderDTO.setConsignPhone(consignOrderUnit == null ? null : consignOrderUnit.getPhone());
-                logisticsOrderDTO.setConsignContacts(consignOrderUnit == null ? null : consignOrderUnit.getContacts());
-                logisticsOrderDTO.setSettlementCycleLabel(logisticsOrderDTO.getSettlementCycle() == null ? null : settlementDictData.get(logisticsOrderDTO.getSettlementCycle().toString()));
-                logisticsOrderDTO.setBillingModeLabel(chargingDictData.get(logisticsOrderDTO.getBillingMode()));
-                logisticsOrderDTO.setPriceLabel(priceDictData.get(logisticsOrderDTO.getPriceType()));
-                logisticsOrderDTO.setLossUnitLabel(taxRateTypeDictData.get(logisticsOrderDTO.getLossUnit()));
-                logisticsOrderDTO.setAmountLabel(unitTypeDictData.get(logisticsOrderDTO.getUnit()));
-                logisticsOrderDTO.setIgnoreAmountLabel(unitTypeDictData.get(logisticsOrderDTO.getUnit()));
-                logisticsOrderDTO.setLoadAmount(logisticsOrderDTO.getTotalLoadAmount());
-                logisticsOrderDTO.setUnloadAmount(logisticsOrderDTO.getTotalUnloadAmount());
-//                logisticsOrderDTO.setCount(waybillOrderMapper.selectCount(new LambdaQueryWrapper<KwtWaybillOrder>().eq(KwtWaybillOrder::getLOrderId, logisticsOrderDTO.getLOrderId())));
-            }
-        }
-        return list;
-    }
 
     /**
      * 含税金额计算
@@ -449,70 +273,6 @@ public class TransportServiceImpl implements TransportRemoteService {
         return flag;
     }
 
-    /**
-     * 对账修改物流订单信息
-     *
-     * @param logisticsOrderParam 请求物流订单数据
-     * @return
-     */
-    @Override
-    public HttpResult checkLogisticsOrderStatusById(LogisticsOrderParam logisticsOrderParam) {
-        HttpResult httpResult = new HttpResult();
-        log.info("对账修改物流订单参数:{}", JSONObject.toJSONString(logisticsOrderParam));
-        Long lOrderId = logisticsOrderParam.getLOrderId();
-        String status = logisticsOrderParam.getStatus();
-        if (lOrderId == null) {
-            httpResult.setMsg("物流订单不能为空!");
-            httpResult.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
-            return httpResult;
-        }
-
-        LambdaQueryWrapper<KwtLogisticsOrder> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(KwtLogisticsOrder::getId, lOrderId);
-        wrapper.eq(KwtLogisticsOrder::getDelFlag, NumberConstant.ZERO);
-        KwtLogisticsOrder kwtLogisticsOrder = logisticsOrderMapper.selectOne(wrapper);
-        if (kwtLogisticsOrder == null) {
-            httpResult.setMsg("物流订单不存在!");
-            httpResult.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
-            return httpResult;
-        }
-
-        if (LogisticsOrderEnum.HAVE_RECONCILED.getStatus().equals(status)) {
-            if (!LogisticsOrderEnum.HAVE_FINISHED.getStatus().equals(String.valueOf(kwtLogisticsOrder.getStatus()))) {
-                httpResult.setMsg("物流单据状态有误,不能修改");
-                httpResult.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
-                return httpResult;
-            }
-        } else if (LogisticsOrderEnum.HAVE_ALREADY_SETTLED.getStatus().equals(status)) {
-            if (!LogisticsOrderEnum.HAVE_RECONCILED.getStatus().equals(String.valueOf(kwtLogisticsOrder.getStatus()))) {
-                httpResult.setMsg("物流单据状态有误,不能修改");
-                httpResult.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
-                return httpResult;
-            }
-        } else {
-            httpResult.setMsg("物流单据状态有误");
-            httpResult.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
-            return httpResult;
-        }
-        //修改单据状态
-        kwtLogisticsOrder.setStatus(Integer.valueOf(status));
-        kwtLogisticsOrder.setUpdateTime(new Date());
-        kwtLogisticsOrder.setUpdateBy(LoginUserHolder.getUserId());
-        logisticsOrderMapper.updateById(kwtLogisticsOrder);
-        //修改mongodb状态
-        SckwLogisticsOrder order = new SckwLogisticsOrder();
-        order.set_id(kwtLogisticsOrder.getId());
-        order.setLOrderId(kwtLogisticsOrder.getId());
-        order.setStatus(status);
-        order.setUpdateTime(new Date());
-        order.setUpdateByName(LoginUserHolder.getUserName());
-        SckwBusSum busSum = new SckwBusSum();
-        busSum.setBusSumType(BusinessTypeEnum.LOGISTICS_ORDER_TYPE.getName());
-        busSum.setMethod(NumberConstant.TWO);
-        busSum.setObject(order);
-        streamBridge.send("sckw-busSum", com.alibaba.fastjson2.JSON.toJSONString(busSum));
-        return HttpResult.ok();
-    }
 
 //    /**
 //     * 根据企业id 获取物流订单相关地址信息
@@ -532,49 +292,7 @@ public class TransportServiceImpl implements TransportRemoteService {
 //        return map;
 //    }
 
-    /**
-     * 运费对账是否进行对账绑定数据
-     * accountCheckingBindDTO
-     *
-     * @return
-     */
-    @Override
-//    @GlobalLock
-    @Transactional
-    public HttpResult logisticsOrderAccountCheckingBind(AccountCheckingBindDTO accountCheckingBindDTO) {
-        log.info("物流订单对账,推送是否绑定,请求数据:{}", JSONObject.toJSONString(accountCheckingBindDTO));
-        if (org.springframework.util.CollectionUtils.isEmpty(accountCheckingBindDTO.getLOrderList())) {
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, "物流订单不能为空!");
-        }
-        if (StringUtils.isBlank(accountCheckingBindDTO.getStatus())) {
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, "绑定状态不能为空");
-        }
-        if (!String.valueOf(NumberConstant.ZERO).equals(accountCheckingBindDTO.getStatus()) &&
-                !String.valueOf(NumberConstant.ONE).equals(accountCheckingBindDTO.getStatus())) {
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, "绑定状态类型错误!");
-        }
-        accountCheckingBindDTO.getLOrderList().forEach(id -> {
-            logisticsOrderMapper.update(null,
-                    new LambdaUpdateWrapper<KwtLogisticsOrder>()
-                            .eq(KwtLogisticsOrder::getId, id)
-                            .set(KwtLogisticsOrder::getBindStatus, accountCheckingBindDTO.getStatus())
-                            .set(KwtLogisticsOrder::getUpdateBy, accountCheckingBindDTO.getUpdateBy())
-                            .set(KwtLogisticsOrder::getUpdateTime, new Date()));
-            //修改mongodb数据
-            SckwLogisticsOrder order = new SckwLogisticsOrder();
-            order.set_id(id);
-            order.setLOrderId(id);
-            order.setBindStatus(accountCheckingBindDTO.getStatus());
-            order.setUpdateTime(new Date());
-            order.setUpdateByName(accountCheckingBindDTO.getUpdateName());
-            SckwBusSum busSum = new SckwBusSum();
-            busSum.setBusSumType(BusinessTypeEnum.LOGISTICS_ORDER_TYPE.getName());
-            busSum.setMethod(NumberConstant.TWO);
-            busSum.setObject(order);
-            streamBridge.send("sckw-busSum", com.alibaba.fastjson2.JSON.toJSONString(busSum));
-        });
-        return HttpResult.ok();
-    }
+
 
     /**
      * 根据企业id查询是否存在有未完结的物流订单
@@ -636,90 +354,7 @@ public class TransportServiceImpl implements TransportRemoteService {
     }
 
 
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void contractSignLogisticsCompleted(ContractSignLogisticsParam param) {
-        if (Objects.isNull(param.getUpdateBy()) || StringUtils.isBlank(param.getUpdateByName())) {
-            throw new BusinessException("操作人信息不能为空!");
-        }
-        Long contractId = param.getContractId();
-        Long updateBy = param.getUpdateBy();
 
-        String lockKey = String.format(RedisConstant.LOGISTICS_ORDER_CONTRACT_UPDATE_KEY, param.getContractId());
-        if (Boolean.FALSE.equals(RedissonUtils.tryLock(lockKey, 5L, 10L))) {
-            throw new BusinessException("业务繁忙，请稍后再试!");
-        }
-        try {
-            List<KwtLogisticsOrderContract> contracts = logisticsOrderContractMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderContract>()
-                    .eq(KwtLogisticsOrderContract::getContractId, contractId)
-                    .eq(KwtLogisticsOrderContract::getDelFlag, NumberConstant.ZERO)
-            );
-            if (CollectionUtils.isEmpty(contracts)) {
-                log.info("合同：{}无相关联待签约的物流订单", contractId);
-                return;
-            }
-            List<Long> orderIds = contracts.stream().map(KwtLogisticsOrderContract::getLOrderId).distinct().collect(Collectors.toList());
-            List<KwtLogisticsOrder> orders = logisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                    .in(KwtLogisticsOrder::getId, orderIds)
-                    .eq(KwtLogisticsOrder::getStatus, LogisticsOrderEnum.TO_BE_PLANNED.getCode())
-            );
-            if (CollectionUtils.isEmpty(orders)) {
-                log.info("合同：{}无相关联待签约的物流订单", contractId);
-                return;
-            }
-            List<SckwLogisticsOrder> logisticsOrders = Lists.newArrayList();
-            List<Long> ids = orders.stream().map(KwtLogisticsOrder::getId).toList();
-            /**改变物流订单状态*/
-            for (Long id : ids) {
-                logisticsOrderMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrder>()
-                        .set(KwtLogisticsOrder::getUpdateBy, updateBy)
-                        .set(KwtLogisticsOrder::getUpdateTime, new Date())
-                        .set(KwtLogisticsOrder::getStatus, LogisticsOrderEnum.PENDING_ORDER.getCode())
-                        .eq(KwtLogisticsOrder::getId, id)
-                );
-                SckwLogisticsOrder logisticsOrder = new SckwLogisticsOrder();
-                logisticsOrder.set_id(id);
-                logisticsOrder.setLOrderId(id);
-                logisticsOrder.setStatus(LogisticsOrderEnum.PENDING_ORDER.getStatus());
-                logisticsOrder.setUpdateBy(updateBy);
-                logisticsOrder.setUpdateByName(param.getUpdateByName());
-                logisticsOrders.add(logisticsOrder);
-            }
-            /**增加状态表数据*/
-            orders.forEach(e -> {
-                KwtLogisticsOrderTrack orderTrack = logisticsOrderTrackMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderTrack>()
-                        .eq(KwtLogisticsOrderTrack::getLOrderId, e.getId())
-                        .eq(KwtLogisticsOrderTrack::getStatus, LogisticsOrderEnum.PENDING_ORDER.getCode())
-                );
-                if (orderTrack == null) {
-                    KwtLogisticsOrderTrack track = new KwtLogisticsOrderTrack();
-                    track.setId(new IdWorker(NumberConstant.ONE).nextId());
-                    track.setLOrderId(e.getId());
-                    track.setStatus(LogisticsOrderEnum.PENDING_ORDER.getCode());
-                    track.setCreateBy(updateBy);
-                    track.setCreateTime(new Date());
-                    track.setUpdateBy(updateBy);
-                    track.setUpdateTime(new Date());
-                    track.setDelFlag(NumberConstant.ZERO);
-                    logisticsOrderTrackMapper.insert(track);
-                } else {
-                    orderTrack.setUpdateBy(updateBy);
-                    orderTrack.setUpdateTime(new Date());
-                    logisticsOrderTrackMapper.updateById(orderTrack);
-                }
-            });
-            /** mongodb保存*/
-            for (SckwLogisticsOrder logisticsOrder : logisticsOrders) {
-                SckwBusSum busSum = new SckwBusSum();
-                busSum.setBusSumType(BusinessTypeEnum.LOGISTICS_ORDER_TYPE.getName());
-                busSum.setMethod(NumberConstant.TWO);
-                busSum.setObject(logisticsOrder);
-                streamBridge.send("sckw-busSum", JSON.toJSONString(busSum));
-            }
-        } finally {
-            RedissonUtils.unlock(lockKey);
-        }
-    }
 
     /**
      * @param params 参数

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dubbo/TransportStatisticsServiceImpl.java

@@ -60,7 +60,7 @@ public class TransportStatisticsServiceImpl implements TransportRemoteStatistics
     public Integer statisticsWaybillSendCar(Long topEntId) {
         Integer returnCount = 0;
 //        if (Objects.isNull(topEntId)) {
-//            throw new BusinessException("请求参数不能为空");
+//            throw new ApiException("请求参数不能为空");
 //        }
         List<Long> ids = logisticsOrderMapper.statisticsLogistics(topEntId);
         if (CollectionUtils.isEmpty(ids)) {
@@ -91,7 +91,7 @@ public class TransportStatisticsServiceImpl implements TransportRemoteStatistics
     public Integer statisticsPendingVerificationWaybill(Long topEntId) {
         Integer returnCount = 0;
 //        if (Objects.isNull(topEntId)) {
-//            throw new BusinessException("请求参数不能为空");
+//            throw new ApiException("请求参数不能为空");
 //        }
         List<Long> ids = logisticsOrderMapper.statisticsLogistics(topEntId);
         if (CollectionUtils.isEmpty(ids)) {

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

@@ -136,4 +136,5 @@ public class KwtForkliftWaybillOrder implements Serializable {
      */
     private Long updateUser;
 
-}
+    private String remark;
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtForkliftWaybillOrderRepository.java

@@ -72,8 +72,13 @@ public class KwtForkliftWaybillOrderRepository extends ServiceImpl<KwtForkliftWa
                 .orderByDesc(KwtForkliftWaybillOrder::getCreateTime));
     }
 
+    public KwtForkliftWaybillOrder getByOrder(String orderNo) {
+        return getOne(Wrappers.<KwtForkliftWaybillOrder>lambdaQuery()
+                .eq(KwtForkliftWaybillOrder::getFOrderNo, orderNo)
+                .orderByDesc(KwtForkliftWaybillOrder::getId)
+                .last("limit 1"));
+    }
 
 
 
-
-}
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/Import/KwtAcceptCarriageOrderImportService.java

@@ -10,27 +10,28 @@ import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.common.enums.enums.FileEnum;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.constant.NumberConstant;
-import com.sckw.core.model.enums.*;
+import com.sckw.core.model.enums.AddressTypeEnum;
+import com.sckw.core.model.enums.TaxRateTypeEnum;
 import com.sckw.core.model.file.FileInfo;
-import com.sckw.core.utils.*;
+import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.utils.FileUtils;
+import com.sckw.core.utils.IdWorker;
+import com.sckw.core.utils.StringUtils;
 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.easyexcel.ExcelImportListener;
 import com.sckw.excel.utils.DateUtil;
 import com.sckw.excel.utils.ExcelUtil;
-import com.sckw.excel.utils.ValidUtil;
 import com.sckw.fleet.api.RemoteFleetService;
 import com.sckw.manage.api.RemoteManageService;
 import com.sckw.manage.api.model.dto.res.EntAddressResDto;
 import com.sckw.manage.api.model.dto.res.FindCooperateByEntReqVo;
 import com.sckw.manage.api.model.dto.res.FindCooperateByEntResVo;
-import com.sckw.manage.api.model.dto.res.FindEntCooperateResVo;
 import com.sckw.order.api.dubbo.TradeOrderInfoService;
 import com.sckw.payment.api.dubbo.PaymentDubboService;
 import com.sckw.product.api.dubbo.GoodsInfoService;
 import com.sckw.redis.config.RedisLockUtil;
-import com.sckw.stream.enums.MessageEnum;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.KwsEnterpriseResDto;
@@ -39,16 +40,13 @@ import com.sckw.transport.common.config.MessageUrlConfig;
 import com.sckw.transport.dao.*;
 import com.sckw.transport.model.*;
 import com.sckw.transport.model.dto.ExeclDTO.LogisticsOrderExcelImportDTO;
-import com.sckw.transport.service.KwtCommonService;
 import com.sckw.transport.service.KwtLogisticsOrderGoodsService;
 import com.sckw.transport.service.KwtTransportCommonService;
 import com.sckw.transport.service.KwtWaybillOrderService;
-import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 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.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -94,8 +92,6 @@ public class KwtAcceptCarriageOrderImportService {
     @Autowired
     private MessageUrlConfig messageUrlConfig;
 
-    @Autowired
-    public KwtCommonService commonService;
 
     @Autowired
     public KwtWaybillOrderService waybillOrderService;
@@ -103,8 +99,7 @@ public class KwtAcceptCarriageOrderImportService {
     @Autowired
     public KwtLogisticsOrderGoodsService logisticsOrderGoodsService;
 
-    @Resource
-    private StreamBridge streamBridge;
+
 
     @Autowired
     private KwtLogisticsOrderMapper logisticsOrderMapper;
@@ -165,10 +160,10 @@ public class KwtAcceptCarriageOrderImportService {
         checkDataFormat(driverExcels, messageList);
 
         /**数据存储*/
-        saveExternalImportExcel(driverExcels);
+//        saveExternalImportExcel(driverExcels);
 
         /**导入数据推送至消息列表*/
-        pushMessage(messageList, driverExcels.size());
+//        pushMessage(messageList, driverExcels.size());
         return HttpResult.ok("导入文件成功");
     }
 
@@ -224,120 +219,17 @@ public class KwtAcceptCarriageOrderImportService {
             carriageUnit.setTopEntId(entCacheResDto1 == null ? null : entCacheResDto1.getId());
             carriageUnit.setFirmName(acceptName);
             carriageUnit.setContactsId(Long.parseLong(acceptContactsId));
-            commonService.importExcelToMessage(consignUnit, carriageUnit, String.valueOf(number), LoginUserHolder.getUserId(), LoginUserHolder.getEntId()
-                    , messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl()
-                    , messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl()
-                    , MessageEnum.ACCEPT_CARRIAGE_IMPORT_EXCEL, MessageEnum.CONSIGN_IMPORT_EXCEL
-                    , "1"
-            );
-        }
-    }
-
-    /**
-     * 数据存储
-     *
-     * @param driverExcels 导入文件数据
-     */
-    private void saveExternalImportExcel(List<LogisticsOrderExcelImportDTO> driverExcels) {
-
-        //商品分类
-        Map<String, SysDictResDto> dictResDtoMap = remoteSystemService.queryDictMapByType(DictTypeEnum.INDUSTRY_TYPE.getType());
-        Map<String, SysDictResDto> goodsModel = dictResDtoMap.values().stream().collect(Collectors.toMap(SysDictResDto::getLabel, v -> v));
-
-        //计费方式
-        Map<String, SysDictResDto> chargingTypeMap = remoteSystemService.queryDictMapByType(DictTypeEnum.CHARGING_TYPE.getType());
-        Map<String, SysDictResDto> chargingType = chargingTypeMap.values().stream().collect(Collectors.toMap(SysDictResDto::getLabel, v -> v));
-
-        //运价方式/扣亏货值
-        Map<String, SysDictResDto> priceTypeMap = remoteSystemService.queryDictMapByType(DictTypeEnum.PRICE_TYPE.getType());
-        Map<String, SysDictResDto> priceTypeEnum = priceTypeMap.values().stream().collect(Collectors.toMap(SysDictResDto::getLabel, v -> v));
-
-        //结算周期
-        Map<String, SysDictResDto> settlementCycleMap = remoteSystemService.queryDictMapByType(DictTypeEnum.SETTLEMENT_CYCLE.getType());
-        Map<String, SysDictResDto> settlementCycleEnum = settlementCycleMap.values().stream().collect(Collectors.toMap(SysDictResDto::getLabel, v -> v));
-
-        //支付方式
-        Map<String, SysDictResDto> tradeMap = remoteSystemService.queryDictMapByType(DictTypeEnum.TRADE_TYPE.getType());
-        Map<String, SysDictResDto> tradeEnum = tradeMap.values().stream().collect(Collectors.toMap(SysDictResDto::getLabel, v -> v));
-
-        //计量单位
-        Map<String, SysDictResDto> unitTypeMap = remoteSystemService.queryDictMapByType(DictTypeEnum.UNIT_TYPE.getType());
-        Map<String, SysDictResDto> unitTypeEnum = unitTypeMap.values().stream().collect(Collectors.toMap(SysDictResDto::getLabel, v -> v));
-
-        int number = 0;
-        for (LogisticsOrderExcelImportDTO excelImport : driverExcels) {
-            number = number + 1;
-            commonService.getRedisGenerateOrderNo();
-            /**生成订单编号*/
-            String lOrderNo = OrderGenerateSeqNoUtils.getSeqNo(RedisOrderGenerateEnum.LOGISTICS_ORDER, OrderRuleEnum.LOGISTICS_ORDER, "2", "0", "0");
-            HttpResult httpResult = ValidUtil.serviceValid(excelImport);
-            if (!String.valueOf(HttpStatus.SUCCESS_CODE).equals(String.valueOf(httpResult.getCode()))) {
-                throw new RuntimeException(httpResult.getMsg());
-            }
-            String consignCompany = excelImport.getConsignCompany().trim();
-            KwsEnterpriseResDto consignEnterprise = remoteSystemService.findEnterpriseByName(consignCompany);
-            String acceptCarriageCompany = excelImport.getAcceptCarriageCompany().trim();
-            KwsEnterpriseResDto acceptCarriageEnterprise = remoteSystemService.findEnterpriseByName(acceptCarriageCompany);
-            List<FindEntCooperateResVo> entCooperate = remoteManageService.findEntCooperate(acceptCarriageEnterprise.getId(), consignEnterprise.getId(), CooperateTypeEnum.CONSIGN.getCode());
-            if (entCooperate == null) {
-                throw new RuntimeException("第" + number + "行,该托运企业与我方并无合作关系!");
-            }
-            /**保存新建数据*/
-            Long lOrderId = new IdWorker(NumberConstant.ONE).nextId();
-            /**根据合同计算当前单据状态*/
-            /**判断生成物流订单应生成哪一种单据状态*/
-            String contractNo = excelImport.getContract().trim();
-            ContractLogisticsOrderResDto commonInfoResDto = remoteContractService.getContractByContractNo(contractNo, acceptCarriageEnterprise.getId(), consignEnterprise.getId());
-            /**状态判断
-             * 是否是已签约合同
-             * */
-            // 0 已签约 1待签约
-            Integer status = commonInfoResDto.getStatus();
-            Integer orderStatus = LogisticsOrderEnum.PENDING_ORDER.getCode();
-            if (NumberConstant.ONE == status) {
-                orderStatus = LogisticsOrderEnum.TO_BE_PLANNED.getCode();
-            } else if (NumberConstant.ZERO == status) {
-                orderStatus = LogisticsOrderEnum.WAIT_DELIVERY.getCode();
-            } else {
-                log.info("导入订单异常,合同状态:{}", status);
-                throw new BusinessException("导入订单异常");
-            }
-            saveLogisticsOrder(excelImport, lOrderId, orderStatus, lOrderNo, chargingType, priceTypeEnum, settlementCycleEnum, tradeEnum, unitTypeEnum);
-            saveLogisticsOrderAddress(excelImport, lOrderId);
-            saveLogisticsOrderGoods(excelImport, lOrderId, lOrderNo);
-            saveLogisticsOrderContract(excelImport, lOrderId, commonInfoResDto);
-            saveLogisticsOrderTrack(lOrderId, orderStatus);
-            saveLogisticsOrderUnit(excelImport, lOrderId);
-            //目前物流订单未使用MongoDB
-//            saveMongoDb(excelImport, orderStatus, lOrderId, lOrderNo, commonInfoResDto);
-//            /**发送信息至消息列表*/
-//            //托运单位
-//            EntCacheResDto entCacheResDto = remoteSystemService.queryEntCacheById(consignEnterprise.getId());
-//            KwtLogisticsOrderUnit consignUnit = new KwtLogisticsOrderUnit();
-//            consignUnit.setUnitType(NumberConstant.ONE);
-//            consignUnit.setEntId(consignEnterprise.getId());
-//            consignUnit.setTopEntId(entCacheResDto == null ? null : entCacheResDto.getId());
-//            consignUnit.setFirmName(excelImport.getConsignCompany());
-//            consignUnit.setContactsId(consignEnterprise.getContacts());
-//
-//            //承运单位
-//            EntCacheResDto entCacheResDto1 = remoteSystemService.queryEntCacheById(Long.parseLong(orderDTO.getAcceptCompanyId()));
-//            KwtLogisticsOrderUnit carriageUnit = new KwtLogisticsOrderUnit();
-//            carriageUnit.setUnitType(NumberConstant.TWO);
-//            carriageUnit.setEntId(Long.parseLong(orderDTO.getAcceptCompanyId()));
-//            carriageUnit.setTopEntId(entCacheResDto1 == null ? null : entCacheResDto1.getId());
-//            carriageUnit.setFirmName(orderDTO.getAcceptCompany());
-//            carriageUnit.setContactsId(Long.parseLong(orderDTO.getAcceptContactsId()));
-//            commonService.newSendLogisticsOrderToMessage(consignUnit, carriageUnit, lOrderNo, LoginUserHolder.getUserId(), LoginUserHolder.getEntId()
+//            commonService.importExcelToMessage(consignUnit, carriageUnit, String.valueOf(number), LoginUserHolder.getUserId(), LoginUserHolder.getEntId()
 //                    , messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl()
 //                    , messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl()
-//                    , MessageEnum.NEW_LOGISTICS_ORDER, MessageEnum.NEW_CARRIAGE_ORDER
+//                    , MessageEnum.ACCEPT_CARRIAGE_IMPORT_EXCEL, MessageEnum.CONSIGN_IMPORT_EXCEL
 //                    , "1"
 //            );
         }
-
     }
 
+
+
     /**
      * 物流订单单位
      *

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

@@ -1,734 +0,0 @@
-package com.sckw.transport.service;
-
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson2.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.sckw.contract.api.RemoteContractService;
-import com.sckw.core.model.constant.NumberConstant;
-import com.sckw.core.common.enums.enums.DictEnum;
-import com.sckw.core.exception.BusinessException;
-import com.sckw.core.model.constant.Global;
-import com.sckw.core.model.enums.*;
-import com.sckw.core.utils.*;
-import com.sckw.core.web.context.LoginUserHolder;
-import com.sckw.fleet.api.RemoteFleetService;
-import com.sckw.fleet.api.model.vo.RDriverVo;
-import com.sckw.mongo.model.TableTops;
-import com.sckw.redis.constant.RedisConstant;
-import com.sckw.redis.utils.RedissonUtils;
-import com.sckw.stream.enums.MessageEnum;
-import com.sckw.stream.model.SckwMessage;
-import com.sckw.stream.model.UserInfo;
-import com.sckw.system.api.RemoteSystemService;
-import com.sckw.system.api.model.dto.res.EntCacheResDto;
-import com.sckw.system.api.model.dto.res.SysDictResDto;
-import com.sckw.system.api.model.dto.res.UserCacheResDto;
-import com.sckw.transport.common.config.MessageUrlConfig;
-import com.sckw.transport.dao.KwtLogisticsOrderContractMapper;
-import com.sckw.transport.dao.KwtLogisticsOrderMapper;
-import com.sckw.transport.dao.KwtWaybillOrderMapper;
-import com.sckw.transport.dao.KwtWaybillOrderV1Mapper;
-import com.sckw.transport.model.KwtLogisticsOrder;
-import com.sckw.transport.model.KwtLogisticsOrderContract;
-import com.sckw.transport.model.KwtLogisticsOrderUnit;
-import com.sckw.transport.model.dto.AddOrderDTO;
-import com.sckw.transport.model.vo.UserInfoVo;
-import com.sckw.transport.model.vo.WaybillCountVo;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.annotation.DubboReference;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cloud.stream.function.StreamBridge;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * @author lfdc
- * @desc 通用Service
- * @date 2023-07-06 13:07:43
- */
-@Slf4j
-@Service
-public class KwtCommonService {
-
-    @Autowired
-    private StreamBridge streamBridge;
-
-    @Autowired
-    private MessageUrlConfig messageUrlConfig;
-
-    @Value("${message.logistics.order.consignLogisticsOrderUrl}")
-    private String consignLogisticsOrderUrl;
-
-    @Value("${message.logistics.order.carriageLogisticsOrderUrl}")
-    private String carriageLogisticsOrderUrl;
-
-    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 8000)
-    RemoteSystemService remoteSystemService;
-
-    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 8000)
-    RemoteContractService remoteContractService;
-
-    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 8000)
-    RemoteFleetService remoteFleetService;
-
-    @Autowired
-    private KwtLogisticsOrderMapper logisticsOrderMapper;
-
-    @Autowired
-    private KwtLogisticsOrderContractMapper logisticsOrderContractMapper;
-
-    @Autowired
-    private KwtWaybillOrderV1Mapper kwtWaybillOrderV1Mapper;
-
-    /**
-     * 组装返回数据
-     *
-     * @param mappedResults 请求参数
-     * @param arrayList     请求参数
-     */
-    public List<TableTops> packageReturnStatistics(List<com.sckw.mongo.model.TableTops> mappedResults, List<TableTops> arrayList) {
-        List<String> codeList = LogisticsOrderEnum.getCodeStringList();
-        List<String> collect = mappedResults.stream().map(e -> e.getValue()).collect(Collectors.toList());
-        List<String> diffrentList = getDiffrentList(collect, codeList);
-        if (CollectionUtils.isNotEmpty(mappedResults)) {
-            if (CollectionUtils.isNotEmpty(diffrentList)) {
-                for (String s : diffrentList) {
-                    TableTops top = new TableTops();
-                    top.setValue(s);
-                    top.setTotal(NumberConstant.ZERO);
-                    arrayList.add(top);
-                }
-            }
-            for (TableTops top : arrayList) {
-                top.setName(LogisticsOrderEnum.getName(Integer.valueOf(top.getValue())));
-            }
-        } else {
-            for (LogisticsOrderEnum logisticsOrderEnum : LogisticsOrderEnum.values()) {
-                TableTops top = new TableTops();
-                top.setName(logisticsOrderEnum.getDestination());
-                top.setValue(logisticsOrderEnum.getStatus());
-                top.setTotal(NumberConstant.ZERO);
-                arrayList.add(top);
-            }
-        }
-        arrayList = arrayList.stream().sorted(Comparator.comparing(TableTops::getValue)).collect(Collectors.toList());
-        if (CollectionUtils.isNotEmpty(arrayList)) {
-            int total = 0;
-            for (TableTops tops : arrayList) {
-                if (LogisticsOrderEnum.REJECT_ORDER.getStatus().equals(tops.getValue())) {
-                    total = total + tops.getTotal();
-                }
-                if (LogisticsOrderEnum.CANCEL_ORDER.getStatus().equals(tops.getValue())) {
-                    total = total + tops.getTotal();
-                }
-            }
-            for (TableTops tops : arrayList) {
-                if (LogisticsOrderEnum.SEND_BACK.getStatus().equals(tops.getValue())) {
-                    tops.setTotal(tops.getTotal() + total);
-                }
-            }
-            Iterator iterator = arrayList.iterator();
-            while (iterator.hasNext()) {
-                TableTops tableTops = (TableTops) iterator.next();
-                if (tableTops.getValue().equals(LogisticsOrderEnum.REJECT_ORDER.getStatus())) {
-                    iterator.remove();
-                }
-                if (tableTops.getValue().equals(LogisticsOrderEnum.CANCEL_ORDER.getStatus())) {
-                    iterator.remove();
-                }
-            }
-            /**补全统计【全部字段】*/
-            Integer sum = Math.toIntExact(arrayList.stream().filter(item -> ObjectUtil.isNotEmpty(item.getTotal())).collect(Collectors.summarizingInt(item -> item.getTotal())).getSum());
-            TableTops top = new TableTops();
-            top.setName("全部");
-            top.setValue("all");
-            top.setTotal(sum);
-            arrayList.add(0, top);
-        }
-        return arrayList;
-    }
-
-    public List<String> getDiffrentList(List<String> sourceList, List<String> targetList) {
-        return targetList.stream().filter(item -> sourceList.stream().allMatch(each -> !item.equals(each))).collect(Collectors.toList());
-    }
-
-    public Map<String, String> getDictData(String type) {
-        Map<String, String> maps = new HashMap<>(NumberConstant.SIXTEEN);
-        List<SysDictResDto> list = remoteSystemService.queryDictByType(type);
-        if (CollectionUtils.isNotEmpty(list)) {
-            maps = list.stream().collect(Collectors.toMap(SysDictResDto::getValue, SysDictResDto::getLabel, (key1, key2) -> key2));
-        }
-        return maps;
-    }
-
-    /**
-     * 获取生成单据号最大值处理(处理redis宕机或者重启情况)
-     */
-    public void getRedisGenerateOrderNo() {
-        Date date = new Date();
-        String lockKey = String.format(RedisConstant.LOGISTICS_NO_GENERATE_KEY, DateUtils.formatDateToYYMMDD(date));
-        try {
-            String key = OrderGenerateSeqNoUtils.getKey(RedisOrderGenerateEnum.LOGISTICS_ORDER, OrderRuleEnum.LOGISTICS_ORDER, date);
-            if (Boolean.FALSE.equals(RedissonUtils.exists(key))) {
-                if (Boolean.FALSE.equals(RedissonUtils.tryLock(lockKey, 5L, 10L))) {
-                    throw new BusinessException("业务繁忙，请稍后再试！");
-                }
-                DateTime dateTime = DateUtils.beginOfDay(date);
-                String maxOrderNo = logisticsOrderMapper.getMaxOrderNoByDate(dateTime);
-                if (StringUtils.isNotBlank(maxOrderNo)) {
-                    String substring = maxOrderNo.substring(0, 11);
-                    Long maxNum = Long.valueOf(StringUtils.subStrFromIndexToEnd(substring, 4));
-                    RedissonUtils.setAtomicLong(key, maxNum, DateUtils.getSecondsDay());
-                }
-            }
-        } catch (Exception e) {
-            log.error("物流订单获取生成单据号最大值处理异常：{}", e.getMessage(), e);
-        } finally {
-            RedissonUtils.unlock(lockKey);
-        }
-    }
-
-    /**
-     * 修改合同履约量
-     *
-     * @param loadAmount   装货量
-     * @param unloadAmount 卸货量
-     */
-    public void updatePerformed(KwtLogisticsOrder logisticsOrder, BigDecimal loadAmount, BigDecimal unloadAmount) {
-        /**
-         * 更新合同履约量
-         * 根据单据计费方式处理【目前只考虑 按照装货量 按照卸货量 】*/
-        String billingMode = logisticsOrder.getBillingMode();
-        BigDecimal actualAmount = NumberConstant.ZERO_TWO;
-        if (DictEnum.CHARGING_TYPE_1.getValue().equals(billingMode)) {
-            actualAmount = loadAmount;
-        } else if (DictEnum.CHARGING_TYPE_2.getValue().equals(billingMode)) {
-            actualAmount = unloadAmount;
-        } else if (DictEnum.CHARGING_TYPE_3.getValue().equals(billingMode)) {
-            /*// 物流订单运单趟次数量
-            Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN) {{
-                put("upperlOrderId", logisticsOrder.getId());
-                put("passStatus", Global.NUMERICAL_ONE);
-            }};
-            WaybillCountVo waybillOrderCount = kwtWaybillOrderV1Mapper.findWaybillOrderCount(map);
-            actualAmount = waybillOrderCount == null ? NumberConstant.ZERO_TWO : new BigDecimal(waybillOrderCount.getTotalComplete());*/
-            actualAmount = BigDecimal.valueOf(logisticsOrder.getTotalTake());
-        } else if (DictEnum.CHARGING_TYPE_4.getValue().equals(billingMode)) {
-            log.debug("“该方式不处理合同");
-        } else {
-            throw new BusinessException("单据计费方式错误!");
-        }
-        KwtLogisticsOrderContract contract = logisticsOrderContractMapper.selectOne(
-                new LambdaQueryWrapper<KwtLogisticsOrderContract>()
-                        .eq(KwtLogisticsOrderContract::getLOrderId, logisticsOrder.getId()));
-        remoteContractService.updatePerformed(contract.getContractId(), actualAmount);
-    }
-
-    /**
-     * @desc 查询用户信息
-     * @param userIds 企业用户ID+司机ID
-     * @desc 查询用户信息
-     * @author zk
-     * @date 2023/9/7
-     **/
-    public List<UserInfoVo> findUserList(List<Long> userIds) {
-        List<UserInfoVo> userList = new ArrayList<>();
-        //用户数据集
-        userIds = userIds.stream().distinct().collect(Collectors.toList());
-        Map<Long, UserCacheResDto> users = remoteSystemService.queryUserCacheMapByIds(userIds);
-        users.forEach((key, value) -> {
-            UserInfoVo userInfo = new UserInfoVo();
-            BeanUtils.copyProperties(value, userInfo);
-            userList.add(userInfo);
-        });
-
-        Map<Long, RDriverVo> drivers = remoteFleetService.findDriver(userIds);
-        drivers.forEach((key, value) -> {
-            UserInfoVo userInfo = new UserInfoVo();
-            BeanUtils.copyProperties(value, userInfo);
-            userList.add(userInfo);
-        });
-        return userList;
-    }
-
-
-    public void importExcelToMessage(KwtLogisticsOrderUnit consignUnit, KwtLogisticsOrderUnit carriageUnit,
-                                     String number, Long createBy, Long entId,
-                                     String pcConsignUrl, String appConsignUrl,
-                                     String pcCarriageUrl, String appCarriageUrl,
-                                     MessageEnum consignMessageEnum,
-                                     MessageEnum carriageMessageEnum,
-                                     String type) {
-        boolean flag = createBy.equals(consignUnit.getContactsId()) || createBy.equals(carriageUnit.getContactsId());
-        Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN);
-        map.put("number", number);
-        if (flag && createBy.equals(consignUnit.getContactsId())) {
-            sendLogisticsConsignMessage(consignUnit, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
-            sendLogisticsCarriageMessage(carriageUnit, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
-        } else if (flag && createBy.equals(carriageUnit.getContactsId())) {
-            sendLogisticsCarriageMessage(carriageUnit, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
-            sendLogisticsConsignMessage(consignUnit, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
-        } else {
-            sendLogisticsConsignMessage(consignUnit, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
-            sendLogisticsCarriageMessage(carriageUnit, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
-            if ("1".equals(type)) {
-                map.put("companyName", consignUnit.getFirmName());
-                sendLogisticsCreateByMessage(createBy, entId, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
-            } else {
-                map.put("companyName", carriageUnit.getFirmName());
-                sendLogisticsCreateByMessage(createBy, entId, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
-            }
-        }
-    }
-
-    /**
-     * 发起物流托运-[贸易订单物流托运确认/承运订单分包托运确认]
-     *
-     * @param consignUnit    托运单位
-     * @param carriageUnit   承运单位
-     * @param orderNo        单据号
-     * @param createBy       创建人
-     * @param entId          创建数据的企业id
-     * @param pcConsignUrl   PC托运地址
-     * @param appConsignUrl  app托运地址
-     * @param pcCarriageUrl  PC承运地址
-     * @param appCarriageUrl app承运地址
-     * @param type           1代表给托运创建人发 2代表给承运创建人发
-     */
-    public void newSendLogisticsOrderToMessage(KwtLogisticsOrderUnit consignUnit, KwtLogisticsOrderUnit carriageUnit,
-                                               String orderNo, Long createBy, Long entId,
-                                               String pcConsignUrl, String appConsignUrl,
-                                               String pcCarriageUrl, String appCarriageUrl,
-                                               MessageEnum consignMessageEnum,
-                                               MessageEnum carriageMessageEnum,
-                                               String type) {
-        boolean flag = createBy.equals(consignUnit.getContactsId()) || createBy.equals(carriageUnit.getContactsId());
-        Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN);
-        map.put("orderNo", orderNo);
-        if (flag && createBy.equals(consignUnit.getContactsId())) {
-            sendLogisticsConsignMessage(consignUnit, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
-            sendLogisticsCarriageMessage(carriageUnit, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
-        } else if (flag && createBy.equals(carriageUnit.getContactsId())) {
-            sendLogisticsCarriageMessage(carriageUnit, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
-            sendLogisticsConsignMessage(consignUnit, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
-        } else {
-            sendLogisticsConsignMessage(consignUnit, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
-            sendLogisticsCarriageMessage(carriageUnit, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
-            if ("1".equals(type)) {
-                map.put("companyName", consignUnit.getFirmName());
-                sendLogisticsCreateByMessage(createBy, entId, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
-            } else {
-                map.put("companyName", carriageUnit.getFirmName());
-                sendLogisticsCreateByMessage(createBy, entId, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
-            }
-        }
-    }
-
-    /**
-     * 发送消息
-     *
-     * @param createBy    创建人
-     * @param entId       企业ID
-     * @param map         消息内容
-     * @param pcUrl       pc调整地址
-     * @param appUrl      app调整地址
-     * @param messageEnum 消息模板
-     */
-    public void sendLogisticsCreateByMessage(Long createBy, Long entId, Map<String, Object> map, String pcUrl, String appUrl, MessageEnum messageEnum) {
-        UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(createBy);
-        String name = remoteSystemService.queryUserCacheById(createBy).getName();
-        //给订单创建人发消息
-        List<UserInfo> userInfos = new ArrayList<>();
-        UserInfo createUser = new UserInfo();
-        createUser.setUserId(createBy).setEntId(entId);
-        userInfos.add(createUser);
-        SckwMessage msg = new SckwMessage();
-        msg.setRequestId(UUIDUtils.get32UUID())
-                .setMessageEnum(messageEnum)
-                .setParams(map)
-                .setMsgUrls(new HashMap<>(NumberConstant.SIXTEEN) {
-                    {
-                        put("pc", pcUrl);
-                        put("app", appUrl);
-                    }
-                })
-                .setUserInfos(userInfos)
-                .setCreateBy(LoginUserHolder.getUserId());
-        log.info("发起物流托运-[贸易订单物流托运确认/承运订单分包托运确认]-创建人：{}", JSON.toJSONString(msg));
-        log.info("发起物流托运-企业:{},消息内容:{},-创建人：{},所有消息:{}", userCacheResDto.getEntInfo().getFirmName(), messageEnum.getContent(), name, JSON.toJSONString(msg));
-        streamBridge.send("sckw-message", JSON.toJSONString(msg));
-    }
-
-    /**
-     * 给业务联系人发消息[承运方]
-     *
-     * @param carriageUnit 承运单位
-     * @param map          消息参数
-     * @param pcUrl        pc端调整地址
-     * @param appUrl       app调整地址
-     * @param messageEnum  消息模板
-     */
-    public void sendLogisticsCarriageMessage(KwtLogisticsOrderUnit carriageUnit, Map<String, Object> map, String pcUrl, String appUrl, MessageEnum messageEnum) {
-        //给业务联系人发消息[承运方]
-        List<UserInfo> userInfoList = new ArrayList<>();
-        UserInfo userInfo = new UserInfo();
-        UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(carriageUnit.getContactsId());
-        userInfo.setUserId(carriageUnit.getContactsId()).setEntId(carriageUnit.getTopEntId());
-        userInfoList.add(userInfo);
-        map.put("companyName", carriageUnit.getFirmName());
-        SckwMessage sckwMessage = new SckwMessage();
-        sckwMessage.setRequestId(UUIDUtils.get32UUID())
-                .setMessageEnum(messageEnum)
-                .setParams(map)
-                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
-                    put("pc", pcUrl);
-                    put("app", appUrl);
-                }})
-                .setUserInfos(userInfoList)
-                .setCreateBy(LoginUserHolder.getUserId());
-        log.info("发起物流托运-[贸易订单物流托运确认/承运订单分包托运确认]-[承运方]-业务联系人：{}", JSON.toJSONString(sckwMessage));
-        log.info("[承运方]-companyName：{}-消息：{}", carriageUnit.getFirmName(), messageEnum.getContent());
-        streamBridge.send("sckw-message", JSON.toJSONString(sckwMessage));
-    }
-
-    /**
-     * 给业务联系人发消息[托运方]
-     *
-     * @param consignUnit 发货单位
-     * @param map         消息参数
-     * @param pcUrl       pc端调整地址
-     * @param appUrl      app调整地址
-     * @param messageEnum 消息模板
-     */
-    public void sendLogisticsConsignMessage(KwtLogisticsOrderUnit consignUnit, Map<String, Object> map, String pcUrl, String appUrl, MessageEnum messageEnum) {
-        //给业务联系人发消息[托运方]
-        List<UserInfo> list = new ArrayList<>();
-        UserInfo userInfo = new UserInfo();
-//        UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(consignUnit.getContactsId());
-        userInfo.setUserId(consignUnit.getContactsId()).setEntId(consignUnit.getTopEntId());
-        list.add(userInfo);
-        map.put("companyName", consignUnit.getFirmName());
-        SckwMessage message = new SckwMessage();
-        message.setRequestId(UUIDUtils.get32UUID())
-                .setMessageEnum(messageEnum)
-                .setParams(map)
-                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
-                    put("pc", pcUrl);
-                    put("app", appUrl);
-                }})
-                .setUserInfos(list)
-                .setCreateBy(LoginUserHolder.getUserId());
-        log.info("发起物流托运-[贸易订单物流托运确认/承运订单分包托运确认]-[托运方]-业务联系人：{}", JSON.toJSONString(message));
-        log.info("[托运方]-companyName：{}-消息：{}", consignUnit.getFirmName(), messageEnum.getContent());
-        streamBridge.send("sckw-message", JSON.toJSONString(message));
-    }
-
-    /**
-     * 给承运和托运双方发送消息
-     *
-     * @param checkUnit    托运单位
-     * @param carriageUnit 承运单位
-     * @param map          消息参数
-     */
-    public void sendMessageLogistics(KwtLogisticsOrderUnit checkUnit, KwtLogisticsOrderUnit carriageUnit, Map map) {
-        //给业务联系人发消息[承运方]
-        List<UserInfo> userInfoList = new ArrayList<>();
-        UserInfo userInfo = new UserInfo();
-        userInfo.setUserId(carriageUnit.getContactsId()).setEntId(carriageUnit.getTopEntId());
-        userInfoList.add(userInfo);
-        map.put("companyName", carriageUnit.getFirmName());
-        SckwMessage sckwMessage = new SckwMessage();
-        sckwMessage.setRequestId(UUIDUtils.get32UUID())
-                .setMessageEnum(MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT)
-                .setParams(map)
-                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
-                    put("app", consignLogisticsOrderUrl);
-                    put("pc", carriageLogisticsOrderUrl);
-                }})
-                .setUserInfos(userInfoList)
-                .setCreateBy(LoginUserHolder.getUserId());
-        log.info("发起物流托运-[贸易订单物流托运确认/承运订单分包托运确认]-[承运方]-业务联系人：{}", JSON.toJSONString(sckwMessage));
-        streamBridge.send("sckw-message", JSON.toJSONString(sckwMessage));
-
-        //给业务联系人发消息[托运方]
-        List<UserInfo> list = new ArrayList<>();
-        UserInfo userInfo1 = new UserInfo();
-        userInfo1.setUserId(checkUnit.getContactsId()).setEntId(checkUnit.getTopEntId());
-        list.add(userInfo);
-        map.put("companyName", checkUnit.getFirmName());
-        SckwMessage message = new SckwMessage();
-        message.setRequestId(UUIDUtils.get32UUID())
-                .setMessageEnum(MessageEnum.NEW_CARRIAGE_ORDER)
-                .setParams(map)
-                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
-                    put("app", consignLogisticsOrderUrl);
-                    put("pc", carriageLogisticsOrderUrl);
-                }})
-                .setUserInfos(list)
-                .setCreateBy(LoginUserHolder.getUserId());
-        log.info("发起物流托运-[贸易订单物流托运确认/承运订单分包托运确认]-[托运方]-业务联系人：{}", JSON.toJSONString(message));
-        streamBridge.send("sckw-message", JSON.toJSONString(message));
-    }
-
-    public void newLogisticsOrder(AddOrderDTO addOrderDTO, String lOrderNo, Long createBy, Long entId) {
-        //发起方
-        EntCacheResDto entCacheResDto = remoteSystemService.queryEntCacheById(Long.parseLong(addOrderDTO.getConsignCompanyId()));
-        KwtLogisticsOrderUnit consignUnit = new KwtLogisticsOrderUnit();
-        consignUnit.setUnitType(NumberConstant.ONE);
-        consignUnit.setEntId(Long.parseLong(addOrderDTO.getConsignCompanyId()));
-        consignUnit.setTopEntId(entCacheResDto == null ? null : entCacheResDto.getId());
-        consignUnit.setFirmName(addOrderDTO.getAcceptCompany());
-        consignUnit.setContactsId(Long.parseLong(addOrderDTO.getConsignContactsId()));
-
-        //接收方
-        EntCacheResDto entCacheResDto1 = remoteSystemService.queryEntCacheById(Long.parseLong(addOrderDTO.getAcceptCompanyId()));
-        KwtLogisticsOrderUnit carriageUnit = new KwtLogisticsOrderUnit();
-        carriageUnit.setUnitType(NumberConstant.TWO);
-        carriageUnit.setEntId(Long.parseLong(addOrderDTO.getAcceptCompanyId()));
-        carriageUnit.setTopEntId(entCacheResDto1 == null ? null : entCacheResDto1.getId());
-        carriageUnit.setFirmName(addOrderDTO.getConsignCompany());
-        carriageUnit.setContactsId(Long.parseLong(addOrderDTO.getAcceptContactsId()));
-
-        newSendLogisticsOrderToMessage(consignUnit, carriageUnit, lOrderNo, createBy, entId
-                , messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(),
-                messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(),
-                MessageEnum.NEW_LOGISTICS_ORDER, MessageEnum.NEW_CARRIAGE_ORDER, "1"
-        );
-
-    }
-
-    /**
-     * 推送消息
-     *
-     * @param consignUnit        托运单位
-     * @param carriageUnit       承运单位
-     * @param map                消息参数
-     * @param consignMessageEnum 消息模板
-     */
-    private void sendMessagePublicLogistics(KwtLogisticsOrderUnit consignUnit, KwtLogisticsOrderUnit carriageUnit, Map<String, Object> map, MessageEnum consignMessageEnum) {
-        //给业务联系人发消息[承运方]
-        List<UserInfo> userInfoList = new ArrayList<>();
-        UserInfo userInfo = new UserInfo();
-        userInfo.setUserId(carriageUnit.getContactsId()).setEntId(carriageUnit.getTopEntId());
-        userInfoList.add(userInfo);
-        map.put("companyName", carriageUnit.getFirmName());
-        SckwMessage sckwMessage = new SckwMessage();
-        sckwMessage.setRequestId(UUIDUtils.get32UUID())
-                .setMessageEnum(consignMessageEnum)
-                .setParams(map)
-                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
-                    put("pc", consignLogisticsOrderUrl);
-                    put("app", carriageLogisticsOrderUrl);
-                }})
-                .setUserInfos(userInfoList)
-                .setCreateBy(LoginUserHolder.getUserId());
-        log.info(MessageEnum.getDesc(consignMessageEnum) + "-[承运方]-业务联系人：{}", JSON.toJSONString(sckwMessage));
-        streamBridge.send("sckw-message", JSON.toJSONString(sckwMessage));
-
-
-        //给业务联系人发消息[托运方]
-        List<UserInfo> list = new ArrayList<>();
-        UserInfo userInfo1 = new UserInfo();
-        userInfo1.setUserId(consignUnit.getContactsId()).setEntId(consignUnit.getTopEntId());
-        list.add(userInfo1);
-        map.put("companyName", consignUnit.getFirmName());
-        SckwMessage message = new SckwMessage();
-        message.setRequestId(UUIDUtils.get32UUID())
-                .setMessageEnum(MessageEnum.NEW_CARRIAGE_ORDER)
-                .setParams(map)
-                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
-                    put("pc", consignLogisticsOrderUrl);
-                    put("app", carriageLogisticsOrderUrl);
-                }})
-                .setUserInfos(list)
-                .setCreateBy(LoginUserHolder.getUserId());
-        log.info(MessageEnum.getDesc(consignMessageEnum) + "-[托运方]-业务联系人：{}", JSON.toJSONString(message));
-        streamBridge.send("sckw-message", JSON.toJSONString(message));
-    }
-
-
-    /**
-     * 推送消息
-     *
-     * @param consignUnit         托运单位
-     * @param carriageUnit        承运单位
-     * @param map                 参数
-     * @param consignMessageEnum  托运枚举
-     * @param carriageMessageEnum 承运枚
-     */
-    private void sendPushMessageByUrlLogistics(KwtLogisticsOrderUnit consignUnit, KwtLogisticsOrderUnit carriageUnit,
-                                               Map<String, Object> map,
-                                               MessageEnum consignMessageEnum,
-                                               MessageEnum carriageMessageEnum) {
-        //给业务联系人发消息[承运方]
-        List<UserInfo> userInfoList = new ArrayList<>();
-        UserInfo userInfo = new UserInfo();
-        userInfo.setUserId(carriageUnit.getContactsId()).setEntId(carriageUnit.getTopEntId());
-        userInfoList.add(userInfo);
-        map.put("companyName", carriageUnit.getFirmName());
-        SckwMessage sckwMessage = new SckwMessage();
-        sckwMessage.setRequestId(UUIDUtils.get32UUID())
-                .setMessageEnum(carriageMessageEnum)
-                .setParams(map)
-                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
-                    put("pc", messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl());
-                    put("app", messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl());
-                }})
-                .setUserInfos(userInfoList)
-                .setCreateBy(LoginUserHolder.getUserId());
-        log.info(MessageEnum.getDesc(carriageMessageEnum) + "-[承运方]-业务联系人：{}", JSON.toJSONString(sckwMessage));
-        streamBridge.send("sckw-message", JSON.toJSONString(sckwMessage));
-
-
-        //给业务联系人发消息[托运方]
-        List<UserInfo> list = new ArrayList<>();
-        UserInfo userInfo1 = new UserInfo();
-        userInfo1.setUserId(consignUnit.getContactsId()).setEntId(consignUnit.getTopEntId());
-        list.add(userInfo1);
-        map.put("companyName", consignUnit.getFirmName());
-        SckwMessage message = new SckwMessage();
-        message.setRequestId(UUIDUtils.get32UUID())
-                .setMessageEnum(consignMessageEnum)
-                .setParams(map)
-                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
-                    put("pc", messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl());
-                    put("app", messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl());
-                }})
-                .setUserInfos(list)
-                .setCreateBy(LoginUserHolder.getUserId());
-        log.info(MessageEnum.getDesc(consignMessageEnum) + "-[托运方]-业务联系人：{}", JSON.toJSONString(message));
-        streamBridge.send("sckw-message", JSON.toJSONString(message));
-    }
-
-    /**
-     * 验证当前物流订单是否存在未完结的车辆运单
-     *
-     * @param id 对应物流订单id
-     */
-    public boolean judgmentWaybillOrderIsFinish(String id) {
-        boolean flag = false;
-        List<Integer> statusList = new ArrayList<>();
-//        statusList.add(CarWaybillEnum.PENDING_ORDER.getCode());
-        statusList.add(CarWaybillEnum.PENDING_VEHICLE.getCode());
-        statusList.add(CarWaybillEnum.EXIT_COMPLETED.getCode());
-        statusList.add(CarWaybillEnum.WAIT_LOADING.getCode());
-        statusList.add(CarWaybillEnum.COMPLETION_LOADING.getCode());
-        statusList.add(CarWaybillEnum.WAIT_UNLOADING.getCode());
-        statusList.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode());
-        statusList.add(CarWaybillEnum.APPROVAL_IN.getCode());
-        statusList.add(CarWaybillEnum.APPROVAL_NO_PASS.getCode());
-//        statusList.add(CarWaybillEnum.APPROVAL_PASS.getCode());
-        int count = kwtWaybillOrderV1Mapper.selectDataByLorderId(id, statusList);
-        if (count > NumberConstant.ZERO) {
-            flag = true;
-        }
-        return flag;
-    }
-
-    /**
-     * @param loadAmount    装货量
-     * @param deficitAmount 亏吨量
-     * @param loss          合理损耗
-     * @desc 计算扣亏量
-     **/
-    public BigDecimal deficitAmount(BigDecimal loadAmount, BigDecimal deficitAmount, BigDecimal entrustAmount, BigDecimal loss, String lossUnit) {
-        //亏吨<=0
-        if (deficitAmount.compareTo(new BigDecimal(Global.AMOUNT)) <= 0) {
-            return new BigDecimal(Global.AMOUNT);
-        }
-        //合理损耗
-        loss = loss == null ? new BigDecimal(Global.AMOUNT) : loss;
-        if (loss.doubleValue() > 0 && StringUtils.isNotBlank(lossUnit)) {
-            if (lossUnit.equals(String.valueOf(TaxRateTypeEnum.PERCENT.getCode()))) {
-                loss = loss.divide(new BigDecimal(TaxRateTypeEnum.PERCENT.getValue()));
-            }
-            if (lossUnit.equals(String.valueOf(TaxRateTypeEnum.MILLIMETER.getCode()))) {
-                loss = loss.divide(new BigDecimal(TaxRateTypeEnum.MILLIMETER.getValue()));
-            }
-        }
-        /**
-         * 一、罚款值计算：
-         * 1、合理损耗值=实装量*合理损耗（‰）
-         * 1.1 亏吨量= 实装量-实卸量
-         * 2、扣亏量=亏吨量-合理损耗值【要求大于0，如果小于0则扣亏货量取0】
-         * 3、罚款值=扣亏量 * 扣亏货值
-         *
-         * 二、运价计算：
-         * 1、按装货量：总运价=实装量*运价
-         * 2、按卸货量：总运价=实卸量*运价-罚款值
-         * 3、按趟次：总运价=运价*趟次【后期加】
-         */
-        loadAmount = loadAmount == null ? new BigDecimal(Global.AMOUNT) : loadAmount;
-        //已委托量
-        entrustAmount = entrustAmount == null ? new BigDecimal(Global.AMOUNT) : entrustAmount;
-        //合理损耗值
-        BigDecimal multiply = loadAmount.multiply(loss.divide(BigDecimal.valueOf(1000L)));
-        //亏吨量
-        deficitAmount = deficitAmount == null ? new BigDecimal(Global.AMOUNT) : deficitAmount;
-        //扣亏量/吨
-        deficitAmount = deficitAmount.compareTo(new BigDecimal(Global.AMOUNT)) == 0 ? new BigDecimal(Global.AMOUNT) : deficitAmount.subtract(multiply);
-        return deficitAmount;
-    }
-
-    /**
-     * @param loadAmount    装货量
-     * @param deficitAmount 亏吨量
-     * @param loss          合理损耗
-     * @desc 计算扣亏量
-     * @author zk
-     * @date 2023/7/27
-     **/
-    public BigDecimal deficitLossAmount(BigDecimal loadAmount, BigDecimal deficitAmount, BigDecimal loss, String lossUnit) {
-        //亏吨<=0
-//        if (deficitAmount.compareTo(new BigDecimal(Global.AMOUNT)) <= 0) {
-//            return new BigDecimal(Global.AMOUNT);
-//        }
-//        //承运订单亏吨扣款=（承运订单亏吨量 -（承运订单装货量 * 承运订单合理损耗））* 扣亏货值
-//        loss = loss == null ? new BigDecimal(Global.AMOUNT) : loss;
-//        if (loss.doubleValue() > 0 && StringUtils.isNotBlank(lossUnit)) {
-//            if (lossUnit.equals(String.valueOf(TaxRateTypeEnum.PERCENT.getCode()))) {
-//                loss = loss.divide(new BigDecimal(TaxRateTypeEnum.PERCENT.getValue()));
-//            }
-//            if (lossUnit.equals(String.valueOf(TaxRateTypeEnum.MILLIMETER.getCode()))) {
-//                loss = loss.divide(new BigDecimal(TaxRateTypeEnum.MILLIMETER.getValue()));
-//            }
-//        }
-//        //扣亏量
-//        BigDecimal deficitPrice = deficitAmount.subtract(loadAmount.multiply(loss).setScale(4, RoundingMode.HALF_UP));
-//        return deficitPrice;
-
-        if (StringUtils.isBlank(lossUnit)) {
-            lossUnit = String.valueOf(NumberConstant.ZERO);
-        }
-        //亏吨<=0
-        if (deficitAmount.compareTo(new BigDecimal(Global.AMOUNT)) <= 0) {
-            return new BigDecimal(Global.AMOUNT);
-        }
-        //承运订单亏吨扣款=（承运订单亏吨量 -（承运订单装货量 * 承运订单合理损耗））* 扣亏货值
-        loss = loss == null ? new BigDecimal(Global.AMOUNT) : loss;
-        if (loss.doubleValue() > 0 && StringUtils.isNotBlank(lossUnit)) {
-            if (lossUnit.equals(String.valueOf(TaxRateTypeEnum.PERCENT.getCode()))) {
-                loss = loss.divide(new BigDecimal(TaxRateTypeEnum.PERCENT.getValue()));
-            }
-            if (lossUnit.equals(String.valueOf(TaxRateTypeEnum.MILLIMETER.getCode()))) {
-                loss = loss.divide(new BigDecimal(TaxRateTypeEnum.MILLIMETER.getValue()));
-            }
-        }
-        //扣亏量=亏吨量【合理损耗占比为空或为0】
-        if (loss.doubleValue() == Global.NUMERICAL_ZERO) {
-            return deficitAmount;
-        }
-        //扣亏量=亏吨量-合理损耗值【要求大于0，如果小于0则扣亏货量取0】
-        BigDecimal deficitLossAmount = deficitAmount.subtract(loadAmount.multiply(loss).setScale(2, RoundingMode.HALF_UP));
-        if (deficitLossAmount.doubleValue() <= 0) {
-            return new BigDecimal(Global.AMOUNT);
-        }
-        return deficitLossAmount;
-    }
-}

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

@@ -1,57 +1,45 @@
 package com.sckw.transport.service;
 
-import cn.hutool.core.util.ArrayUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.sckw.contract.api.RemoteContractService;
 import com.sckw.contract.api.model.dto.res.ContractCommonInfoResDto;
-import com.sckw.core.common.enums.StringConstant;
 import com.sckw.core.common.enums.enums.DictEnum;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.constant.NumberConstant;
-import com.sckw.core.model.enums.*;
+import com.sckw.core.model.enums.AddressTypeEnum;
+import com.sckw.core.model.enums.LogisticsOrderEnum;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.IdWorker;
-import com.sckw.core.utils.OrderGenerateSeqNoUtils;
 import com.sckw.core.utils.StringUtils;
-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.DateUtil;
-import com.sckw.excel.utils.ValidUtil;
 import com.sckw.fleet.api.RemoteFleetService;
 import com.sckw.manage.api.RemoteManageService;
 import com.sckw.manage.api.model.dto.res.EntAddressResDto;
-import com.sckw.manage.api.model.dto.res.FindEntCooperateResVo;
 import com.sckw.manage.api.model.dto.res.LineFreightAddressRes;
-import com.sckw.mongo.enums.BusinessTypeEnum;
-import com.sckw.mongo.model.SckwLogisticsOrder;
 import com.sckw.order.api.dubbo.RemoteTradeOrderAmountService;
 import com.sckw.order.api.dubbo.TradeOrderInfoService;
-import com.sckw.order.api.model.*;
+import com.sckw.order.api.model.OrderAddressDetailRes;
+import com.sckw.order.api.model.OrderDetailRes;
 import com.sckw.product.api.dubbo.GoodsInfoService;
-import com.sckw.product.api.model.KwpGoods;
 import com.sckw.redis.config.RedisLockUtil;
-import com.sckw.redis.constant.RedisConstant;
-import com.sckw.stream.enums.MessageEnum;
-import com.sckw.stream.model.SckwBusSum;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.transport.common.config.MessageUrlConfig;
 import com.sckw.transport.dao.*;
 import com.sckw.transport.model.*;
-import com.sckw.transport.model.dto.*;
+import com.sckw.transport.model.dto.AddressInfoDto;
+import com.sckw.transport.model.dto.LineFreightDto;
+import com.sckw.transport.model.dto.LogisticsConsignmentDto;
+import com.sckw.transport.model.dto.LogisticsOrderSubcontractDto;
 import com.sckw.transport.model.param.AddLogisticsOrderParam;
-import jakarta.annotation.Resource;
 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.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import java.math.BigDecimal;
@@ -69,8 +57,7 @@ import java.util.stream.Collectors;
 @SuppressWarnings("all")
 public class KwtLogisticsOrderConsignmentService {
 
-    @Resource
-    private StreamBridge streamBridge;
+
 
     @Autowired
     RedisLockUtil redisLockUtil;
@@ -87,8 +74,7 @@ public class KwtLogisticsOrderConsignmentService {
     @Autowired
     MessageUrlConfig messageUrlConfig;
 
-    @Autowired
-    public KwtCommonService commonService;
+
 
     @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
     RemoteSystemService remoteSystemService;
@@ -141,113 +127,7 @@ public class KwtLogisticsOrderConsignmentService {
     @Autowired
     public KwtLogisticsOrderGoodsMapper goodsMapper;
 
-    /**
-     * 采购订单/销售订单-物流托运-v4.2
-     *
-     * @param dto
-     */
-    @Transactional
-    public void logisticsConsignmentSave(LogisticsConsignmentDto dto) {
-        commonService.getRedisGenerateOrderNo();
-        Long count = logisticsOrderMapper.selectCount(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(KwtLogisticsOrder::getTOrderId, dto.getTOrderId()));
-        String lOrderNo = OrderGenerateSeqNoUtils.getSeqNo(RedisOrderGenerateEnum.LOGISTICS_ORDER, OrderRuleEnum.LOGISTICS_ORDER, "1", "0", String.valueOf(count + 1));
-        OrderDetailRes tradeOrder = tradeOrderInfoService.getOrderDetailById(Long.parseLong(dto.getTOrderId()));
-        if (tradeOrder == null) {
-            log.error("订单id查找失败:{}", dto.getTOrderId());
-            throw new BusinessException("贸易订单数据不存在");
-        }
-        KwtLogisticsOrder order = new KwtLogisticsOrder();
-        if (!dto.getIsFullDose()) {
-            //BigDecimal amount = tradeOrder.getAmount().subtract(tradeOrder.getEntrustAmount());
-            BigDecimal amount = dto.getCarryingCapacity();
-            if (dto.getCarryingCapacity() == null || amount.doubleValue() <= 0) {
-                log.error("可分配量分配错误:{}", dto.getTOrderId());
-                throw new BusinessException("可分配量分配必须填写大于0");
-            }
-            //可运量校验
-            if (!logisticsOrderGoodsService.chenkLogisticsAmount(dto, tradeOrder)) {
-                log.error("可分配量分配错误:{}", dto.getTOrderId());
-                throw new BusinessException("可分配量分配错误");
-            }
-            order.setAmount(dto.getCarryingCapacity());
-
-        } else {
-            order.setAmount(dto.getCarryingCapacity());
-            order.setSubcontractAmount(NumberConstant.ZERO_TWO);
-        }
-        //地址分配量校验
-        if (!checkCarryingCapacity(dto)) {
-            log.error("地址分配量与总委派量不一致");
-            throw new BusinessException("地址分配量与总委派量不一致");
-        }
 
-        /**验证结算方式*/
-        checkBillingMode(dto);
-
-        Long orderId = new IdWorker(NumberConstant.ONE).nextId();
-        order.setId(new IdWorker(NumberConstant.ONE).nextId());
-        //List<ContractDto> contractInfo = dto.getContractInfo();
-        long contractId = dto.getContractId();
-        List<Long> contractList = new ArrayList<>();
-        contractList.add(contractId);
-        Map<Long, ContractCommonInfoResDto> longContractCommonInfoResDtoMap = contractService.queryContractBaseInfo(contractList);
-        if (CollectionUtils.isEmpty(longContractCommonInfoResDtoMap)) {
-            throw new BusinessException("物流托运-并未有对应合同,应先签约合同");
-        }
-        if (longContractCommonInfoResDtoMap.get(contractId) == null) {
-            throw new BusinessException("物流托运-并未有对应合同,应先签约合同");
-        }
-        ContractCommonInfoResDto infoResDto = longContractCommonInfoResDtoMap.get(contractId);
-        /**状态判断
-         * 是否是已签约合同
-         * */
-        // 0 已签约 1待签约
-        Integer status = infoResDto.getStatus();
-        Integer orderStatus = LogisticsOrderEnum.PENDING_ORDER.getCode();
-        if (NumberConstant.ONE == status) {
-            orderStatus = LogisticsOrderEnum.TO_BE_PLANNED.getCode();
-        } else if (NumberConstant.ZERO == status) {
-            orderStatus = LogisticsOrderEnum.PENDING_ORDER.getCode();
-        } else {
-            log.info("物流托运创建订单异常");
-            throw new BusinessException("物流托运创建订单异常");
-        }
-        logisticsOrderGoodsService.insertLogisticsGoods(dto, lOrderNo, orderId);
-        saveLogisticsOrder(dto, lOrderNo, order, tradeOrder, orderId, orderStatus);
-        saveLogisticsOrderContract(dto, orderId);
-        saveLogisticsOrderUnit(dto, orderId);
-        saveLogisticsOrderAddressAndAmount(dto, orderId);
-        saveLogisticsOrderTrack(dto, orderId, orderStatus);
-        /**v4.2版本新增*/
-        if (dto.getBillingMode().equals("4")) {
-            saveLogisticsOrderLineFreight(dto, orderId);
-        }
-        saveSendMongoDB(lOrderNo, orderId, dto, tradeOrder, orderStatus);
-
-        /**将生成的分配量->贸易订单*/
-        List<GoodsLoadingParam> goodsLoading = logisticsOrderGoodsService.goodsLoadingParams(order, false);
-        HttpResult httpResult = tradeOrderInfoService.createOrCancelLogisticsOrderV1(LoginUserHolder.getUserId(), LoginUserHolder.getUserName(), order.getTOrderId(), goodsLoading);
-        if (httpResult.getCode() != HttpStatus.SUCCESS_CODE) {
-            log.info("{}生成物流托运失败!,返回信息:{}", tradeOrder.getTOrderNo(), JSONObject.toJSONString(httpResult));
-            throw new BusinessException("{" + tradeOrder.getTOrderNo() + "}生成物流托运失败!" + httpResult.getMsg());
-        }
-        long tOrderId = Long.parseLong(dto.getTOrderId());
-        List<AddressInfoDto> addressInfo = dto.getAddressInfo();
-        addressInfo.forEach(addressInfoDto -> {
-            UpdateAddressEntrustAmountParam param = new UpdateAddressEntrustAmountParam();
-            param.setTOrderId(tOrderId);
-            param.setTAddressId(Long.parseLong(addressInfoDto.getAddressId()));
-            param.setEntrustAmount(addressInfoDto.getAmount());
-            param.setUpdateBy(LoginUserHolder.getUserId());
-            param.setUpdateByName(LoginUserHolder.getUserName());
-            HttpResult result = tradeOrderAmountService.updateAddressEntrustAmount(param);
-            if (result.getCode() != HttpStatus.SUCCESS_CODE) {
-                log.info("{}生成物流托运失败!,返回信息:{}", tradeOrder.getTOrderNo(), JSONObject.toJSONString(httpResult));
-                throw new BusinessException("{" + tradeOrder.getTOrderNo() + "}生成物流托运失败!" + httpResult.getMsg());
-            }
-        });
-        pushConsoleMessage(dto, lOrderNo);
-    }
 
     /**
      * @param dto 参数
@@ -323,134 +203,6 @@ public class KwtLogisticsOrderConsignmentService {
 
     }
 
-    private void saveSendMongoDB(String lOrderNo, Long orderId, LogisticsConsignmentDto bo, OrderDetailRes tradeOrder, Integer orderStatus) {
-        SckwLogisticsOrder logisticsOrder = new SckwLogisticsOrder();
-        logisticsOrder.setStatus(String.valueOf(orderStatus));
-        logisticsOrder.setLOrderId(orderId);
-        logisticsOrder.setLOrderNo(lOrderNo);
-        logisticsOrder.setLOrderPid(null);
-        logisticsOrder.setTOrderId(tradeOrder.getId());
-        logisticsOrder.setTOrderNo("D" + com.sckw.transport.utils.StringUtils.getWaybillNoUtil());
-        logisticsOrder.setSettlementCycle(Long.parseLong(bo.getSettlementCycle()));
-        logisticsOrder.setPrice(bo.getPrice());
-        logisticsOrder.setPriceType(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getPriceType()) == null ?
-                null : Long.parseLong(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getPriceType()).getValue()));
-
-        if (!bo.getIsFullDose()) {
-            if (ArrayUtil.isEmpty(bo.getCarryingCapacity())) {
-                throw new RuntimeException("不是全量分配时,分配量不能为空!");
-            }
-            logisticsOrder.setAmount(bo.getCarryingCapacity());
-            logisticsOrder.setUnit(bo.getCarryingCapacityUnit());
-            logisticsOrder.setCarryingCapacity(bo.getCarryingCapacity());
-        } else {
-            logisticsOrder.setAmount(NumberConstant.ZERO_TWO);
-            logisticsOrder.setSubcontractAmount(NumberConstant.ZERO_TWO);
-            logisticsOrder.setCarryingCapacity(NumberConstant.ZERO_TWO);
-        }
-        logisticsOrder.setLoss(bo.getLoss() == null ? null : bo.getLoss());
-        logisticsOrder.setLossUnit(bo.getLossUnit());
-        logisticsOrder.setGoodsPrice(bo.getGoodsPrice() == null ? null : bo.getGoodsPrice());
-        BigDecimal decimal = new BigDecimal(NumberConstant.ZERO);
-        logisticsOrder.setSubcontractAmount(decimal);
-        logisticsOrder.setEntrustAmount(decimal);
-        logisticsOrder.setUnloadAmount(decimal);
-        logisticsOrder.setLoadAmount(decimal);
-        logisticsOrder.setIgnoreAmount(decimal);
-        logisticsOrder.setDeficitPrice(decimal);
-        logisticsOrder.setPayment(Long.parseLong(bo.getPayment()));
-        logisticsOrder.setTaxRate(bo.getTaxRate() == null ? null : bo.getTaxRate());
-        logisticsOrder.setRemark(bo.getRemark());
-        logisticsOrder.setEntId(LoginUserHolder.getEntId());
-        logisticsOrder.setFirmName(remoteSystemService.queryEntCacheById(LoginUserHolder.getEntId()).getFirmName());
-        logisticsOrder.setGoodsId(bo.getGoodsId());
-        KwpGoods goods = goodsInfoService.getGoodsById(bo.getGoodsId());
-        logisticsOrder.setGoodsType(goods == null ? null : goods.getGoodsType());
-        logisticsOrder.setGoodsSpec(goods == null ? null : goods.getSpec());
-        //List<ContractDto> contractInfo = bo.getContractInfo();
-        //contractInfo.forEach(contract -> {
-            Long contractId = bo.getContractId();
-            Map<Long, ContractCommonInfoResDto> longContractCommonInfoResDtoMap = contractService.queryContractBaseInfo(Collections.singletonList(contractId));
-            if (longContractCommonInfoResDtoMap != null && (longContractCommonInfoResDtoMap.get(contractId) != null)) {
-                String contractCode = longContractCommonInfoResDtoMap.get(contractId).getContractCode();
-                String contactName = longContractCommonInfoResDtoMap.get(contractId).getContactName();
-                Integer signingWay = longContractCommonInfoResDtoMap.get(contractId).getSigningWay();
-                logisticsOrder.setContractId(String.valueOf(contractId));
-                logisticsOrder.setContractNo(contractCode);
-                logisticsOrder.setContractName(contactName);
-                logisticsOrder.setContractSigningWay(String.valueOf(signingWay));
-            }
-        //});
-        logisticsOrder.setCheckEntId(Long.parseLong(bo.getCheckCompanyId()));
-        logisticsOrder.setCheckFirmName(bo.getCheckCompany());
-        logisticsOrder.setCheckContacts(bo.getCheckContacts());
-        logisticsOrder.setCheckPhone(bo.getCheckContactPhone());
-        logisticsOrder.setCarrierEntId(Long.parseLong(bo.getConsignCompanyId()));
-        logisticsOrder.setCarrierFirmName(bo.getConsignCompany());
-        logisticsOrder.setCarrierContacts(bo.getConsignContacts());
-        OrderDetailRes orderDetailRes = tradeOrderInfoService.getOrderDetailById(Long.valueOf(bo.getTOrderId()));
-        // 收货单位+发货单位
-        if (orderDetailRes != null) {
-            List<UnitInfoDetailRes> unitInfo = orderDetailRes.getUnitInfo();
-            if (CollectionUtils.isNotEmpty(unitInfo)) {
-                for (UnitInfoDetailRes unitInfoDetailRes : unitInfo) {
-                    if (String.valueOf(NumberConstant.ONE).equals(unitInfoDetailRes.getUnitType())) {
-                        logisticsOrder.setShipmentsUnitEntId(String.valueOf(unitInfoDetailRes.getEntId()));
-                        logisticsOrder.setShipmentsUnit(unitInfoDetailRes.getFirmName());
-                    } else if (String.valueOf(NumberConstant.TWO).equals(unitInfoDetailRes.getUnitType())) {
-                        logisticsOrder.setReceiveGoodsUnitEntId(String.valueOf(unitInfoDetailRes.getEntId()));
-                        logisticsOrder.setReceiveGoodsUnit(unitInfoDetailRes.getFirmName());
-                    }
-                }
-            }
-        }
-        List<AddressInfoDetail> addressInfo = tradeOrder.getAddressInfo();
-        for (AddressInfoDetail detail : addressInfo) {
-            if (String.valueOf(NumberConstant.ONE).equals(detail.getAddressType())) {
-                logisticsOrder.setLoadType(Long.parseLong(detail.getType()));
-                logisticsOrder.setLoadCityCode(detail.getCityCode());
-                logisticsOrder.setLoadCityName(detail.getCityName());
-                logisticsOrder.setLoadDetailAddress(detail.getDetailAddress());
-                logisticsOrder.setLoadLat(detail.getLat());
-                logisticsOrder.setLoadPhone(detail.getPhone());
-                logisticsOrder.setLoadLng(detail.getLng());
-                logisticsOrder.setLoadContacts(detail.getContacts());
-            }
-            if (String.valueOf(NumberConstant.TWO).equals(detail.getAddressType())) {
-                logisticsOrder.setUnloadType(Long.parseLong(detail.getType()));
-                logisticsOrder.setUnloadPhone(detail.getPhone());
-                logisticsOrder.setUnloadCityCode(detail.getCityCode());
-                logisticsOrder.setUnloadCityName(detail.getCityName());
-                logisticsOrder.setUnloadDetailAddress(detail.getDetailAddress());
-                logisticsOrder.setUnloadLat(detail.getLat());
-                logisticsOrder.setUnloadLng(detail.getLng());
-                logisticsOrder.setUnloadContacts(detail.getContacts());
-            }
-        }
-        //TODO 生成时并无时间
-//        logisticsOrder.setLoadTime();
-//        logisticsOrder.setunLoadTime();
-        logisticsOrder.setCreateBy(LoginUserHolder.getUserId());
-        logisticsOrder.setCreateByName(LoginUserHolder.getUserName());
-        logisticsOrder.setCreateTime(new Date());
-        logisticsOrder.setUpdateBy(LoginUserHolder.getUserId());
-        logisticsOrder.setUpdateByName(LoginUserHolder.getUserName());
-        logisticsOrder.setUpdateTime(new Date());
-        logisticsOrder.setGoodsPriceUnit(bo.getGoodsPriceUnit());
-        logisticsOrder.setBillingMode(bo.getBillingMode());
-        logisticsOrder.setStartTime(bo.getStartTime() == null ? null : bo.getStartTime());
-        logisticsOrder.setEndTime(bo.getEndTime() == null ? null : bo.getEndTime());
-        //rabbitMq业务汇总数据发送/消费对象
-        SckwBusSum busSum = new SckwBusSum();
-        //业务汇总类型
-        busSum.setBusSumType(BusinessTypeEnum.LOGISTICS_ORDER_TYPE.getName());
-        //操作对象（1新增/2修改）
-        busSum.setMethod(1);
-        //业务汇总数据对象
-        busSum.setObject(logisticsOrder);
-        streamBridge.send("sckw-busSum", JSON.toJSONString(busSum));
-
-    }
 
     private void saveLogisticsOrderTrack(LogisticsConsignmentDto dto, Long orderId, Integer orderStatus) {
         KwtLogisticsOrderTrack entity = new KwtLogisticsOrderTrack();
@@ -474,7 +226,7 @@ public class KwtLogisticsOrderConsignmentService {
 //        }
 //        List<AddressInfoDetail> addressInfo = orderDetailRes.getAddressInfo();
 //        if (CollectionUtils.isEmpty(addressInfo)) {
-//            throw new BusinessException("生成物流托运时,地址信息不存在!");
+//            throw new ApiException("生成物流托运时,地址信息不存在!");
 //        }
         List<AddressInfoDto> addressInfo = dto.getAddressInfo();
         for (AddressInfoDto addressInfoDto : addressInfo) {
@@ -633,71 +385,6 @@ public class KwtLogisticsOrderConsignmentService {
 //        }
     }
 
-    /**
-     * 消息推送首页信息
-     */
-    private void pushConsoleMessage(LogisticsConsignmentDto dto, String lOrderNo) {
-        /**消息列表
-         * 1 采购 2 销售
-         * */
-        String pcConsignUrl = "", appConsignUrl = "", pcCarriageUrl = "", appCarriageUrl = "";
-        MessageEnum consignMessageEnum = null, carriageMessageEnum = null;
-        //托运单位
-        KwtLogisticsOrderUnit checkUnit = new KwtLogisticsOrderUnit();
-        //承运单位
-        KwtLogisticsOrderUnit carriageUnit = new KwtLogisticsOrderUnit();
-        String type = dto.getType();
-        if (String.valueOf(NumberConstant.ONE).equals(type)) {
-            EntCacheResDto consignentMap = remoteSystemService.queryEntTreeById(Long.parseLong(dto.getConsignCompanyId()));
-            EntCacheResDto checkentMap = remoteSystemService.queryEntTreeById(Long.parseLong(dto.getCheckCompanyId()));
-            //发起方
-            checkUnit.setUnitType(NumberConstant.ONE);
-            checkUnit.setFirmName(dto.getCheckCompany());
-            checkUnit.setEntId(Long.parseLong(dto.getConsignCompanyId()));
-            checkUnit.setTopEntId(consignentMap == null ? null : consignentMap.getId());
-            checkUnit.setContactsId(Long.parseLong(dto.getCheckContactsId()));
-            //接收方
-            carriageUnit.setUnitType(NumberConstant.TWO);
-            carriageUnit.setFirmName(dto.getConsignCompany());
-            carriageUnit.setEntId(Long.parseLong(dto.getCheckCompanyId()));
-            carriageUnit.setTopEntId(checkentMap == null ? null : checkentMap.getId());
-            carriageUnit.setContactsId(Long.parseLong(dto.getConsignContactsId()));
-            pcConsignUrl = messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl();
-            appConsignUrl = messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl();
-            pcCarriageUrl = messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl();
-            appCarriageUrl = messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl();
-            consignMessageEnum = MessageEnum.NEW_CARRIAGE_ORDER;
-            carriageMessageEnum = MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT;
-            type = "2";
-        } else if (String.valueOf(NumberConstant.TWO).equals(type)) {
-            EntCacheResDto consignentMap = remoteSystemService.queryEntTreeById(Long.parseLong(dto.getConsignCompanyId()));
-            EntCacheResDto checkentMap = remoteSystemService.queryEntTreeById(Long.parseLong(dto.getCheckCompanyId()));
-            //发起方
-            checkUnit.setUnitType(NumberConstant.ONE);
-            checkUnit.setFirmName(dto.getCheckCompany());
-            checkUnit.setEntId(Long.parseLong(dto.getCheckCompanyId()));
-            checkUnit.setTopEntId(consignentMap == null ? null : consignentMap.getId());
-            checkUnit.setContactsId(Long.parseLong(dto.getConsignContactsId()));
-            //接收方
-            carriageUnit.setUnitType(NumberConstant.TWO);
-            carriageUnit.setFirmName(dto.getConsignCompany());
-            carriageUnit.setEntId(Long.parseLong(dto.getConsignCompanyId()));
-            carriageUnit.setTopEntId(checkentMap == null ? null : checkentMap.getId());
-            carriageUnit.setContactsId(Long.parseLong(dto.getCheckContactsId()));
-            pcConsignUrl = messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl();
-            appConsignUrl = messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl();
-            pcCarriageUrl = messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl();
-            appCarriageUrl = messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl();
-            consignMessageEnum = MessageEnum.NEW_CARRIAGE_ORDER;
-            carriageMessageEnum = MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT;
-            type = "1";
-        }
-        //发送消息
-        commonService.newSendLogisticsOrderToMessage(checkUnit, carriageUnit, lOrderNo, LoginUserHolder.getUserId(),
-                LoginUserHolder.getEntId(), pcConsignUrl, appConsignUrl, pcCarriageUrl, appCarriageUrl,
-                consignMessageEnum, carriageMessageEnum, type);
-    }
-
     private void saveLogisticsOrderUnit(LogisticsConsignmentDto dto, Long orderId) {
         EntCacheResDto consignentMap = remoteSystemService.queryEntTreeById(Long.parseLong(dto.getConsignCompanyId()));
         EntCacheResDto checkentMap = remoteSystemService.queryEntTreeById(Long.parseLong(dto.getCheckCompanyId()));
@@ -816,101 +503,7 @@ public class KwtLogisticsOrderConsignmentService {
         logisticsOrderMapper.insert(order);
     }
 
-    /**
-     * 物流订单-自建订单-v4.2
-     *
-     * @param addLogisticsOrderParam
-     * @return
-     */
-    @Transactional
-    public HttpResult addLogisticsOrder(AddLogisticsOrderParam addOrderDTO) {
-        commonService.getRedisGenerateOrderNo();
-        /**生成订单编号*/
-        String lOrderNo = OrderGenerateSeqNoUtils.getSeqNo(RedisOrderGenerateEnum.LOGISTICS_ORDER, OrderRuleEnum.LOGISTICS_ORDER, "2", "0", "0");
-        HttpResult httpResult = ValidUtil.serviceValid(addOrderDTO);
-        if (!String.valueOf(HttpStatus.SUCCESS_CODE).equals(String.valueOf(httpResult.getCode()))) {
-            return HttpResult.error(httpResult.getMsg());
-        }
-        /**验证数据*/
-        checkCreateLogisticOrderParam(addOrderDTO);
-        /**数据填写验证*/
-        checkLogisticsOrder(addOrderDTO);
-        String consignCompanyId = addOrderDTO.getConsignCompanyId();
-        String acceptCompanyId = addOrderDTO.getAcceptCompanyId();
-        List<FindEntCooperateResVo> entCooperate = manageService.findEntCooperate(Long.parseLong(consignCompanyId), Long.parseLong(acceptCompanyId), CooperateTypeEnum.CARRIAGE.getCode());
-//        if (CollectionUtils.isEmpty(entCooperate)) {
-//            return HttpResult.error("该承运企业与我方企业并无合作关系!");
-//        }
-        /**保存新建数据*/
-        Long lOrderId = new IdWorker(NumberConstant.ONE).nextId();
-        /**根据合同计算当前单据状态*/
-        /**判断生成物流订单应生成哪一种单据状态*/
-        List<Long> contractList = new ArrayList<>();
-        contractList.add(Long.parseLong(addOrderDTO.getContractId()));
-        Map<Long, ContractCommonInfoResDto> longContractCommonInfoResDtoMap = contractService.queryContractBaseInfo(contractList);
-        if (CollectionUtils.isEmpty(longContractCommonInfoResDtoMap)) {
-            throw new BusinessException("新建订单-并未有对应合同,应先签约合同");
-        }
-        if (longContractCommonInfoResDtoMap.get(Long.parseLong(addOrderDTO.getContractId())) == null) {
-            throw new BusinessException("新建订单-并未有对应合同,应先签约合同");
-        }
-        ContractCommonInfoResDto infoResDto = longContractCommonInfoResDtoMap.get(Long.parseLong(addOrderDTO.getContractId()));
-        /**状态判断
-         * 是否是已签约合同
-         * */
-        // 0 已签约 1待签约
-        Integer status = infoResDto.getStatus();
-        Integer orderStatus = LogisticsOrderEnum.PENDING_ORDER.getCode();
-        if (NumberConstant.ONE == status) {
-            orderStatus = LogisticsOrderEnum.TO_BE_PLANNED.getCode();
-        } else if (NumberConstant.ZERO == status) {
-            orderStatus = LogisticsOrderEnum.WAIT_DELIVERY.getCode();
-        } else {
-            log.info("创建订单异常");
-            throw new BusinessException("自建订单异常");
-        }
-        /**数据保存*/
-        saveCreateLogisticsOrder(addOrderDTO, lOrderId, orderStatus, lOrderNo);
-        saveCreateLogisticsOrderAddressAndAmount(addOrderDTO, lOrderId);
-        saveConsignLogisticsOrderGoods(addOrderDTO, lOrderId, lOrderNo);
-        saveCreateLogisticsOrderContract(addOrderDTO, lOrderId, infoResDto);
-        saveCreateLogisticsOrderTrack(lOrderId, orderStatus);
-        saveCreateLogisticsOrderUnit(addOrderDTO, lOrderId);
-        if ("4".equals(addOrderDTO.getBillingMode())) {
-            saveCreateLogisticsOrderLineFreight(addOrderDTO, lOrderId);
-        }
-        /**保存mongodb*/
-        saveCreateLogisticsOrderToMongoDb(addOrderDTO, orderStatus, lOrderId, lOrderNo, infoResDto);
-        /**消息主体*/
-        String type = addOrderDTO.getType();
-        if (type.equals("1")) {
-            logisticsOrderPush(addOrderDTO, lOrderNo, LoginUserHolder.getUserId(), LoginUserHolder.getEntId());
-        } else if (type.equals("2")) {
-            //托运单位
-            EntCacheResDto entCacheResDto = remoteSystemService.queryEntCacheById(Long.parseLong(addOrderDTO.getConsignCompanyId()));
-            KwtLogisticsOrderUnit consignUnit = new KwtLogisticsOrderUnit();
-            consignUnit.setUnitType(NumberConstant.ONE);
-            consignUnit.setEntId(Long.parseLong(addOrderDTO.getConsignCompanyId()));
-            consignUnit.setTopEntId(entCacheResDto == null ? null : entCacheResDto.getId());
-            consignUnit.setFirmName(addOrderDTO.getConsignCompany());
-            consignUnit.setContactsId(Long.parseLong(addOrderDTO.getConsignContactsId()));
-            //承运单位
-            EntCacheResDto entCacheResDto1 = remoteSystemService.queryEntCacheById(Long.parseLong(addOrderDTO.getAcceptCompanyId()));
-            KwtLogisticsOrderUnit carriageUnit = new KwtLogisticsOrderUnit();
-            carriageUnit.setUnitType(NumberConstant.TWO);
-            carriageUnit.setEntId(Long.parseLong(addOrderDTO.getAcceptCompanyId()));
-            carriageUnit.setTopEntId(entCacheResDto1 == null ? null : entCacheResDto1.getId());
-            carriageUnit.setFirmName(addOrderDTO.getAcceptCompany());
-            carriageUnit.setContactsId(Long.parseLong(addOrderDTO.getAcceptContactsId()));
-            commonService.newSendLogisticsOrderToMessage(consignUnit, carriageUnit, lOrderNo, LoginUserHolder.getUserId(), LoginUserHolder.getEntId()
-                    , messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl()
-                    , messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl()
-                    , MessageEnum.NEW_LOGISTICS_ORDER, MessageEnum.NEW_CARRIAGE_ORDER
-                    , "1"
-            );
-        }
-        return HttpResult.ok(lOrderId);
-    }
+
 
     private void checkLogisticsOrder(AddLogisticsOrderParam addOrderDTO) {
         /**计费方式验证*/
@@ -968,102 +561,6 @@ public class KwtLogisticsOrderConsignmentService {
         }
     }
 
-    private void saveCreateLogisticsOrderToMongoDb(AddLogisticsOrderParam orderDTO, Integer orderStatus, Long lOrderId, String lOrderNo, ContractCommonInfoResDto infoResDto) {
-        SckwLogisticsOrder order = new SckwLogisticsOrder();
-        order.set_id(lOrderId);
-        order.setLOrderId(lOrderId);
-        order.setLOrderNo(lOrderNo);
-        order.setLOrderPid(null);
-        order.setLOrderPids(String.valueOf(lOrderId));
-        order.setType(NumberConstant.TWO);
-        order.setSettlementCycle(orderDTO.getSettlementCycle());
-        order.setPrice(orderDTO.getPrice());
-        order.setPriceType(order.getPriceType());
-        order.setAmount(orderDTO.getAmount());
-        order.setUnit(orderDTO.getAmountUnit());
-        order.setLoss(orderDTO.getLoss());
-        order.setLossUnit(orderDTO.getLossUnit());
-        order.setGoodsPrice(orderDTO.getGoodsPrice() == null ? null : orderDTO.getGoodsPrice());
-        order.setGoodsPriceUnit(orderDTO.getGoodsPriceUnit());
-        BigDecimal decimal = new BigDecimal(NumberConstant.ZERO);
-        order.setSubcontractAmount(decimal);
-        order.setEntrustAmount(decimal);
-        order.setUnloadAmount(decimal);
-        order.setLoadAmount(decimal);
-        order.setIgnoreAmount(decimal);
-        order.setDeficitAmount(decimal);
-        order.setDeficitPrice(decimal);
-        order.setPayment(orderDTO.getPayment());
-        order.setTaxRate(orderDTO.getTaxRate());
-        order.setRemark(orderDTO.getRemark());
-        order.setStatus(String.valueOf(orderStatus));
-        order.setEntId(LoginUserHolder.getEntId());
-        order.setFirmName(LoginUserHolder.getEntName());
-//        order.setGoodsId(Long.parseLong(orderDTO.getGoodsId()));
-//        order.setGoodsCode(goods == null ? null : goods.getCode());
-        order.setGoodsName(orderDTO.getGoodsName());
-//        order.setGoodsType(goods == null ? null : goods.getGoodsType());
-////        order.setGoodsIndustry(goods == null ? null : goods.get);
-//        order.setGoodsSpec(goods == null ? null : goods.getSpec());
-        order.setContractId(orderDTO.getContractId());
-        order.setContractNo(infoResDto.getContractCode());
-        order.setContractName(infoResDto.getContactName());
-        order.setContractSigningWay(String.valueOf(infoResDto.getSigningWay()));
-        order.setCheckEntId(Long.parseLong(orderDTO.getConsignCompanyId()));
-        Map<Long, EntCacheResDto> entMap = remoteSystemService.queryEntTreeByIds(Collections.singletonList(Long.parseLong(orderDTO.getConsignCompanyId())));
-        EntCacheResDto ent = entMap.get(Long.parseLong(orderDTO.getConsignCompanyId()));
-        if (Objects.isNull(ent)) {
-            throw new BusinessException("企业:" + orderDTO.getConsignCompany() + "的一级企业信息不存在！");
-        }
-        order.setCheckTopEntId(ent.getId());
-        order.setCheckFirmName(orderDTO.getConsignCompany());
-        order.setCheckContacts(orderDTO.getConsignContacts());
-        order.setCheckPhone(orderDTO.getConsignContactPhone());
-        order.setCarrierEntId(Long.parseLong(orderDTO.getAcceptCompanyId()));
-        Map<Long, EntCacheResDto> entMap1 = remoteSystemService.queryEntTreeByIds(Collections.singletonList(Long.parseLong(orderDTO.getAcceptCompanyId())));
-        EntCacheResDto ent1 = entMap1.get(Long.parseLong(orderDTO.getAcceptCompanyId()));
-        if (Objects.isNull(ent1)) {
-            throw new BusinessException("企业:" + orderDTO.getConsignCompany() + "的一级企业信息不存在！");
-        }
-        order.setCarrierTopEntId(ent1.getId());
-        order.setCarrierFirmName(orderDTO.getAcceptCompany());
-        order.setCarrierContacts(orderDTO.getAcceptContacts());
-        order.setCarrierPhone(orderDTO.getAcceptContactPhone());
-//        order.setLoadType();
-//        order.setLoadContacts(orderDTO.getLoadContacts());
-//        order.setLoadPhone(orderDTO.getLoadPhone());
-//        order.setLoadCityCode(orderDTO.getLoadCityCode());
-//        order.setLoadCityName(orderDTO.getLoadCityName());
-//        order.setLoadDetailAddress(orderDTO.getLoadDetailAddress());
-//        order.setLoadLat(orderDTO.getLoadLat());
-//        order.setLoadLng(orderDTO.getLoadLng());
-////        order.setUnloadType();
-//        order.setUnloadContacts(orderDTO.getUnloadContacts());
-//        order.setUnloadPhone(orderDTO.getUnloadPhone());
-//        order.setUnloadCityCode(orderDTO.getUnloadCityCode());
-//        order.setUnloadCityName(orderDTO.getUnloadCityName());
-//        order.setUnloadDetailAddress(orderDTO.getUnloadDetailAddress());
-//        order.setUnloadLat(orderDTO.getUnloadLat());
-//        order.setUnloadLng(orderDTO.getUnloadLng());
-        order.setCreateBy(LoginUserHolder.getUserId());
-        order.setCreateByName(LoginUserHolder.getUserName());
-        order.setCreateTime(new Date());
-        order.setUpdateBy(LoginUserHolder.getUserId());
-        order.setUpdateByName(LoginUserHolder.getUserName());
-        order.setUpdateTime(new Date());
-//        order.setWOrderNo(lOrderNo);
-        order.setCarryingCapacity(orderDTO.getAmount());
-        order.setBillingMode(orderDTO.getBillingMode());
-        order.setDelFlag(String.valueOf(NumberConstant.ZERO));
-        order.setStartTime(orderDTO.getStartTime() == null ? null : DateUtil.localDateToLocalDateTimeStart(orderDTO.getStartTime()));
-        order.setEndTime(orderDTO.getEndTime() == null ? null : DateUtil.localDateToLocalDateTimeEnd(orderDTO.getEndTime()));
-        SckwBusSum busSum = new SckwBusSum();
-        busSum.setBusSumType(BusinessTypeEnum.LOGISTICS_ORDER_TYPE.getName());
-        busSum.setMethod(NumberConstant.ONE);
-        busSum.setObject(order);
-        streamBridge.send("sckw-busSum", com.alibaba.fastjson2.JSON.toJSONString(busSum));
-
-    }
 
     private void saveCreateLogisticsOrderUnit(AddLogisticsOrderParam orderDTO, Long lOrderId) {
         //托运
@@ -1332,75 +829,6 @@ public class KwtLogisticsOrderConsignmentService {
     }
 
 
-    public void logisticsOrderPush(AddLogisticsOrderParam addOrderDTO, String lOrderNo, Long createBy, Long entId) {
-        //发起方
-        EntCacheResDto entCacheResDto = remoteSystemService.queryEntCacheById(Long.parseLong(addOrderDTO.getConsignCompanyId()));
-        KwtLogisticsOrderUnit consignUnit = new KwtLogisticsOrderUnit();
-        consignUnit.setUnitType(NumberConstant.ONE);
-        consignUnit.setEntId(Long.parseLong(addOrderDTO.getConsignCompanyId()));
-        consignUnit.setTopEntId(entCacheResDto == null ? null : entCacheResDto.getId());
-        consignUnit.setFirmName(addOrderDTO.getAcceptCompany());
-        consignUnit.setContactsId(Long.parseLong(addOrderDTO.getConsignContactsId()));
-
-        //接收方
-        EntCacheResDto entCacheResDto1 = remoteSystemService.queryEntCacheById(Long.parseLong(addOrderDTO.getAcceptCompanyId()));
-        KwtLogisticsOrderUnit carriageUnit = new KwtLogisticsOrderUnit();
-        carriageUnit.setUnitType(NumberConstant.TWO);
-        carriageUnit.setEntId(Long.parseLong(addOrderDTO.getAcceptCompanyId()));
-        carriageUnit.setTopEntId(entCacheResDto1 == null ? null : entCacheResDto1.getId());
-        carriageUnit.setFirmName(addOrderDTO.getConsignCompany());
-        carriageUnit.setContactsId(Long.parseLong(addOrderDTO.getAcceptContactsId()));
-
-        sendLogisticsOrderToMessage(consignUnit, carriageUnit, lOrderNo, createBy, entId
-                , messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(),
-                messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(),
-                MessageEnum.NEW_LOGISTICS_ORDER, MessageEnum.NEW_CARRIAGE_ORDER, "1"
-        );
-
-    }
-
-    /**
-     * 发起物流托运-[贸易订单物流托运确认/承运订单分包托运确认]
-     *
-     * @param consignUnit    托运单位
-     * @param carriageUnit   承运单位
-     * @param orderNo        单据号
-     * @param createBy       创建人
-     * @param entId          创建数据的企业id
-     * @param pcConsignUrl   PC托运地址
-     * @param appConsignUrl  app托运地址
-     * @param pcCarriageUrl  PC承运地址
-     * @param appCarriageUrl app承运地址
-     * @param type           1代表给托运创建人发 2代表给承运创建人发
-     */
-    public void sendLogisticsOrderToMessage(KwtLogisticsOrderUnit consignUnit, KwtLogisticsOrderUnit carriageUnit,
-                                            String orderNo, Long createBy, Long entId,
-                                            String pcConsignUrl, String appConsignUrl,
-                                            String pcCarriageUrl, String appCarriageUrl,
-                                            MessageEnum consignMessageEnum,
-                                            MessageEnum carriageMessageEnum,
-                                            String type) {
-        boolean flag = createBy.equals(consignUnit.getContactsId()) || createBy.equals(carriageUnit.getContactsId());
-        Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN);
-        map.put("orderNo", orderNo);
-        if (flag && createBy.equals(consignUnit.getContactsId())) {
-            commonService.sendLogisticsConsignMessage(consignUnit, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
-            commonService.sendLogisticsCarriageMessage(carriageUnit, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
-        } else if (flag && createBy.equals(carriageUnit.getContactsId())) {
-            commonService.sendLogisticsCarriageMessage(carriageUnit, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
-            commonService.sendLogisticsConsignMessage(consignUnit, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
-        } else {
-            commonService.sendLogisticsConsignMessage(consignUnit, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
-            commonService.sendLogisticsCarriageMessage(carriageUnit, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
-            if ("1".equals(type)) {
-                map.put("companyName", consignUnit.getFirmName());
-                commonService.sendLogisticsCreateByMessage(createBy, entId, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
-            } else {
-                map.put("companyName", carriageUnit.getFirmName());
-                commonService.sendLogisticsCreateByMessage(createBy, entId, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
-            }
-        }
-    }
 
 
     /**
@@ -1427,283 +855,6 @@ public class KwtLogisticsOrderConsignmentService {
         }
     }
 
-    /**
-     * 物流订单-分包托运
-     *
-     * @param logisticsOrderSubcontractDto
-     * @return
-     */
-    @Transactional
-    public HttpResult logisticsOrderSubcontract(LogisticsOrderSubcontractDto bo) {
-        HttpResult httpResult = ValidUtil.serviceValid(bo);
-        String key = String.format(RedisConstant.LOGISTICS_ORDER_SUBCONTRACT_KEY, bo.getLOrderId());
-        if (redisLockUtil.tryLock(key)) {
-            try {
-                if (!String.valueOf(HttpStatus.SUCCESS_CODE).equals(String.valueOf(httpResult.getCode()))) {
-                    httpResult.setMsg(httpResult.getMsg());
-                    httpResult.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
-                    return httpResult;
-                }
-
-                KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectById(bo.getLOrderId());
-                if (logisticsOrder == null) {
-                    log.error("订单id查找失败:{},订单编号:{}", bo.getLOrderId(), bo.getLOrderNo());
-                    throw new BusinessException("单据错误,数据不存在");
-                }
-                //todo  校验当前登录角色是否具有4P物流角色
-                EntCacheResDto entCacheResDto = remoteSystemService.queryEntCacheById(LoginUserHolder.getEntId());
-                if (entCacheResDto == null) {
-                    log.info("承运订单-分包托运 用户id:{}", LoginUserHolder.getUserId());
-                    throw new BusinessException("企业信息查询异常");
-                }
-                if (!entCacheResDto.getEntTypes().contains(String.valueOf(NumberConstant.THREE))) {
-                    throw new BusinessException("当前用户企业不具有分包功能权限！");
-                }
-                if (bo.getCarryingCapacity().compareTo(NumberConstant.ZERO_TWO) == 0) {
-                    throw new BusinessException("分配承运量必须填写大于0.00");
-                }
-                BigDecimal subtract = logisticsOrder.getAmount().subtract((logisticsOrder.getEntrustAmount() == null ? NumberConstant.ZERO_TWO : logisticsOrder.getEntrustAmount()));
-                if (bo.getCarryingCapacity().compareTo(subtract) > 0) {
-                    throw new BusinessException("分配承运量必须可待分配量");
-                }
-                KwtLogisticsOrder order = new KwtLogisticsOrder();
-                if (!bo.getIsFullDose()) {
-                    BigDecimal amount = bo.getAmount();
-                    BigDecimal carryingCapacity = bo.getCarryingCapacity();
-                    if (amount.compareTo(carryingCapacity) < 0) {
-                        log.error("运订单分包托运-可分配量分配错误:{}", bo.getLOrderId());
-                        throw new RuntimeException("可分配量分配错误");
-                    }
-                    if (ArrayUtil.isEmpty(bo.getCarryingCapacity())) {
-                        throw new RuntimeException("不是全量分配时,分配量不能为空!");
-                    }
-                    order.setAmount(bo.getCarryingCapacity());
-                    order.setUnit(bo.getCarryingCapacityUnit());
-                } else {
-                    order.setAmount(new BigDecimal(NumberConstant.ZERO));
-                    order.setSubcontractAmount(new BigDecimal(NumberConstant.ZERO));
-                    order.setUnit(bo.getCarryingCapacityUnit());
-                }
-                BigDecimal subcontractAmount = logisticsOrder.getSubcontractAmount() == null ? NumberConstant.ZERO_TWO : logisticsOrder.getSubcontractAmount();
-                BigDecimal entrustAmount = logisticsOrder.getEntrustAmount() == null ? NumberConstant.ZERO_TWO : logisticsOrder.getEntrustAmount();
-                BigDecimal waitDistributionAmount = logisticsOrder.getAmount().subtract(subcontractAmount).subtract(entrustAmount);
-                if (waitDistributionAmount.compareTo(NumberConstant.ZERO_TWO) == 0) {
-                    throw new RuntimeException("剩余可分配量为0，不可进行分包操作！");
-                }
-                int level = logisticsLevel(logisticsOrder);
-                long number = logisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                                .eq(KwtLogisticsOrder::getDelFlag, NumberConstant.ZERO)
-                                .apply(logisticsOrder.getId() != null, "FIND_IN_SET ('" + bo.getLOrderId() + "', pids)").ne(KwtLogisticsOrder::getId, bo.getLOrderId()))
-                        .stream().count();
-                String pidOrderNo = logisticsOrder.getLOrderNo();
-                String substring = pidOrderNo.substring(0, 11);
-                String lOrderNo = substring + logisticsOrder.getType() + String.valueOf(level) + String.valueOf(number + 1);
-                Long orderId = new IdWorker(NumberConstant.ONE).nextId();
-                //分包托运需要判断处于哪一级分包托运,需要记录当前分包数据-分包上游数据
-                //判断是否已存在分包【当前分包只允许加上主单一共四级】
-                if (level >= 4) {
-                    throw new RuntimeException("分包次数已达上限!");
-                }
-                String pids = logisticsOrder.getPids();
-                if (StringUtils.isNotBlank(pids)) {
-                    pids = pids + StringConstant.COMMA + orderId;
-                } else {
-                    pids = bo.getLOrderId() + StringConstant.COMMA + orderId;
-                }
-                /**判断生成物流订单应生成哪一种单据状态*/
-                List<Long> contractList = new ArrayList<>();
-                contractList.add(Long.parseLong(bo.getContractId()));
-                Map<Long, ContractCommonInfoResDto> longContractCommonInfoResDtoMap = contractService.queryContractBaseInfo(contractList);
-                if (CollectionUtils.isEmpty(longContractCommonInfoResDtoMap)) {
-                    throw new RuntimeException("并未有对应合同,应先签约合同");
-                }
-                if (longContractCommonInfoResDtoMap.get(Long.parseLong(bo.getContractId())) == null) {
-                    throw new RuntimeException("并未有对应合同,应先签约合同");
-                }
-                ContractCommonInfoResDto infoResDto = longContractCommonInfoResDtoMap.get(Long.parseLong(bo.getContractId()));
-                /**状态判断
-                 * 是否是已签约合同
-                 * */
-                // 0 已签约 1待签约
-                Integer status = infoResDto.getStatus();
-                Integer orderStatus = LogisticsOrderEnum.PENDING_ORDER.getCode();
-                if (NumberConstant.ONE == status) {
-                    orderStatus = LogisticsOrderEnum.TO_BE_PLANNED.getCode();
-                } else if (NumberConstant.ZERO == status) {
-                    orderStatus = LogisticsOrderEnum.PENDING_ORDER.getCode();
-                } else {
-                    log.info("分包托运-物流订单id:{}," +
-                                    "物流订单编号:{},合同id:{},合同信息:{}",
-                            bo.getLOrderId(), bo.getLOrderNo(),
-                            bo.getContractId(), JSONObject.toJSONString(infoResDto));
-                    throw new RuntimeException("分包托运合同异常");
-                }
-                //主体信息保存
-                logisticsOrderGoodsService.insertSubcontractLogisticsGoods(logisticsOrder, lOrderNo, orderId);
-                insertSubcontractLogisticsOrder(bo, lOrderNo, order, orderId, pids, orderStatus, logisticsOrder);
-                insertSubcontractLogisticsOrderContract(bo, orderId, infoResDto);
-                insertSubcontractLogisticsOrderUnit(bo, orderId);
-                insertSubcontractLogisticsOrderAddressAndAmount(bo, orderId, logisticsOrder);
-                insertLogisticsOrderTrack(bo, orderId, orderStatus);
-                if (bo.getBillingMode().equals("4")) {
-                    insertLogisticsOrderLineFreight(bo, orderId);
-                }
-                //修改上级分配量以及可分配量委托量等
-                logisticsOrder.setSubcontractAmount(logisticsOrder.getSubcontractAmount().add(bo.getCarryingCapacity()));
-                logisticsOrderMapper.updateById(logisticsOrder);
-
-                List<AddressInfoDto> addressInfo = bo.getAddressInfo();
-                addressInfo.forEach(addressInfoDto -> {
-                    String addressId = addressInfoDto.getAddressId();
-                    KwtLogisticsOrderAmount orderAmount = logisticsOrderAmountMapper.selectById(addressId);
-                    if (orderAmount != null) {
-                        orderAmount.setSubcontractAmount(orderAmount.getSubcontractAmount().add(addressInfoDto.getAmount()));
-                        logisticsOrderAmountMapper.updateById(orderAmount);
-                    }
-                });
-
-
-                /**数据发送至消息列表*/
-                String type = bo.getType();
-                if ("1".equals(type)) {
-                    /**托运订单*/
-                } else if ("2".equals(type)) {
-                    /**承运订单*/
-                    EntCacheResDto consignentMap = remoteSystemService.queryEntTreeById(Long.parseLong(bo.getAcceptCompanyId()));
-                    EntCacheResDto checkentMap = remoteSystemService.queryEntTreeById(Long.parseLong(bo.getConsignCompanyId()));
-                    //托运单位
-                    KwtLogisticsOrderUnit checkUnit = new KwtLogisticsOrderUnit();
-                    checkUnit.setUnitType(1);
-                    checkUnit.setFirmName(bo.getConsignCompany());
-                    checkUnit.setEntId(Long.parseLong(bo.getConsignCompanyId()));
-                    checkUnit.setTopEntId(consignentMap == null ? null : consignentMap.getId());
-                    checkUnit.setContactsId(Long.parseLong(bo.getConsignContactsId()));
-                    //承运单位
-                    KwtLogisticsOrderUnit carriageUnit = new KwtLogisticsOrderUnit();
-                    carriageUnit.setUnitType(2);
-                    carriageUnit.setFirmName(bo.getAcceptCompany());
-                    carriageUnit.setEntId(Long.parseLong(bo.getAcceptCompanyId()));
-                    carriageUnit.setContactsId(Long.parseLong(bo.getAcceptContactsId()));
-                    carriageUnit.setFirmName(bo.getAcceptCompany());
-                    carriageUnit.setTopEntId(checkentMap == null ? null : checkentMap.getId());
-
-//        commonService.initIatingLogisticsConsignment(checkUnit, carriageUnit, logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId());
-                    commonService.newSendLogisticsOrderToMessage(carriageUnit, checkUnit, logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
-                            messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(),
-                            messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(),
-                            MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT, MessageEnum.NEW_CARRIAGE_ORDER,
-                            "1");
-                }
-                /** 2024-03-26 停止mq->mongodb数据*/
-                //修改父级mongodb数据
-                //更新mongodb
-                SckwLogisticsOrder lOrder = new SckwLogisticsOrder();
-                lOrder.set_id(order.getId());
-                lOrder.setLOrderId(order.getId());
-                lOrder.setEntrustAmount(order.getEntrustAmount());
-                lOrder.setStatus(String.valueOf(order.getStatus()));
-                lOrder.setUpdateTime(order.getUpdateTime());
-                lOrder.setUpdateBy(order.getUpdateBy());
-                lOrder.setUpdateByName(LoginUserHolder.getUserName());
-                lOrder.setSubcontractAmount(logisticsOrder.getSubcontractAmount().add(bo.getCarryingCapacity()));
-//        lOrder.setIgnoreAmount(logisticsOrder.getIgnoreAmount().subtract(bo.getCarryingCapacity()));
-                //rabbitMq业务汇总数据发送/消费对象
-                SckwBusSum busSum = new SckwBusSum();
-                //业务汇总类型
-                busSum.setBusSumType(BusinessTypeEnum.LOGISTICS_ORDER_TYPE.getName());
-                //操作对象（1新增/2修改/3替换数据）
-                busSum.setMethod(2);
-                //业务汇总数据对象
-//                busSum.setObject(lOrder);
-//                streamBridge.send("sckw-busSum", com.alibaba.fastjson2.JSON.toJSONString(busSum));
-//                //新增当前分包mongodb数据
-//                subcontractSendMongoDB(lOrderNo, orderId, bo, logisticsOrder, orderStatus);
-            } finally {
-                redisLockUtil.unlock(key);
-            }
-            return HttpResult.ok();
-        }
-        return HttpResult.error("当前数据正在处理,请勿重复提交");
-    }
-
-    private void subcontractSendMongoDB(String lOrderNo, Long orderId, LogisticsOrderSubcontractDto bo, KwtLogisticsOrder kwtLogisticsOrder, Integer orderStatus) {
-        SckwLogisticsOrder logisticsOrder = new SckwLogisticsOrder();
-        logisticsOrder.setStatus(String.valueOf(orderStatus));
-        logisticsOrder.setLOrderId(orderId);
-        logisticsOrder.setLOrderNo(lOrderNo);
-        logisticsOrder.setLOrderPid(Long.parseLong(bo.getLOrderId()));
-        logisticsOrder.setSettlementCycle(bo.getSettlementCycle());
-        logisticsOrder.setPrice(bo.getPrice());
-        logisticsOrder.setPriceType(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getPriceType()) == null ?
-                null : Long.parseLong(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getPriceType()).getValue()));
-        if (!bo.getIsFullDose()) {
-            if (ArrayUtil.isEmpty(bo.getCarryingCapacity())) {
-                throw new RuntimeException("不是全量分配时,分配量不能为空!");
-            }
-            logisticsOrder.setAmount(bo.getCarryingCapacity());
-            logisticsOrder.setUnit(bo.getCarryingCapacityUnit());
-            logisticsOrder.setCarryingCapacity(bo.getCarryingCapacity());
-        } else {
-            logisticsOrder.setAmount(NumberConstant.ZERO_TWO);
-            logisticsOrder.setSubcontractAmount(NumberConstant.ZERO_TWO);
-            logisticsOrder.setCarryingCapacity(NumberConstant.ZERO_TWO);
-        }
-        logisticsOrder.setLoss(bo.getLoss() == null ? null : bo.getLoss());
-        logisticsOrder.setLossUnit(bo.getLossUnit());
-        logisticsOrder.setGoodsPrice(bo.getGoodsPrice());
-        BigDecimal decimal = new BigDecimal(NumberConstant.ZERO);
-        logisticsOrder.setSubcontractAmount(decimal);
-        logisticsOrder.setEntrustAmount(decimal);
-        logisticsOrder.setUnloadAmount(decimal);
-        logisticsOrder.setLoadAmount(decimal);
-        logisticsOrder.setIgnoreAmount(decimal);
-        logisticsOrder.setDeficitPrice(decimal);
-        logisticsOrder.setPayment(Long.parseLong(bo.getPayment()));
-        logisticsOrder.setTaxRate(bo.getTaxRate() == null ? null : new BigDecimal(bo.getTaxRate()));
-        logisticsOrder.setRemark(bo.getRemark());
-        logisticsOrder.setEntId(LoginUserHolder.getEntId());
-        logisticsOrder.setFirmName(remoteSystemService.queryEntCacheById(LoginUserHolder.getEntId()).getFirmName());
-        if (bo.getGoodsId() != null) {
-            logisticsOrder.setGoodsId(Long.parseLong(bo.getGoodsId()));
-            KwpGoods goods = goodsInfoService.getGoodsById(Long.parseLong(bo.getGoodsId()));
-            logisticsOrder.setGoodsType(goods == null ? null : goods.getGoodsType());
-            logisticsOrder.setGoodsSpec(goods == null ? null : goods.getSpec());
-        }
-        logisticsOrder.setGoodsName(bo.getGoodsName());
-        logisticsOrder.setContractId(bo.getContractId());
-        logisticsOrder.setContractNo(bo.getContractNo());
-        logisticsOrder.setContractName(bo.getContractName());
-        logisticsOrder.setContractSigningWay(bo.getPayment());
-        logisticsOrder.setCheckEntId(Long.parseLong(bo.getConsignCompanyId()));
-        logisticsOrder.setCheckFirmName(bo.getConsignCompany());
-        logisticsOrder.setCheckContacts(bo.getConsignContacts());
-        logisticsOrder.setCheckPhone(bo.getConsignContactPhone());
-        logisticsOrder.setCarrierEntId(Long.parseLong(bo.getAcceptContactsId()));
-        logisticsOrder.setCarrierFirmName(bo.getAcceptCompany());
-        logisticsOrder.setCarrierContacts(bo.getAcceptContacts());
-        //TODO 生成时并无时间
-//        logisticsOrder.setLoadTime();
-//        logisticsOrder.setunLoadTime();
-        logisticsOrder.setCreateBy(LoginUserHolder.getUserId());
-        logisticsOrder.setCreateByName(LoginUserHolder.getUserName());
-        logisticsOrder.setCreateTime(new Date());
-        logisticsOrder.setUpdateBy(LoginUserHolder.getUserId());
-        logisticsOrder.setUpdateByName(LoginUserHolder.getUserName());
-        logisticsOrder.setUpdateTime(new Date());
-        logisticsOrder.setGoodsPriceUnit(bo.getGoodsPriceUnit());
-        logisticsOrder.setContractName(bo.getContractName());
-        logisticsOrder.setBillingMode(bo.getBillingMode());
-        //rabbitMq业务汇总数据发送/消费对象
-        SckwBusSum busSum = new SckwBusSum();
-        //业务汇总类型
-        busSum.setBusSumType(BusinessTypeEnum.LOGISTICS_ORDER_TYPE.getName());
-        //操作对象（1新增/2修改）
-        busSum.setMethod(1);
-        //业务汇总数据对象
-        busSum.setObject(logisticsOrder);
-        streamBridge.send("sckw-busSum", JSON.toJSONString(busSum));
-
-    }
 
     private void insertLogisticsOrderLineFreight(LogisticsOrderSubcontractDto dto, Long orderId) {
         List<LineFreightDto> lineFreightList = dto.getLineFreightList();

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

@@ -1,18 +1,14 @@
 package com.sckw.transport.service;
 
-import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.sckw.core.model.constant.NumberConstant;
-import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.model.constant.Global;
+import com.sckw.core.model.constant.NumberConstant;
 import com.sckw.core.model.enums.CarWaybillEnum;
 import com.sckw.core.model.enums.CarWaybillQueryEnum;
-import com.sckw.core.model.page.PageHelperUtil;
-import com.sckw.core.model.page.PageResult;
-import com.sckw.core.utils.*;
+import com.sckw.core.utils.BeanUtils;
+import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.utils.StringTimeUtil;
+import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.DateUtil;
@@ -21,26 +17,24 @@ import com.sckw.mongo.model.SckwWaybillOrder;
 import com.sckw.mongo.model.TableTops;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.AreaTreeFrontResDto;
-import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import com.sckw.transport.dao.*;
-import com.sckw.transport.model.*;
-import com.sckw.transport.model.dto.*;
-import com.sckw.transport.model.vo.*;
+import com.sckw.transport.model.KwtLogisticsOrderCirculate;
+import com.sckw.transport.model.KwtWaybillOrder;
+import com.sckw.transport.model.KwtWaybillOrderTrack;
+import com.sckw.transport.model.dto.AddressDropListDTO;
+import com.sckw.transport.model.dto.WaybillOrderDTO;
+import com.sckw.transport.model.vo.WaybillSimpleDataVO;
+import com.sckw.transport.model.vo.WaybillStatusVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
 import org.springframework.data.mongodb.core.aggregation.AggregationResults;
 import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
 
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -87,169 +81,6 @@ public class KwtWaybillManagementService {
     @Autowired
     private MongoTemplate mongoTemplate;
 
-    @Autowired
-    private KwtCommonService commonService;
-
-    /**
-     * 运单详情
-     *
-     * @param id
-     * @return
-     */
-    public HttpResult waybillData(Long id) {
-        if (Objects.isNull(id)) {
-            return HttpResult.error("id不能为空");
-        }
-        WaybillDataVO waybillDataVO = new WaybillDataVO();
-        Criteria criteria = new Criteria();
-        criteria.and("_id").is(id);
-        criteria.and("delFlag").is(NumberConstant.ZERO);
-        Query queryFormat = new Query(criteria);
-        SckwWaybillOrder info = mongoTemplate.findOne(queryFormat, SckwWaybillOrder.class);
-
-        WayBillDetailDTO wayBillDetailDTO = new WayBillDetailDTO();
-        WaybillTicketVO waybillTicketVO = new WaybillTicketVO();
-        WaybillCarVO waybillCarVO = new WaybillCarVO();
-        if (!ObjectUtils.isEmpty(info)) {
-            // 基础信息
-            wayBillDetailDTO.setTruckId(info.getTruckId());
-            wayBillDetailDTO.setStatus(String.valueOf(info.getStatus()));
-            wayBillDetailDTO.setTruckNo(info.getTruckNo());
-            wayBillDetailDTO.setDriverId(info.getDriverId());
-            wayBillDetailDTO.setDriverName(info.getDriverName());
-            wayBillDetailDTO.setDriverPhone(info.getDriverPhone());
-            wayBillDetailDTO.setDriverId(info.getDriverId());
-            wayBillDetailDTO.setWOrderId(info.getWOrderId());
-            wayBillDetailDTO.setWOrderNo(info.getWOrderNo());
-            wayBillDetailDTO.setLOrderId(info.getLOrderId());
-            wayBillDetailDTO.setLOrderNo(info.getLOrderNo());
-            wayBillDetailDTO.setLOrderNo(info.getLOrderNo());
-            wayBillDetailDTO.setEntrustAmount(String.valueOf(info.getEntrustAmount()));
-            wayBillDetailDTO.setType(String.valueOf(info.getType()));
-            wayBillDetailDTO.setTypeLabel(info.getType().equals(NumberConstant.ONE) ? "趟次" : "循环");
-            wayBillDetailDTO.setStartTime(info.getStartTime());
-            wayBillDetailDTO.setEndTime(info.getEndTime());
-            wayBillDetailDTO.setCreateBy(info.getCreateByName());
-            wayBillDetailDTO.setGoodsName(info.getGoodsName());
-            if (info.getLoadDetailAddress().contains(info.getLoadCityName())){
-                wayBillDetailDTO.setLoadDetailAddress(info.getLoadDetailAddress());
-            }else {
-                wayBillDetailDTO.setLoadDetailAddress(info.getLoadCityName().concat(info.getLoadDetailAddress()));
-            }
-            if (info.getUnloadDetailAddress().contains(info.getUnloadCityName())){
-                wayBillDetailDTO.setUnloadDetailAddress(info.getUnloadDetailAddress());
-            }else {
-                wayBillDetailDTO.setUnloadDetailAddress(info.getUnloadCityName().concat(info.getUnloadDetailAddress()));
-            }
-            wayBillDetailDTO.setLoadName(info.getLoadName());
-            wayBillDetailDTO.setUnloadName(info.getUnloadName());
-            wayBillDetailDTO.setCarrierFirmName(info.getCarrierFirmName());
-            wayBillDetailDTO.setCheckFirmName(info.getCheckFirmName());
-            // 计费方式
-            KwtLogisticsOrder kwtLogisticsOrder = kwtLogisticsOrderMapper.selectById(info.getLOrderId());
-            if (!ObjectUtils.isEmpty(kwtLogisticsOrder)) {
-                wayBillDetailDTO.setPriceType(kwtLogisticsOrder.getBillingMode());
-                SysDictResDto billingMode = remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.CHARGING_TYPE.getType(), kwtLogisticsOrder.getBillingMode());
-                if (!ObjectUtils.isEmpty(billingMode)) {
-                    wayBillDetailDTO.setPriceTypeLabe(billingMode.getLabel());
-                }
-            }
-            wayBillDetailDTO.setCheckFirmName(info.getCheckFirmName());
-            // 运输量单位
-            wayBillDetailDTO.setUnit(info.getUnit() == null ? null : info.getUnit());
-            if (info.getUnit() != null) {
-                Map<String, SysDictResDto> unitType = remoteSystemService.queryDictMapByType(DictTypeEnum.UNIT_TYPE.getType());
-                SysDictResDto sysDict = unitType.get(info.getUnit());
-                wayBillDetailDTO.setUnitLabel(sysDict == null ? null : sysDict.getLabel());
-            }
-            // 派车人信息
-            UserCacheResDto createUser = remoteSystemService.queryUserCacheById(info.getCreateBy());
-            if (!ObjectUtils.isEmpty(createUser)) {
-                wayBillDetailDTO.setCreateByPhone(createUser.getPhone());
-            }
-            // 车辆信息
-            SysDictResDto truckTypeString = remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.TRUCK_TYPE.getType(), info.getTruckType());
-            if (!ObjectUtils.isEmpty(truckTypeString)) {
-                waybillCarVO.setTypeLabel(truckTypeString.getLabel());
-            }
-            waybillCarVO.setTruckId(String.valueOf(info.getTruckId()));
-            waybillCarVO.setTruckNo(info.getTruckNo());
-            waybillCarVO.setType(info.getTruckType());
-            waybillCarVO.setDriverName(info.getDriverName());
-            waybillCarVO.setDriverPhone(info.getDriverPhone());
-            waybillCarVO.setDriverId(String.valueOf(info.getTruckId()));
-            waybillCarVO.setTrailerNo(info.getTruckTrailerNo());
-
-            // 单证信息
-            BigDecimal deficitLoss = info.getLoss() == null ? BigDecimal.valueOf(0) : info.getLoss();
-            BigDecimal loadAmount = info.getLoadAmount() == null ? NumberConstant.ZERO_TWO : info.getLoadAmount();
-            BigDecimal unloadAmount = info.getUnloadAmount() == null ? NumberConstant.ZERO_TWO : info.getUnloadAmount();
-            BigDecimal deficitRealAmount = commonService.deficitLossAmount( info.getLoadAmount(), loadAmount.subtract(unloadAmount), deficitLoss, info.getLossUnit());
-            waybillTicketVO = kwtWaybillOrderTicketService.agreement(id, info.getUnit(), String.valueOf(info.getDeficitAmount()), deficitRealAmount.toString());
-        }
-
-        List<Integer> statuses = initWaybillIndexStatus();
-        // 初始化各状态
-        List<WaybillStatusVO> statusVOS = new ArrayList<>();
-        statuses.forEach(e -> {
-            WaybillStatusVO waybillStatusVO = new WaybillStatusVO();
-            waybillStatusVO.setStatus(false);
-            if(e.equals(CarWaybillEnum.PENDING_ORDER.getCode())) {
-                // 默认选中 待接单 状态
-                waybillStatusVO.setStatus(true);
-            }
-            waybillStatusVO.setCode(e);
-            waybillStatusVO.setDestination(CarWaybillEnum.getName(e));
-            statusVOS.add(waybillStatusVO);
-        });
-
-        List<KwtWaybillOrderTrack> kwtWaybillOrderTracks = kwtWaybillOrderTrackMapper
-                .selectList(new LambdaQueryWrapper<KwtWaybillOrderTrack>()
-                        .eq(KwtWaybillOrderTrack::getWOrderId, id));
-        List<WaybillTrackVO> waybillTrackVOS = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(kwtWaybillOrderTracks)) {
-            List<Long> userIds = new ArrayList<>();
-            kwtWaybillOrderTracks.forEach(e -> userIds.add(e.getCreateBy()));
-            List<UserInfoVo> users = commonService.findUserList(userIds);
-            Map<Long, String> userNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
-            users.forEach(e -> userNameMap.put(e.getId(), e.getName()));
-            Map<Long, String> userPhoneMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
-            users.forEach(e -> userPhoneMap.put(e.getId(), e.getPhone()));
-
-            for (KwtWaybillOrderTrack track : kwtWaybillOrderTracks) {
-                for (WaybillStatusVO statusVO : statusVOS) {
-                    if (statusVO.getCode().equals(track.getStatus())) {
-                        statusVO.setStatus(true);
-                        statusVO.setId(track.getId());
-                        statusVO.setCreateTime(DateUtil.getDateTime(track.getCreateTime()));
-                        statusVO.setOperateTime(DateUtil.getDateTime(track.getOperateTime()));
-                        statusVO.setCreateByName(userNameMap.get(track.getCreateBy()));
-                        break;
-                    }
-                }
-
-                WaybillTrackVO waybillTrackVO = new WaybillTrackVO();
-                waybillTrackVO.setId(String.valueOf(track.getId()))
-                        .setRemark(track.getRemark())
-                        .setStatus(String.valueOf(track.getStatus()))
-                        .setStatusLabel(CarWaybillEnum.getName(track.getStatus()))
-                        .setCreateBy(track.getCreateBy())
-                        .setCreateByPhone(userPhoneMap.get(track.getCreateBy()))
-                        .setCreateByName(userNameMap.get(track.getCreateBy()))
-                        .setCreateTime(DateUtil.getDateTime(track.getCreateTime()))
-                        .setOperateTime(DateUtil.getDateTime(track.getOperateTime()));
-                waybillTrackVOS.add(waybillTrackVO);
-            }
-        }
-
-        waybillDataVO.setAgreement(waybillTicketVO);
-        waybillDataVO.setCar(waybillCarVO);
-        waybillDataVO.setTransport(wayBillDetailDTO);
-        waybillDataVO.setProcess(statusVOS);
-        waybillTrackVOS = waybillTrackVOS.stream().sorted(Comparator.comparing(WaybillTrackVO::getCreateTime).reversed()).collect(Collectors.toList());
-        waybillDataVO.setLogs(waybillTrackVOS);
-        return HttpResult.ok(waybillDataVO);
-    }
 
     /**
      * 简洁版运单详情
@@ -316,120 +147,7 @@ public class KwtWaybillManagementService {
         return HttpResult.ok(waybillSimpleDataVO);
     }
 
-    /**
-     * 运单看板列表
-     *
-     * @param query
-     * @return
-     * @throws Exception
-     */
-    public HttpResult waybillIndex(WaybillOrderDTO query) throws Exception {
-        // mongo查询列数据，不足的数据单独关联表查询
-        // 状态查询 status [2-8]
-        List<Integer> statuses = initWaybillIndexStatus();
-        // 初始化各状态
-        List<WaybillStatusVO> statusVOS = new ArrayList<>();
-        // 已作废
-        List<Integer> abortStatues = new ArrayList<>();
-        abortStatues.add(CarWaybillQueryEnum.REJECT_ORDER.getCode());
-        abortStatues.add(CarWaybillEnum.REFUSE_TRAFFIC.getCode());
-        abortStatues.add(CarWaybillEnum.REVOKED.getCode());
-        statuses.forEach(e -> {
-            WaybillStatusVO waybillStatusVO = new WaybillStatusVO();
-            waybillStatusVO.setStatus(false);
-            if(e.equals(CarWaybillEnum.PENDING_ORDER.getCode()) && !abortStatues.contains(e)) {
-                // 默认选中 待接单 状态, 已作废的不选中
-                waybillStatusVO.setStatus(true);
-            }
-            waybillStatusVO.setCode(e);
-            waybillStatusVO.setDestination(CarWaybillEnum.getName(e));
-            statusVOS.add(waybillStatusVO);
-        });
-
-        Criteria criteria = buildWaybillIndexQuery(query);
-        Query queryFormat = new Query(criteria);
-        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<WaybillBoardListVO> orders = new ArrayList<>();
-        packageWaybillIndexResult(list, statusVOS, orders);
-        PageResult build = PageResult.build(query.getPage(), query.getPageSize(), total, orders);
-        return HttpResult.ok(build);
-    }
-
-    /**
-     * @return
-     */
-    public void packageWaybillIndexResult(List<SckwWaybillOrder> list, List<WaybillStatusVO> statusVOS, List<WaybillBoardListVO> returnList) {
-        // 执行查询
-        for (SckwWaybillOrder sckwWaybillOrder : list) {
-            WaybillBoardListVO waybillBoardListVO = new WaybillBoardListVO();
-            waybillBoardListVO.setWOrderId(sckwWaybillOrder.getWOrderId() != null ? String.valueOf(sckwWaybillOrder.getWOrderId()) : String.valueOf(sckwWaybillOrder.get_id()));
-            waybillBoardListVO.setWOrderNo(sckwWaybillOrder.getWOrderNo() == null ? null : sckwWaybillOrder.getWOrderNo());
-            waybillBoardListVO.setStatus(String.valueOf(sckwWaybillOrder.getStatus()));
-            waybillBoardListVO.setType(String.valueOf(sckwWaybillOrder.getType()));
-            waybillBoardListVO.setStatusLabel(CarWaybillEnum.getName(sckwWaybillOrder.getStatus()));
-            waybillBoardListVO.setGoodsName(String.valueOf(sckwWaybillOrder.getGoodsName()));
-            waybillBoardListVO.setLoadAmount(sckwWaybillOrder.getLoadAmount());
-            waybillBoardListVO.setLoadName(sckwWaybillOrder.getLoadName());
-            waybillBoardListVO.setLoadDetailAddress(String.valueOf(sckwWaybillOrder.getLoadDetailAddress()));
-            waybillBoardListVO.setUnloadAmount(sckwWaybillOrder.getUnloadAmount());
-            waybillBoardListVO.setUnloadName(sckwWaybillOrder.getUnloadName());
-            waybillBoardListVO.setUnloadDetailAddress(String.valueOf(sckwWaybillOrder.getUnloadDetailAddress()));
-            waybillBoardListVO.setStartTime(DateUtil.getDateTime(sckwWaybillOrder.getStartTime()));
-            waybillBoardListVO.setEndTime(DateUtil.getDateTime(sckwWaybillOrder.getEndTime()));
-            waybillBoardListVO.setFirmName(String.valueOf(sckwWaybillOrder.getFirmName()));
-            waybillBoardListVO.setCreateByName(String.valueOf(sckwWaybillOrder.getCreateByName()));
-            waybillBoardListVO.setCreateTime(DateUtil.getDateTime(sckwWaybillOrder.getCreateTime()));
-            waybillBoardListVO.setDriverName(String.valueOf(sckwWaybillOrder.getDriverName()));
-            waybillBoardListVO.setDriverPhone(String.valueOf(sckwWaybillOrder.getDriverPhone()));
-            waybillBoardListVO.setTruckNo(String.valueOf(sckwWaybillOrder.getTruckNo()));
-            waybillBoardListVO.setLoadGrossAmount(sckwWaybillOrder.getLoadGrossAmount() != null ? String.valueOf(sckwWaybillOrder.getLoadGrossAmount()) : null);
-            waybillBoardListVO.setUnloadGrossAmount(sckwWaybillOrder.getUnloadGrossAmount() != null ? String.valueOf(sckwWaybillOrder.getUnloadGrossAmount()) : null);
-            waybillBoardListVO.setLoadUrls(FileUtils.splice(sckwWaybillOrder.getLoadUrls()));
-            waybillBoardListVO.setUnloadUrls(FileUtils.splice(sckwWaybillOrder.getUnloadUrls()));
 
-            List<WaybillStatusVO> statusVOS2 = new ArrayList<>();
-            statusVOS.forEach(e -> {
-                WaybillStatusVO temp = new WaybillStatusVO();
-                BeanUtils.copyProperties(e, temp);
-                statusVOS2.add(temp);
-            });
-            waybillBoardListVO.setTracks(statusVOS2);
-            // 运单量单位
-            waybillBoardListVO.setUnit(sckwWaybillOrder.getUnit());
-            if (sckwWaybillOrder.getUnit() != null) {
-                Map<String, String> unitType = commonService.getDictData(DictTypeEnum.UNIT_TYPE.getType());
-                String sysDict = unitType == null ? null : unitType.get(sckwWaybillOrder.getUnit());
-                waybillBoardListVO.setUnitLabel(sysDict);
-            }
-            // 运单进度
-            List<KwtWaybillOrderTrack> kwtWaybillOrderTracks = kwtWaybillOrderTrackMapper
-                    .selectList(new LambdaQueryWrapper<KwtWaybillOrderTrack>()
-                            .eq(KwtWaybillOrderTrack::getWOrderId, sckwWaybillOrder.getWOrderId()));
-
-            if (CollectionUtils.isNotEmpty(kwtWaybillOrderTracks)) {
-                List<Long> userIds = new ArrayList<>();
-                kwtWaybillOrderTracks.forEach(e -> userIds.add(e.getCreateBy()));
-                List<UserInfoVo> users = commonService.findUserList(userIds);
-                Map<Long, String> usersMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
-                users.forEach(e -> usersMap.put(e.getId(), e.getName()));
-                waybillBoardListVO.getTracks().forEach(e -> {
-                    kwtWaybillOrderTracks.forEach(e2 -> {
-                        if (e.getCode().equals(e2.getStatus())) {
-                            e.setStatus(true);
-                            e.setId(e2.getId());
-                            e.setOperateTime(e2.getOperateTime() == null ? null : DateUtil.getDateTime(e2.getOperateTime()));
-                            e.setCreateTime(e2.getCreateTime() == null ? null : DateUtil.getDateTime(e2.getCreateTime()));
-                            e.setCreateByName(usersMap.get(e2.getCreateBy()) == null ? null : usersMap.get(e2.getCreateBy()));
-                        }
-                    });
-                });
-            }
-            returnList.add(waybillBoardListVO);
-        }
-    }
 
     /**
      * @return
@@ -834,258 +552,6 @@ public class KwtWaybillManagementService {
         return HttpResult.ok(_list);
     }
 
-    /**
-     * app 运单列表 [运输中|已完成]
-     *
-     * @param query
-     * @return
-     */
-    public HttpResult waybillDataApp(WaybillListAppDTO query) {
-        List<Integer> processStatuses = initWaybillIndexStatus();
-        List<Long> _statuses = getWallBillStatues(query.getStatus());
-        Criteria criteria = new Criteria();
-        criteria.and("entId").is(LoginUserHolder.getEntId());
-        criteria.and("delFlag").is(NumberConstant.ZERO);
-        // 多条件模糊查询
-        List<Criteria> orCriteria = new ArrayList<>();
-        if (StringUtils.isNotBlank(query.getKeyword())) {
-            Pattern pattern = Pattern.compile("^.*" + query.getKeyword() + ".*$", Pattern.CASE_INSENSITIVE);
-            orCriteria.add(Criteria.where("wOrderNo").regex(pattern));
-            orCriteria.add(Criteria.where("truckNo").regex(pattern));
-            orCriteria.add(Criteria.where("driverName").regex(pattern));
-            orCriteria.add(Criteria.where("firmName").regex(pattern));
-            criteria.orOperator(orCriteria);
-        }
-        // in查询
-        if (CollectionUtils.isNotEmpty(_statuses)) {
-            criteria.and("status").in(_statuses);
-        }
-        // 查询时间段
-        if (Objects.nonNull(query.getStartDate()) && Objects.nonNull(query.getEndDate())) {
-            criteria.and("updateTime")
-                    .gte(DateUtil.strDateTimeToDateTime(StringTimeUtil.fillStart(query.getStartDate())))
-                    .lte(DateUtil.strDateTimeToDateTime(StringTimeUtil.fillEnd(query.getEndDate())));
-        }
-        Query queryFormat = new Query(criteria);
-        // 总记录数
-        long total = mongoTemplate.count(queryFormat, SckwWaybillOrder.class);
-        queryFormat.with(PageRequest.of(query.getPage() - 1, query.getPageSize(),
-                Sort.by(Sort.Order.desc("updateTime"))));
-        // 执行查询
-        List<SckwWaybillOrder> list = mongoTemplate.find(queryFormat, SckwWaybillOrder.class);
-        List<WaybillBoardListVO> returnList = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(list)) {
-            List<WaybillStatusVO> statusVOS = new ArrayList();
-            processStatuses.forEach(e -> {
-                WaybillStatusVO waybillStatusVO = new WaybillStatusVO();
-                waybillStatusVO.setStatus(false);
-                waybillStatusVO.setCode(e);
-                waybillStatusVO.setDestination(CarWaybillEnum.getName(e));
-                statusVOS.add(waybillStatusVO);
-            });
-            packageWaybillIndexResult(list, statusVOS, returnList);
-        }
-        PageResult build = PageResult.build(query.getPage(), query.getPageSize(), total, returnList);
-        return HttpResult.ok(build);
-    }
-
-    /**
-     * 物流订单-运单列表
-     *
-     * @param query
-     * @return
-     */
-    public HttpResult logisticOrderWaybillData(WaybillListAppDTO query) {
-        List<Integer> processStatuses = initWaybillIndexStatus();
-        Criteria criteria = new Criteria();
-        criteria.and("delFlag").is(NumberConstant.ZERO);
-
-        List<Long> lOrderIds = StringUtils.splitStrToList(query.getLOrderId(), ",", Long.class);
-        if (CollectionUtils.isEmpty(lOrderIds)) {
-            return HttpResult.ok();
-        }
-        criteria.and("lOrderId").in(lOrderIds);
-        criteria.and("wOrderId").ne("").ne(null);
-        // 多条件模糊查询
-        List<Criteria> orCriteria = new ArrayList<>();
-        if (StringUtils.isNotBlank(query.getKeyword())) {
-            Pattern pattern = Pattern.compile("^.*" + query.getKeyword() + ".*$", Pattern.CASE_INSENSITIVE);
-            orCriteria.add(Criteria.where("wOrderNo").regex(pattern));
-            orCriteria.add(Criteria.where("truckNo").regex(pattern));
-            orCriteria.add(Criteria.where("driverName").regex(pattern));
-            orCriteria.add(Criteria.where("firmName").regex(pattern));
-            criteria.orOperator(orCriteria);
-        }
-        Query queryFormat = new Query(criteria);
-        // 总记录数
-        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<WaybillBoardListVO> returnList = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(list)) {
-            List<WaybillStatusVO> statusVOS = new ArrayList();
-            processStatuses.forEach(e -> {
-                WaybillStatusVO waybillStatusVO = new WaybillStatusVO();
-                waybillStatusVO.setStatus(false);
-                waybillStatusVO.setCode(e);
-                waybillStatusVO.setDestination(CarWaybillEnum.getName(e));
-                statusVOS.add(waybillStatusVO);
-            });
-            packageWaybillIndexResult(list, statusVOS, returnList);
-        }
-
-        PageResult build = PageResult.build(query.getPage(), query.getPageSize(), total, returnList);
-        return HttpResult.ok(build);
-    }
-
-    public HttpResult logisticOrderWaybillDataV1(WaybillListAppDTO query) {
-        Map<String, Object> params = BeanUtil.beanToMap(query);
-        // 设置分页参数
-        PageHelper.startPage(PageResult.getPage(params), PageResult.getPageSize(params));
-        /*数据查询**/
-        List<WaybillOrderSubtaskVo> waybillOrders = waybillOrderV1Mapper.findWaybillOrderSubtask(params);
-
-        //单位
-        Map<String, Map<String, String>> dict = remoteSystemService.queryDictByType(List.of(DictTypeEnum.UNIT_TYPE.getType()));
-        Map<String, String> unitMap = CollectionUtils.isNotEmpty(dict) ? dict.get(DictTypeEnum.UNIT_TYPE.getType()) : new HashMap<>(NumberConstant.SIXTEEN);
-
-        List<Map<String, Object>> result = new ArrayList<>();
-        for (WaybillOrderSubtaskVo subtask:waybillOrders) {
-            Map<String, Object> order = BeanUtil.beanToMap(subtask);
-            order.put("statusLabel", CarWaybillEnum.getName(subtask.getStatus()));
-            order.put("unitLabel", unitMap.get(subtask.getUnit()));
-            order.put("typeLabel", subtask.getType() == NumberConstant.ONE ? "趟次" : "循环");
-            result.add(order);
-        }
-
-        PageResult pageResult = PageHelperUtil.getPageResult(new PageInfo<>(result));
-        return HttpResult.ok(pageResult);
-    }
-
-
-    /**
-     * app 运单分类吨量统计数据 [运输中|已完成]
-     *
-     * @param query
-     * @return
-     */
-    public HttpResult waybillAmountStatistic(WaybillListAppDTO query) {
-        List<Long> _statuses = getWallBillStatues(query.getStatus());
-        List<WaybillAmountDTO> wOrders = kwtWaybillOrderMapper.selectWaybillOrdersByStatus(
-                LoginUserHolder.getEntId(),
-                LoginUserHolder.getAuthUserIdList(),
-                _statuses,
-                query.getKeyword(),
-                StringUtils.isBlank(query.getStartDate()) ? null : StringTimeUtil.fillStart(query.getStartDate()),
-                StringUtils.isBlank(query.getEndDate()) ? null : StringTimeUtil.fillEnd(query.getEndDate())
-        );
-        Map<String, String> amount = new HashMap<>(Global.NUMERICAL_SIXTEEN);
-        // 总计条数
-        amount.put("total", String.valueOf(wOrders.size()));
-        BigDecimal loadAmount = new BigDecimal(Global.AMOUNT);
-        BigDecimal unloadAmount = new BigDecimal(Global.AMOUNT);
-        BigDecimal lossAmount = new BigDecimal(Global.AMOUNT);
-        BigDecimal deficitRealAmount = new BigDecimal(Global.AMOUNT);
-        if(CollectionUtils.isNotEmpty(wOrders)) {
-            for (WaybillAmountDTO wOrder:wOrders) {
-                loadAmount = loadAmount.add(wOrder.getLoadAmount() == null ? new BigDecimal(Global.AMOUNT) : wOrder.getLoadAmount());
-                unloadAmount = unloadAmount.add(wOrder.getUnloadAmount() == null ? new BigDecimal(Global.AMOUNT) : wOrder.getUnloadAmount());
-                lossAmount = lossAmount.add(wOrder.getDeficitAmount() == null ? new BigDecimal(Global.AMOUNT) : wOrder.getDeficitAmount());
-                if(wOrder.getLoadAmount() != null
-                        && wOrder.getUnloadAmount() != null
-                        && wOrder.getDeficitAmount() != null
-                ) {
-                    BigDecimal realDeficitAMount = commonService.deficitLossAmount(
-                            wOrder.getLoadAmount(),
-                            wOrder.getDeficitAmount(),
-                            wOrder.getLoss(),
-                            wOrder.getLossUnit()
-                    );
-                    deficitRealAmount = deficitRealAmount.add(realDeficitAMount);
-                }
-            }
-        }
-        // 总计装货量
-        amount.put("loadAmount",  String.valueOf(loadAmount));
-        // 总计卸货量
-        amount.put("unloadAmount",  String.valueOf(unloadAmount));
-        // 总计货损量
-        amount.put("lossAmount",  String.valueOf(lossAmount));
-        // 总计扣亏量
-        amount.put("deficitRealAmount",  String.valueOf(deficitRealAmount));
-        return HttpResult.ok(amount);
-    }
-
-    /**
-     * app 运单分类吨量统计数据 [运输中|已完成] - mongo
-     *
-     * @param query
-     * @return
-     */
-    public HttpResult waybillAmountStatisticCount(WaybillListAppDTO query) {
-        Long entId = LoginUserHolder.getEntId();
-        Criteria criteria = new Criteria();
-        criteria.and("entId").is(entId);
-        criteria.and("delFlag").is(NumberConstant.ZERO);
-        // 多条件模糊查询
-        List<Criteria> orCriteria = new ArrayList<>();
-        if (StringUtils.isNotBlank(query.getKeyword())) {
-            Pattern pattern = Pattern.compile("^.*" + query.getKeyword() + ".*$", Pattern.CASE_INSENSITIVE);
-            orCriteria.add(Criteria.where("wOrderNo").regex(pattern));
-            orCriteria.add(Criteria.where("truckNo").regex(pattern));
-            orCriteria.add(Criteria.where("driverName").regex(pattern));
-            orCriteria.add(Criteria.where("driverPhone").regex(pattern));
-            orCriteria.add(Criteria.where("firmName").regex(pattern));
-            criteria.orOperator(orCriteria);
-        }
-        // in查询
-        List<Long> finishStates = getWallBillStatues("finish");
-        if (CollectionUtils.isNotEmpty(finishStates)) {
-            criteria.and("status").in(finishStates);
-        }
-        // 查询时间段
-        if (!StringUtils.isEmpty(query.getStartDate()) && !StringUtils.isEmpty(query.getEndDate())) {
-            criteria.and("updateTime")
-                    .gte(DateUtil.strDateTimeToDateTime(StringTimeUtil.fillStart(query.getStartDate())))
-                    .lte(DateUtil.strDateTimeToDateTime(StringTimeUtil.fillStart(query.getEndDate())));
-        }
-        Query queryFormat = new Query(criteria);
-        List<SckwWaybillOrder> list = mongoTemplate.find(queryFormat, SckwWaybillOrder.class);
-        int total = 0;
-        BigDecimal loadAmount = new BigDecimal(Global.AMOUNT);
-        BigDecimal unloadAmount = new BigDecimal(Global.AMOUNT);
-        BigDecimal lossAmount = new BigDecimal(Global.AMOUNT);
-        BigDecimal deficitRealAmount = new BigDecimal(Global.AMOUNT);
-        if (CollectionUtils.isNotEmpty(list)) {
-            for (SckwWaybillOrder wOrder:list) {
-                total += 1;
-                loadAmount = loadAmount.add(wOrder.getLoadAmount() == null ? new BigDecimal(Global.AMOUNT) : wOrder.getLoadAmount());
-                unloadAmount = unloadAmount.add(wOrder.getUnloadAmount() == null ? new BigDecimal(Global.AMOUNT) : wOrder.getUnloadAmount());
-                lossAmount = lossAmount.add(wOrder.getDeficitAmount() == null ? new BigDecimal(Global.AMOUNT) : wOrder.getDeficitAmount());
-                BigDecimal _deficitRealAmount = commonService.deficitLossAmount(
-                        wOrder.getLoadAmount(),
-                        wOrder.getDeficitAmount(),
-                        wOrder.getLoss(),
-                        wOrder.getLossUnit()
-                );
-                deficitRealAmount.add(_deficitRealAmount);
-            }
-        }
-        Map<String, String> amount = new HashMap<>(Global.NUMERICAL_SIXTEEN);
-        // 总计条数
-        amount.put("total", String.valueOf(total));
-        // 总计装货量
-        amount.put("loadAmount",  String.valueOf(loadAmount));
-        // 总计卸货量
-        amount.put("unloadAmount",  String.valueOf(unloadAmount));
-        // 总计货损量
-        amount.put("lossAmount",  String.valueOf(lossAmount));
-        // 总计扣亏量
-        amount.put("deficitRealAmount",  String.valueOf(deficitRealAmount));
-        return HttpResult.ok(amount);
-    }
-
     /**
      * 获取 [运输中|已完成] 状态列表
      *

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

@@ -84,8 +84,7 @@ public class KwtWaybillManagementV1Service {
     @Autowired
     private MongoTemplate mongoTemplate;
 
-    @Autowired
-    private KwtCommonService commonService;
+
 
 
     /**

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

@@ -48,9 +48,6 @@ import com.sckw.payment.api.feign.PaymentFeignService;
 import com.sckw.payment.api.model.feign.WalletPayableDto;
 import com.sckw.product.api.dubbo.GoodsInfoService;
 import com.sckw.product.api.model.KwpGoods;
-import com.sckw.stream.enums.MessageEnum;
-import com.sckw.stream.model.SckwMessage;
-import com.sckw.stream.model.UserInfo;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.RemoteUserService;
 import com.sckw.system.api.feign.DataPermissionFeignService;
@@ -79,7 +76,6 @@ import org.apache.dubbo.config.annotation.DubboReference;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cloud.stream.function.StreamBridge;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -135,8 +131,7 @@ public class KwtWaybillOrderV1Service {
     KwtLogisticsOrderGoodsService kwtLogisticsOrderGoodsService;
     @Autowired
     KwtWaybillOrderSubtaskService waybillOrderSubtaskService;
-    @Autowired
-    KwtCommonService commonService;
+
     @Resource
     private UrlConfigProperties urlConfigProperties;
     private final KwtWaybillOrderAddressRepository waybillOrderAddressRepository;
@@ -151,8 +146,8 @@ public class KwtWaybillOrderV1Service {
     private final KwtWaybillOrderTicketRepository  kwtWaybillOrderTicketRepository;
     private final KwtWaybillOrderNodeRepository kwtWaybillOrderNodeRepository;
     private final VehicleTraceClient vehicleTraceClient;
-    @Resource
-    private StreamBridge streamBridge;
+//    @Resource
+//    private StreamBridge streamBridge;
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
     @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
@@ -1396,80 +1391,80 @@ public class KwtWaybillOrderV1Service {
      **/
     @Transactional(rollbackFor = Exception.class)
     public HttpResult refuseSendCarV1(OperateWaybillDto params) {
-        /*1、校验*/
-        Long wOrderId = params.getWOrderId();
-        //运单信息
-        KwtWaybillOrderV1 waybillOrder = waybillOrderV1Dao.selectById(wOrderId);
-        if (waybillOrder == null) {
-            return HttpResult.error("运单" + wOrderId + "不存在，请确认！");
-        }
-        //待接单的车辆运单才能拒绝接单
-        if (!waybillOrder.getStatus().equals(CarWaybillEnum.PENDING_ORDER.getCode())) {
-            return HttpResult.error("运单" + waybillOrder.getWOrderNo() + "当前状态已不能拒绝接单！");
-        }
-
-        /*2、更新运单状态*/
-        waybillOrder.setStatus(CarWaybillEnum.REJECT_ORDER.getCode());
-        waybillOrderV1Dao.updateById(waybillOrder);
-
-        /*3、新增运单状态记录*/
-        setWaybillOrderTrack(waybillOrder.getId(), null, null, params.getOperateTime(), waybillOrder.getStatus(), params.getRemark());
-
-        //4、运单子单更新状态
-        List<KwtWaybillOrderSubtask> orderSubtasks = waybillOrderSubtaskDao.findByWOrderId(wOrderId);
-        for (KwtWaybillOrderSubtask subtask : orderSubtasks) {
-            //更新运单子单状态
-            subtask.setStatus(waybillOrder.getStatus());
-            waybillOrderSubtaskDao.updateById(subtask);
-        }
-
-        //循环运单不对物流订单委托量变更
-        if (waybillOrder.getType() == Global.NUMERICAL_TWO) {
-            return HttpResult.ok();
-        }
-
-        /*5、回退物流订单委托量(循环运单)*/
-        /*5.1、装货址委派量entrustAmount回退*/
-        //运单装货地址
-        List<KwtWaybillOrderAddress> orderAddresses = waybillOrderAddressDao.findByAddresses(wOrderId, AddressTypeEnum.SHIPMENT.getCode());
-        for (KwtWaybillOrderAddress address : orderAddresses) {
-            //物流订单-装卸货地址运量信息
-            KwtLogisticsOrderAmount logisticsOrderAmount = logisticsOrderAmountDao.findByLAddressId(address.getLAddressId());
-            //承运订单地址已委派量=承运订单地址原委派量-+当前车辆运单地址委派量
-            BigDecimal entrustAmount = logisticsOrderAmount.getEntrustAmount() == null ? NumberConstant.ZERO_TWO : logisticsOrderAmount.getEntrustAmount();
-            logisticsOrderAmount.setEntrustAmount(entrustAmount.subtract(address.getEntrustAmount()));
-            logisticsOrderAmountDao.updateById(logisticsOrderAmount);
-        }
-
-        /*5.2、物流订单委派量entrustAmount回退*/
-        for (KwtWaybillOrderSubtask subtask : orderSubtasks) {
-            //物流订单
-            KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(subtask.getLOrderId());
-            //承运订单已委派量=承运订单原委派量-当前车辆运单委派量
-            BigDecimal entrustAmount = logisticsOrder.getEntrustAmount() == null ? NumberConstant.ZERO_TWO : logisticsOrder.getEntrustAmount();
-            logisticsOrder.setEntrustAmount(entrustAmount.subtract(subtask.getEntrustAmount()));
-            logisticsOrderDao.updateById(logisticsOrder);
-        }
-
-        /*6发送消息**/
-        List<UserInfo> users = new ArrayList<>() {{
-            add(new UserInfo(waybillOrder.getCreateBy(), waybillOrder.getEntId()));
-        }};
-        Map<String, Object> msgParams = new HashMap<>() {{
-            put("orderNo", waybillOrder.getWOrderNo());
-            put("driverName", waybillOrder.getDriverName());
-        }};
-        SckwMessage msg = new SckwMessage();
-        msg.setRequestId(UUIDUtils.get32UUID());
-        msg.setMessageEnum(MessageEnum.WAYBILL_REFUSE_SENDCAR_TRIP);
-        msg.setParams(msgParams);
-        msg.setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
-            put("app", refuseSendCarAppUrl);
-            put("pc", refuseSendCarPcUrl);
-        }});
-        msg.setUserInfos(users);
-        msg.setCreateBy(LoginUserHolder.getUserId());
-        streamBridge.send("sckw-message", JSON.toJSONString(msg));
+//        /*1、校验*/
+//        Long wOrderId = params.getWOrderId();
+//        //运单信息
+//        KwtWaybillOrderV1 waybillOrder = waybillOrderV1Dao.selectById(wOrderId);
+//        if (waybillOrder == null) {
+//            return HttpResult.error("运单" + wOrderId + "不存在，请确认！");
+//        }
+//        //待接单的车辆运单才能拒绝接单
+//        if (!waybillOrder.getStatus().equals(CarWaybillEnum.PENDING_ORDER.getCode())) {
+//            return HttpResult.error("运单" + waybillOrder.getWOrderNo() + "当前状态已不能拒绝接单！");
+//        }
+//
+//        /*2、更新运单状态*/
+//        waybillOrder.setStatus(CarWaybillEnum.REJECT_ORDER.getCode());
+//        waybillOrderV1Dao.updateById(waybillOrder);
+//
+//        /*3、新增运单状态记录*/
+//        setWaybillOrderTrack(waybillOrder.getId(), null, null, params.getOperateTime(), waybillOrder.getStatus(), params.getRemark());
+//
+//        //4、运单子单更新状态
+//        List<KwtWaybillOrderSubtask> orderSubtasks = waybillOrderSubtaskDao.findByWOrderId(wOrderId);
+//        for (KwtWaybillOrderSubtask subtask : orderSubtasks) {
+//            //更新运单子单状态
+//            subtask.setStatus(waybillOrder.getStatus());
+//            waybillOrderSubtaskDao.updateById(subtask);
+//        }
+//
+//        //循环运单不对物流订单委托量变更
+//        if (waybillOrder.getType() == Global.NUMERICAL_TWO) {
+//            return HttpResult.ok();
+//        }
+//
+//        /*5、回退物流订单委托量(循环运单)*/
+//        /*5.1、装货址委派量entrustAmount回退*/
+//        //运单装货地址
+//        List<KwtWaybillOrderAddress> orderAddresses = waybillOrderAddressDao.findByAddresses(wOrderId, AddressTypeEnum.SHIPMENT.getCode());
+//        for (KwtWaybillOrderAddress address : orderAddresses) {
+//            //物流订单-装卸货地址运量信息
+//            KwtLogisticsOrderAmount logisticsOrderAmount = logisticsOrderAmountDao.findByLAddressId(address.getLAddressId());
+//            //承运订单地址已委派量=承运订单地址原委派量-+当前车辆运单地址委派量
+//            BigDecimal entrustAmount = logisticsOrderAmount.getEntrustAmount() == null ? NumberConstant.ZERO_TWO : logisticsOrderAmount.getEntrustAmount();
+//            logisticsOrderAmount.setEntrustAmount(entrustAmount.subtract(address.getEntrustAmount()));
+//            logisticsOrderAmountDao.updateById(logisticsOrderAmount);
+//        }
+//
+//        /*5.2、物流订单委派量entrustAmount回退*/
+//        for (KwtWaybillOrderSubtask subtask : orderSubtasks) {
+//            //物流订单
+//            KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(subtask.getLOrderId());
+//            //承运订单已委派量=承运订单原委派量-当前车辆运单委派量
+//            BigDecimal entrustAmount = logisticsOrder.getEntrustAmount() == null ? NumberConstant.ZERO_TWO : logisticsOrder.getEntrustAmount();
+//            logisticsOrder.setEntrustAmount(entrustAmount.subtract(subtask.getEntrustAmount()));
+//            logisticsOrderDao.updateById(logisticsOrder);
+//        }
+//
+//        /*6发送消息**/
+//        List<UserInfo> users = new ArrayList<>() {{
+//            add(new UserInfo(waybillOrder.getCreateBy(), waybillOrder.getEntId()));
+//        }};
+//        Map<String, Object> msgParams = new HashMap<>() {{
+//            put("orderNo", waybillOrder.getWOrderNo());
+//            put("driverName", waybillOrder.getDriverName());
+//        }};
+//        SckwMessage msg = new SckwMessage();
+//        msg.setRequestId(UUIDUtils.get32UUID());
+//        msg.setMessageEnum(MessageEnum.WAYBILL_REFUSE_SENDCAR_TRIP);
+//        msg.setParams(msgParams);
+//        msg.setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
+//            put("app", refuseSendCarAppUrl);
+//            put("pc", refuseSendCarPcUrl);
+//        }});
+//        msg.setUserInfos(users);
+//        msg.setCreateBy(LoginUserHolder.getUserId());
+//        streamBridge.send("sckw-message", JSON.toJSONString(msg));
         return HttpResult.ok();
     }
 
@@ -1530,74 +1525,74 @@ public class KwtWaybillOrderV1Service {
     @Transactional(rollbackFor = Exception.class)
     public HttpResult refuseDepartureV1(OperateWaybillDto params) {
         /*1、校验*/
-        Long wOrderId = params.getWOrderId();
-        //运单信息
-        KwtWaybillOrderV1 waybillOrder = waybillOrderV1Dao.selectById(wOrderId);
-        if (waybillOrder == null) {
-            return HttpResult.error("运单" + wOrderId + "不存在，请确认！");
-        }
-        //待出车的车辆运单才能拒绝出车
-        if (!waybillOrder.getStatus().equals(CarWaybillEnum.PENDING_VEHICLE.getCode())) {
-            return HttpResult.error("运单" + waybillOrder.getWOrderNo() + "当前状态不能拒绝出车！");
-        }
-
-        /*2、更新运单状态*/
-        waybillOrder.setStatus(CarWaybillEnum.REFUSE_TRAFFIC.getCode());
-        waybillOrderV1Dao.updateById(waybillOrder);
-
-        //3、运单子单更新状态
-        List<KwtWaybillOrderSubtask> orderSubtasks = waybillOrderSubtaskDao.findByWOrderId(wOrderId);
-        for (KwtWaybillOrderSubtask subtask : orderSubtasks) {
-            //更新运单子单状态
-            subtask.setStatus(waybillOrder.getStatus());
-            waybillOrderSubtaskDao.updateById(subtask);
-        }
-
-        /*4、新增运单状态记录*/
-        setWaybillOrderTrack(waybillOrder.getId(), null, null, params.getOperateTime(), waybillOrder.getStatus(), params.getRemark());
-
-        /*5、回退物流订单委托量*/
-        /*5.1、装货址委派量entrustAmount回退*/
-        //运单装货地址
-        List<KwtWaybillOrderAddress> orderAddresses = waybillOrderAddressDao.findByAddresses(wOrderId, AddressTypeEnum.SHIPMENT.getCode());
-        for (KwtWaybillOrderAddress address : orderAddresses) {
-            //物流订单-装卸货地址运量信息
-            KwtLogisticsOrderAmount logisticsOrderAmount = logisticsOrderAmountDao.findByLAddressId(address.getLAddressId());
-            //承运订单地址已委派量=承运订单地址原委派量-当前车辆运单地址委派量
-            BigDecimal entrustAmount = logisticsOrderAmount.getEntrustAmount() == null ? NumberConstant.ZERO_TWO : logisticsOrderAmount.getEntrustAmount();
-            logisticsOrderAmount.setEntrustAmount(entrustAmount.subtract(address.getEntrustAmount()));
-            logisticsOrderAmountDao.updateById(logisticsOrderAmount);
-        }
-
-        /*5.2、物流订单委派量entrustAmount回退*/
-        for (KwtWaybillOrderSubtask subtask : orderSubtasks) {
-            //物流订单
-            KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(subtask.getLOrderId());
-            //承运订单已委派量=承运订单原委派量-当前车辆运单委派量
-            BigDecimal entrustAmount = logisticsOrder.getEntrustAmount() == null ? NumberConstant.ZERO_TWO : logisticsOrder.getEntrustAmount();
-            logisticsOrder.setEntrustAmount(entrustAmount.subtract(subtask.getEntrustAmount()));
-            logisticsOrderDao.updateById(logisticsOrder);
-        }
-
-        /*6、发送消息**/
-        List<UserInfo> users = new ArrayList<>() {{
-            add(new UserInfo(waybillOrder.getCreateBy(), waybillOrder.getEntId()));
-        }};
-        Map<String, Object> msgParams = new HashMap<>() {{
-            put("orderNo", waybillOrder.getWOrderNo());
-            put("driverName", waybillOrder.getDriverName());
-        }};
-        SckwMessage msg = new SckwMessage();
-        msg.setRequestId(UUIDUtils.get32UUID());
-        msg.setMessageEnum(MessageEnum.WAYBIL_CONFIRM_DEPARTURE);
-        msg.setParams(msgParams);
-        msg.setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
-            put("app", refuseSendCarAppUrl);
-            put("pc", refuseSendCarPcUrl);
-        }});
-        msg.setUserInfos(users);
-        msg.setCreateBy(LoginUserHolder.getUserId());
-        streamBridge.send("sckw-message", JSON.toJSONString(msg));
+//        Long wOrderId = params.getWOrderId();
+//        //运单信息
+//        KwtWaybillOrderV1 waybillOrder = waybillOrderV1Dao.selectById(wOrderId);
+//        if (waybillOrder == null) {
+//            return HttpResult.error("运单" + wOrderId + "不存在，请确认！");
+//        }
+//        //待出车的车辆运单才能拒绝出车
+//        if (!waybillOrder.getStatus().equals(CarWaybillEnum.PENDING_VEHICLE.getCode())) {
+//            return HttpResult.error("运单" + waybillOrder.getWOrderNo() + "当前状态不能拒绝出车！");
+//        }
+//
+//        /*2、更新运单状态*/
+//        waybillOrder.setStatus(CarWaybillEnum.REFUSE_TRAFFIC.getCode());
+//        waybillOrderV1Dao.updateById(waybillOrder);
+//
+//        //3、运单子单更新状态
+//        List<KwtWaybillOrderSubtask> orderSubtasks = waybillOrderSubtaskDao.findByWOrderId(wOrderId);
+//        for (KwtWaybillOrderSubtask subtask : orderSubtasks) {
+//            //更新运单子单状态
+//            subtask.setStatus(waybillOrder.getStatus());
+//            waybillOrderSubtaskDao.updateById(subtask);
+//        }
+//
+//        /*4、新增运单状态记录*/
+//        setWaybillOrderTrack(waybillOrder.getId(), null, null, params.getOperateTime(), waybillOrder.getStatus(), params.getRemark());
+//
+//        /*5、回退物流订单委托量*/
+//        /*5.1、装货址委派量entrustAmount回退*/
+//        //运单装货地址
+//        List<KwtWaybillOrderAddress> orderAddresses = waybillOrderAddressDao.findByAddresses(wOrderId, AddressTypeEnum.SHIPMENT.getCode());
+//        for (KwtWaybillOrderAddress address : orderAddresses) {
+//            //物流订单-装卸货地址运量信息
+//            KwtLogisticsOrderAmount logisticsOrderAmount = logisticsOrderAmountDao.findByLAddressId(address.getLAddressId());
+//            //承运订单地址已委派量=承运订单地址原委派量-当前车辆运单地址委派量
+//            BigDecimal entrustAmount = logisticsOrderAmount.getEntrustAmount() == null ? NumberConstant.ZERO_TWO : logisticsOrderAmount.getEntrustAmount();
+//            logisticsOrderAmount.setEntrustAmount(entrustAmount.subtract(address.getEntrustAmount()));
+//            logisticsOrderAmountDao.updateById(logisticsOrderAmount);
+//        }
+//
+//        /*5.2、物流订单委派量entrustAmount回退*/
+//        for (KwtWaybillOrderSubtask subtask : orderSubtasks) {
+//            //物流订单
+//            KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(subtask.getLOrderId());
+//            //承运订单已委派量=承运订单原委派量-当前车辆运单委派量
+//            BigDecimal entrustAmount = logisticsOrder.getEntrustAmount() == null ? NumberConstant.ZERO_TWO : logisticsOrder.getEntrustAmount();
+//            logisticsOrder.setEntrustAmount(entrustAmount.subtract(subtask.getEntrustAmount()));
+//            logisticsOrderDao.updateById(logisticsOrder);
+//        }
+//
+//        /*6、发送消息**/
+//        List<UserInfo> users = new ArrayList<>() {{
+//            add(new UserInfo(waybillOrder.getCreateBy(), waybillOrder.getEntId()));
+//        }};
+//        Map<String, Object> msgParams = new HashMap<>() {{
+//            put("orderNo", waybillOrder.getWOrderNo());
+//            put("driverName", waybillOrder.getDriverName());
+//        }};
+//        SckwMessage msg = new SckwMessage();
+//        msg.setRequestId(UUIDUtils.get32UUID());
+//        msg.setMessageEnum(MessageEnum.WAYBIL_CONFIRM_DEPARTURE);
+//        msg.setParams(msgParams);
+//        msg.setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
+//            put("app", refuseSendCarAppUrl);
+//            put("pc", refuseSendCarPcUrl);
+//        }});
+//        msg.setUserInfos(users);
+//        msg.setCreateBy(LoginUserHolder.getUserId());
+//        streamBridge.send("sckw-message", JSON.toJSONString(msg));
         return HttpResult.ok();
     }
 
@@ -2241,13 +2236,13 @@ public class KwtWaybillOrderV1Service {
                 //从中台查询轨迹信息
                 VehicleDataDTO vehicleDataDTO = new VehicleDataDTO();
                 vehicleDataDTO.setWOrderNo(waybillOrder.getWOrderNo());
-                
+
                 try {
                     // 使用 Feign 调用查询车辆轨迹列表
                     com.sckw.transport.api.model.dto.VehicleDataDTO vehicleDataDTO1 = new com.sckw.transport.api.model.dto.VehicleDataDTO();
                     vehicleDataDTO.setWOrderNo(waybillOrder.getWOrderNo());
                     BaseIotResult<List<com.sckw.transport.api.model.dto.VehicleReturnData>> result = vehicleTraceClient.queryVehicleDataList(vehicleDataDTO1);
-                    
+
                     if (result != null && org.apache.commons.lang3.StringUtils.equals(result.getCode(), "0") && result.getData() != null) {
                         List<com.sckw.transport.api.model.dto.VehicleReturnData> vehicleReturn = result.getData();
                         List<VehicleRouteData> vehicleReturnData = vehicleReturn.stream().map(x->{
@@ -3017,21 +3012,21 @@ public class KwtWaybillOrderV1Service {
         Long entId =LoginUserHolder.getEntId();
         //entIds.add(entId);
         log.debug("获取企业ID集合: {}", entIds);
-        
+
         CompletableFuture<Set<Long>> logOrderIdsFuture = CompletableFuture.supplyAsync(() -> {
             log.debug("开始查询物流订单ID，参数: {}, 企业ID: {}", JSON.toJSONString(req), entIds);
             Set<Long> result = getLogOrderIds(req, entIds,entId);
             log.debug("物流订单ID查询完成，结果数量: {}", result.size());
             return result;
         });
-        
+
         CompletableFuture<Set<Long>> billOrderIdsFuture = CompletableFuture.supplyAsync(() -> {
             log.debug("开始查询运单ID，参数: {}", req);
             Set<Long> result = getBillOrderIds(req);
             log.debug("运单ID查询完成，结果数量: {}", result.size());
             return result;
         });
-        
+
         CompletableFuture<Map<String, Map<String, String>>> dictFuture = CompletableFuture.supplyAsync(() -> {
             log.debug("开始查询字典数据");
             Map<String, Map<String, String>> result = queryDictionaryData();
@@ -3063,7 +3058,7 @@ public class KwtWaybillOrderV1Service {
         }
 
         // 分页查询子运单信息
-        log.info("开始分页查询子运单信息，物流订单ID数量: {}, 运单ID数量: {}, 状态: {}", 
+        log.info("开始分页查询子运单信息，物流订单ID数量: {}, 运单ID数量: {}, 状态: {}",
                 logOrderIds.size(), billOrderIds.size(), status);
         List<Integer> waybillOrderStatus = getWaybillOrderStatus();
         IPage<KwtWaybillOrderSubtask> page = waybillOrderSubtaskRepository.queryByPage(
@@ -3093,7 +3088,7 @@ public class KwtWaybillOrderV1Service {
         });
 
         log.debug("开始查询物流订单，物流订单ID数量: {}", orderIds.getLogicsOrderIds().size());
-        CompletableFuture<List<KwtLogisticsOrder>> logisticsOrderFuture = CompletableFuture.supplyAsync(() -> 
+        CompletableFuture<List<KwtLogisticsOrder>> logisticsOrderFuture = CompletableFuture.supplyAsync(() ->
                 logisticsOrderRepository.queryByLogOrderIds(orderIds.getLogicsOrderIds()), traceTaskExecutor)
                 .exceptionally(ex -> {
                     log.error("查询物流订单失败", ex);
@@ -3158,8 +3153,8 @@ public class KwtWaybillOrderV1Service {
         log.debug("开始查询贸易合同商品");
         CompletableFuture<List<TradeContractGoodsDto>> contractGoodsFuture =
                 tradeOrderContractFuture.thenCombine(goodsIdsFuture, (contracts, goodsIds) -> {
-                    log.debug("贸易合同和商品ID准备完成，合同数量: {}, 商品ID数量: {}", 
-                            Optional.ofNullable(contracts).map(List::size).orElse(0), 
+                    log.debug("贸易合同和商品ID准备完成，合同数量: {}, 商品ID数量: {}",
+                            Optional.ofNullable(contracts).map(List::size).orElse(0),
                             goodsIds.size());
                     Set<Long> contractIds = Optional.ofNullable(contracts)
                             .orElse(List.of())
@@ -3574,7 +3569,7 @@ public class KwtWaybillOrderV1Service {
         }
         return subBillIdAddressIdKeyAndOrderTrackMap;
     }
-    
+
     /**
      * 批量查询运单的离场节点
      * @param wOrderIds 运单ID集合
@@ -3583,11 +3578,11 @@ public class KwtWaybillOrderV1Service {
     @NotNull
     private Map<Long, KwtWaybillOrderNode> getOffsiteNodeMap(Set<Long> wOrderIds) {
         Map<Long, KwtWaybillOrderNode> offsiteNodeMap = Maps.newHashMap();
-        
+
         if (CollectionUtils.isEmpty(wOrderIds)) {
             return offsiteNodeMap;
         }
-        
+
         // 查询所有运单的节点数据，过滤出状态为“已离场”的节点
         List<KwtWaybillOrderNode> nodes = kwtWaybillOrderNodeRepository.list(
                 Wrappers.<KwtWaybillOrderNode>lambdaQuery()
@@ -3595,18 +3590,18 @@ public class KwtWaybillOrderV1Service {
                         .eq(KwtWaybillOrderNode::getOrderStatus, CarWaybillV1Enum.WAIT_LOADING.getCode())
                         .orderByAsc(KwtWaybillOrderNode::getCreateTime)
         );
-        
+
         if (CollectionUtils.isNotEmpty(nodes)) {
             // 每个运单只取最后一条离场记录
             offsiteNodeMap = nodes.stream()
                     .collect(Collectors.toMap(
                             KwtWaybillOrderNode::getWOrderId,
                             Function.identity(),
-                            (existing, replacement) -> 
+                            (existing, replacement) ->
                                     existing.getCreateTime().before(replacement.getCreateTime()) ? existing : replacement
                     ));
         }
-        
+
         return offsiteNodeMap;
     }
 
@@ -3635,19 +3630,19 @@ public class KwtWaybillOrderV1Service {
 
         // 如果企业ID集合不为空，根据企业ID、托运方/承运方ID过滤物流订单ID
         if (CollectionUtils.isNotEmpty(entIds)) {
-            log.debug("开始根据企业ID集合查询物流订单ID，企业ID集合: {}, 托运方ID: {}, 承运方ID: {}", 
+            log.debug("开始根据企业ID集合查询物流订单ID，企业ID集合: {}, 托运方ID: {}, 承运方ID: {}",
                     entIds, req.getConsignorId(), req.getCarrierId());
-            
+
             Set<Long> orderIdsByEnt = getLogOrderIdsByEntIds(
-                    entIds, 
-                    req.getConsignorId(), 
-                    req.getCarrierId(), 
-                    entId, 
+                    entIds,
+                    req.getConsignorId(),
+                    req.getCarrierId(),
+                    entId,
                     currentUserScopeEntIds
             );
-            
+
             log.debug("根据企业ID及角色权限过滤后，获取到的物流订单ID数量: {}", orderIdsByEnt.size());
-            
+
             if (CollectionUtils.isNotEmpty(orderIdsByEnt)) {
                 logOrderIds.addAll(orderIdsByEnt);
                 log.debug("已将过滤后的物流订单ID加入结果集，当前物流订单ID总数: {}", logOrderIds.size());
@@ -3859,16 +3854,16 @@ public class KwtWaybillOrderV1Service {
      */
     private Set<Long> applyDataPermissionFilterToLogOrderIds(Set<Long> logOrderIds) {
         log.debug("开始应用数据权限过滤，原始物流订单ID数量: {}", CollectionUtils.isEmpty(logOrderIds) ? 0 : logOrderIds.size());
-        
+
         // 1. 获取当前用户的数据权限配置
         DataPermissionDTO perm = fetchDataPermissionForCurrentUser();
-        
+
         // 如果无需过滤或权限配置为空，直接返回原始ID集合
         if (perm == null || !perm.needFilter()) {
             log.debug("无需进行数据权限过滤，直接返回原始ID集合");
             return logOrderIds;
         }
-        
+
         // 如果原始ID集合为空，直接返回
         if (CollectionUtils.isEmpty(logOrderIds)) {
             log.debug("原始物流订单ID集合为空，无需过滤");
@@ -3880,25 +3875,25 @@ public class KwtWaybillOrderV1Service {
         // 2. 处理企业维度的数据权限
         if (!perm.isAllVisible()) {
             log.debug("非全量可见模式，开始执行企业维度权限过滤");
-            
+
             // 如果可见企业ID列表为空，说明该企业维度下无权限，返回空集合
             if (CollectionUtils.isEmpty(perm.getVisibleEntIds())) {
                 log.warn("当前用户可见企业ID列表为空，过滤结果为空");
                 return Sets.newHashSet();
             }
-            
+
             // 查询可见企业ID关联的所有物流订单单位信息
             List<KwtLogisticsOrderUnit> units =
                     kwtLogisticsOrderUnitRepository.queryByEntIds(new HashSet<>(perm.getVisibleEntIds()));
-            
+
             // 提取这些单位关联的物流订单ID
             Set<Long> entScopeLogOrderIds = units.stream()
                     .map(KwtLogisticsOrderUnit::getLOrderId)
                     .filter(Objects::nonNull)
                     .collect(Collectors.toSet());
-            
+
             log.debug("企业维度过滤：可见企业关联的物流订单ID数量: {}", entScopeLogOrderIds.size());
-            
+
             // 取交集：只保留既在原始列表中，又在可见企业关联列表中的ID
             result.retainAll(entScopeLogOrderIds);
             log.debug("企业维度过滤后剩余ID数量: {}", result.size());
@@ -3952,7 +3947,7 @@ public class KwtWaybillOrderV1Service {
                 .map(KwtLogisticsOrder::getTOrderId)
                 .filter(Objects::nonNull)
                 .collect(Collectors.toSet());
-                
+
         if (CollectionUtils.isEmpty(tradeIds)) {
             log.debug("物流订单中未关联有效的贸易订单ID，返回空集合");
             return Sets.newHashSet();
@@ -4004,7 +3999,7 @@ public class KwtWaybillOrderV1Service {
                 .filter(order -> order.getTOrderId() != null && allowedTradeIds.contains(order.getTOrderId()))
                 .map(KwtLogisticsOrder::getId)
                 .collect(Collectors.toSet());
-                
+
         log.debug("个人数据权限过滤完成，最终保留物流订单ID数量: {}", finalResult.size());
         return finalResult;
     }
@@ -4028,13 +4023,13 @@ public class KwtWaybillOrderV1Service {
     private Set<Long> getCurrentUserProxyScopeEntIds() {
         // 获取当前登录用户的企业ID
         Long currentEntId = LoginUserHolder.getEntId();
-        
+
         // 校验企业ID是否存在
         if (Objects.isNull(currentEntId)) {
             log.warn("运单代理关系过滤失败，当前登录企业ID为空");
             return Collections.emptySet();
         }
-        
+
         log.debug("开始获取当前用户代理范围企业ID，currentEntId: {}", currentEntId);
 
         try {
@@ -4050,10 +4045,10 @@ public class KwtWaybillOrderV1Service {
                         log.debug("查询到关联代理企业ID数量: {}", CollectionUtils.isEmpty(proxyEntIds) ? 0 : proxyEntIds.size());
                         return proxyEntIds;
                     });
-            
+
             log.info("获取当前用户代理范围企业ID完成，currentEntId: {}, 结果数量: {}", currentEntId, proxyScopeEntIds.size());
             return proxyScopeEntIds;
-            
+
         } catch (Exception e) {
             // 记录异常日志，防止因远程服务调用失败导致主流程中断
             log.error("运单代理关系过滤范围查询失败，currentEntId={}", currentEntId, e);
@@ -4097,7 +4092,7 @@ public class KwtWaybillOrderV1Service {
             log.debug("当前企业[{}]为供应商类型，开始构建可见企业范围", currentEntId);
             // 供应商可见自身
             scopeEntIds.add(currentEntId);
-            
+
             // 如果提供了代理企业查询函数，则获取关联的代理企业
             if (Objects.nonNull(proxySupplier)) {
                 try {
@@ -4148,7 +4143,7 @@ public class KwtWaybillOrderV1Service {
     static boolean hasEnterpriseType(List<EntTypeResDto> entTypeList, Long entId, Integer entType) {
         // 1. 基础参数校验：若企业ID、目标类型为空，或类型列表为空，直接返回false
         if (Objects.isNull(entId) || Objects.isNull(entType) || CollectionUtils.isEmpty(entTypeList)) {
-            log.debug("判断企业类型失败：参数无效，entId={}, entType={}, listSize={}", 
+            log.debug("判断企业类型失败：参数无效，entId={}, entType={}, listSize={}",
                     entId, entType, entTypeList == null ? 0 : entTypeList.size());
             return false;
         }
@@ -4161,7 +4156,7 @@ public class KwtWaybillOrderV1Service {
 
         // 3. 记录调试日志，便于追踪权限过滤逻辑
         log.debug("判断企业类型结果：entId={}, targetEntType={}, result={}", entId, entType, result);
-        
+
         return result;
     }
 
@@ -4184,8 +4179,8 @@ public class KwtWaybillOrderV1Service {
         // 确定当前用户可见的企业ID范围：如果代理关系查询结果为空，则默认仅包含当前登录企业ID，确保数据权限过滤的有效性
         Set<Long> finalCurrentUserScopeEntIds = CollectionUtils.isNotEmpty(currentUserScopeEntIds)
                 ? currentUserScopeEntIds : Collections.singleton(entId);
-        
-        log.debug("开始根据企业权限过滤物流订单单位，可见企业ID集合: {}, 待过滤单位数量: {}", 
+
+        log.debug("开始根据企业权限过滤物流订单单位，可见企业ID集合: {}, 待过滤单位数量: {}",
                 finalCurrentUserScopeEntIds, unitList.size());
 
         // 过滤出属于当前用户可见企业范围内的物流订单单位，并提取对应的物流订单ID集合
@@ -4283,7 +4278,7 @@ public class KwtWaybillOrderV1Service {
      * 对物流订单ID集合进行交集操作
      * 如果原集合为空，则添加新集合的所有元素
      * 如果原集合不为空，则保留原集合与新集合的交集
-     * 
+     *
      * @param logOrderIds 原物流订单ID集合
      * @param newOrderIds 新物流订单ID集合
      */
@@ -4314,7 +4309,7 @@ public class KwtWaybillOrderV1Service {
                 || !req.getKeywords().contains("代理")) {
             return;
         }
-        
+
         log.debug("检测到关键字包含'代理'，设置代理标识并清空关键字");
         // 设置代理标识为真
         req.setAgentFlag(Global.YES);
@@ -4343,13 +4338,13 @@ public class KwtWaybillOrderV1Service {
         if (Objects.isNull(req) || StringUtils.isBlank(req.getKeywords())) {
             return billOrderIds;
         }
-        
+
         log.debug("开始执行关键字过滤，关键字: {}", req.getKeywords());
-        
+
         // 1. 查询命中关键字的运单ID集合
         Set<Long> keywordBillOrderIds = queryBillOrderIdsByKeywords(req.getKeywords());
         log.debug("关键字查询到的运单ID数量: {}", CollectionUtils.isEmpty(keywordBillOrderIds) ? 0 : keywordBillOrderIds.size());
-        
+
         // 2. 合并结果（取交集或并集，取决于是否有其他限制条件）
         return mergeKeywordBillOrderIds(billOrderIds, keywordBillOrderIds, hasBillOrderRestrictedCondition);
     }
@@ -4368,7 +4363,7 @@ public class KwtWaybillOrderV1Service {
      */
     private Set<Long> queryBillOrderIdsByKeywords(String keywords) {
         Set<Long> keywordBillOrderIds = Sets.newLinkedHashSet();
-        
+
         // 1. 根据运单号模糊查询
         List<KwtWaybillOrder> waybillOrders = kwtWaybillOrderRepository.queryListByWOrderNo(keywords);
         if (CollectionUtils.isNotEmpty(waybillOrders)) {
@@ -4379,7 +4374,7 @@ public class KwtWaybillOrderV1Service {
             keywordBillOrderIds.addAll(orderIdsByNo);
             log.debug("通过运单号查询到ID数量: {}", orderIdsByNo.size());
         }
-        
+
         // 2. 根据商品名称查询
         // 先获取包含该商品的物流订单ID
         Set<Long> logOrderIdsByGoods = getLogOrderIdsByGoodsName(keywords);
@@ -4395,11 +4390,11 @@ public class KwtWaybillOrderV1Service {
                 log.debug("通过商品名称查询到ID数量: {}", orderIdsByGoods.size());
             }
         }
-        
+
         // 通过贸易订单代理商名称关键字查询关联的运单ID
         log.debug("开始通过代理商名称关键字查询运单ID，关键字: {}", keywords);
         Set<Long> orderIdsByAgentFirmName = queryBillOrderIdsByAgentFirmName(keywords);
-        
+
         // 如果查询到匹配的运单ID，则合并到结果集中
         if (CollectionUtils.isNotEmpty(orderIdsByAgentFirmName)) {
             keywordBillOrderIds.addAll(orderIdsByAgentFirmName);
@@ -4430,9 +4425,9 @@ public class KwtWaybillOrderV1Service {
             log.debug("通过代理商名称查询运单：关键字为空，返回空集合");
             return Sets.newHashSet();
         }
-        
+
         log.info("开始通过代理商名称关键字查询运单，keywords: {}", keywords);
-        
+
         try {
             // 1. 根据代理商名称查询物流订单企业表中的代理单位记录
             List<KwtLogisticsOrderUnit> agentUnits = kwtLogisticsOrderUnitRepository.queryByFirmNameAndUnitType(
@@ -4445,7 +4440,7 @@ public class KwtWaybillOrderV1Service {
 
             // 2. 提取物流订单ID
             Set<Long> logOrderIds = extractAgentLogOrderIdsByAgentFirmName(agentUnits, keywords);
-            
+
             if (CollectionUtils.isEmpty(logOrderIds)) {
                 log.warn("物流订单代理单位记录中物流订单ID为空，无法继续查询子运单，keywords: {}", keywords);
                 return Sets.newHashSet();
@@ -4460,10 +4455,10 @@ public class KwtWaybillOrderV1Service {
                     .map(KwtWaybillOrderSubtask::getWOrderId)
                     .filter(Objects::nonNull)
                     .collect(Collectors.toSet());
-            
+
             log.info("通过代理商名称[{}]查询运单完成，最终匹配运单ID数量: {}", keywords, resultBillOrderIds.size());
             return resultBillOrderIds;
-            
+
         } catch (Exception e) {
             // 异常捕获：记录警告日志，避免因远程服务波动导致主流程中断，返回空集合表示无匹配数据
             log.warn("通过代理商名称关键字查询运单发生异常，keywords: {}, 错误信息: {}", keywords, e.getMessage(), e);
@@ -4530,12 +4525,12 @@ public class KwtWaybillOrderV1Service {
         if (CollectionUtils.isEmpty(keywordBillOrderIds)) {
             return Sets.newHashSet();
         }
-        
+
         // 如果之前没有施加其他限制条件，且之前的ID集合也为空，说明这是第一个有效过滤条件，直接返回关键字结果
         if (CollectionUtils.isEmpty(billOrderIds) && !hasBillOrderRestrictedCondition) {
             return Sets.newHashSet(keywordBillOrderIds);
         }
-        
+
         // 取交集：保留既在原有结果中，又命中关键字的ID
         Set<Long> result = Sets.newHashSet(billOrderIds);
         result.retainAll(keywordBillOrderIds);
@@ -4660,11 +4655,11 @@ public class KwtWaybillOrderV1Service {
         // 4. 执行交集运算：保留既在前序结果中，又满足当前条件的运单ID。
         Set<Long> result = Sets.newHashSet(billOrderIds);
         result.retainAll(conditionOrderIds);
-        
+
         // 5. 记录日志：监控交集运算后的数据量变化，便于排查数据过滤逻辑。
-        log.debug("运单多条件交集合并完成，当前条件ID数量: {}, 前序ID数量: {}, 合并后剩余ID数量: {}", 
+        log.debug("运单多条件交集合并完成，当前条件ID数量: {}, 前序ID数量: {}, 合并后剩余ID数量: {}",
                 conditionOrderIds.size(), billOrderIds.size(), result.size());
-        
+
         return result;
     }
 
@@ -4793,13 +4788,13 @@ public class KwtWaybillOrderV1Service {
                 waybillOrderNodeMap.getOrDefault(record.getWOrderId() + "-" + CarWaybillV1Enum.COMPLETION_LOADING.getCode(),
                         new KwtWaybillOrderNode());
         waybillOrderResp.setLoadingTime(DateUtils.format(loadTrack.getCreateTime(),DateUtils.DATE_TIME_PATTERN));
-        
+
         // 从节点表中获取离场时间
         KwtWaybillOrderNode offsiteNode = wOrderIdAndOffsiteNodeMap.get(record.getWOrderId());
         if (offsiteNode != null) {
             waybillOrderResp.setOffsiteTime(DateUtils.format(offsiteNode.getCreateTime(), DateUtils.DATE_TIME_PATTERN));
         }
-        
+
         waybillOrderResp.setUnloadingTime(DateUtils.format(unloadTrack.getCreateTime(),DateUtils.DATE_TIME_PATTERN));
         if (Objects.equals(record.getStatus(), CarWaybillV1Enum.COMPLETED.getCode())){
             waybillOrderResp.setCompleteTime(DateUtils.format(record.getUpdateTime(),DateUtils.DATE_TIME_PATTERN));
@@ -4933,9 +4928,9 @@ public class KwtWaybillOrderV1Service {
         log.debug("所有并行查询完成");
 
         // 获取查询结果
-        return buildWaybillOrderDetailResp(billOrder, subtask, logOrder, truckFuture.join(), 
-                fleetFuture.join(), addressFuture.join(), ticketFuture.join(), userFuture.join(), 
-                goodsFuture.join(), orderDetailFuture.join(), unitFuture.join(), 
+        return buildWaybillOrderDetailResp(billOrder, subtask, logOrder, truckFuture.join(),
+                fleetFuture.join(), addressFuture.join(), ticketFuture.join(), userFuture.join(),
+                goodsFuture.join(), orderDetailFuture.join(), unitFuture.join(),
                 nodeFuture.join(), waybillSubtaskFuture.join(),contractFuture.join());
     }
 
@@ -5021,10 +5016,10 @@ public class KwtWaybillOrderV1Service {
     /**
      * 构建运单详情响应对象
      */
-    private WaybillOrderDetailResp buildWaybillOrderDetailResp(KwtWaybillOrder billOrder, 
-                                                              KwtWaybillOrderSubtask subtask, 
+    private WaybillOrderDetailResp buildWaybillOrderDetailResp(KwtWaybillOrder billOrder,
+                                                              KwtWaybillOrderSubtask subtask,
                                                               KwtLogisticsOrder logOrder,
-                                                              RTruckVo truck, 
+                                                              RTruckVo truck,
                                                               RFleetVo fleet,
                                                               List<KwtLogisticsOrderAddress> kwtWaybillOrderAddresses,
                                                               List<KwtWaybillOrderTicket> orderTicketList,
@@ -5094,7 +5089,7 @@ public class KwtWaybillOrderV1Service {
      * 获取合同采购单位信息
      */
     private List<TradeContractUnitDto> getTradeContractUnits(OrderDetailVo orderDetailVo) {
-        if (Objects.nonNull(orderDetailVo) && Objects.nonNull(orderDetailVo.getContractInfo()) 
+        if (Objects.nonNull(orderDetailVo) && Objects.nonNull(orderDetailVo.getContractInfo())
             && Objects.nonNull(orderDetailVo.getContractInfo().getContractId())) {
             log.debug("查询合同单位信息，合同ID: {}", orderDetailVo.getContractInfo().getContractId());
             return remoteContractService.queryContractUnitByContractId(
@@ -5112,7 +5107,7 @@ public class KwtWaybillOrderV1Service {
                     .filter(Objects::nonNull)
                     .collect(Collectors.toMap(
                             x -> x.getLOrderId() + "-" + x.getAddressType(),
-                            Function.identity(), 
+                            Function.identity(),
                             (x, y) -> x));
         }
         return Maps.newHashMap();
@@ -5127,7 +5122,7 @@ public class KwtWaybillOrderV1Service {
                     .filter(Objects::nonNull)
                     .collect(Collectors.toMap(
                             x -> x.getLOrderId() + "-" + x.getUnitType(),
-                            Function.identity(), 
+                            Function.identity(),
                             (x, y) -> x));
         }
         return Maps.newHashMap();
@@ -5139,7 +5134,7 @@ public class KwtWaybillOrderV1Service {
     private List<KwtWaybillOrderNode> processNodes(List<KwtWaybillOrderNode> nodes) {
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(nodes)) {
             return nodes.stream()
-                    .filter(x -> Objects.nonNull(x) && Objects.nonNull(x.getWeighbridgeId()) && 
+                    .filter(x -> Objects.nonNull(x) && Objects.nonNull(x.getWeighbridgeId()) &&
                                 Objects.nonNull(x.getRemark()) && x.getRemark().contains("称重"))
                     .sorted(Comparator.comparing(KwtWaybillOrderNode::getCreateTime))
                     .collect(Collectors.toList());
@@ -5173,7 +5168,7 @@ public class KwtWaybillOrderV1Service {
                 .filter(Objects::nonNull)
                 .collect(Collectors.toMap(
                         ticket -> ticket.getWOrderId() + "-" + ticket.getType(),
-                        Function.identity(), 
+                        Function.identity(),
                         (x, y) -> x));
     }
 
@@ -5182,7 +5177,7 @@ public class KwtWaybillOrderV1Service {
 
     /**
      * 构建运单详情响应对象
-     * 
+     *
      * @param subtask 运单子任务信息
      * @param billOrder 运单主信息
      * @param logOrder 物流订单信息
@@ -6303,11 +6298,11 @@ public class KwtWaybillOrderV1Service {
      */
     public WaybillOrderNodeVo queryWaybillOrderNodeTimeline(WaybillOrderNodeReq req) {
         log.info("查询运单节点轨迹，请求参数：{}", JSON.toJSONString(req));
-        
+
         // 查询节点轨迹数据
         List<KwtWaybillOrderNode> nodes = kwtWaybillOrderNodeRepository.queryNodesByOrderId(
                 req.getWOrderId(), req.getWSubtaskId());
-        
+
         if (CollectionUtils.isEmpty(nodes)) {
             return new WaybillOrderNodeVo();
         }
@@ -6442,7 +6437,7 @@ public class KwtWaybillOrderV1Service {
             log.debug("selectMinStatusEarliestNode: 节点列表为空，返回 null");
             return null;
         }
-        
+
         // 2. 提取最小原始状态码
         // 在同一阶段映射下，可能存在多个原始业务状态，取数值最小的作为基准（通常代表初始状态）
         Integer minStatus = nodes.stream()
@@ -6450,35 +6445,35 @@ public class KwtWaybillOrderV1Service {
                 .filter(Objects::nonNull)
                 .min(Integer::compareTo)
                 .orElse(null);
-                
+
         if (Objects.isNull(minStatus)) {
             log.warn("selectMinStatusEarliestNode: 无法从节点列表中提取有效的最小状态码，节点数量: {}", nodes.size());
             return null;
         }
         log.debug("selectMinStatusEarliestNode: 提取到最小状态码: {}", minStatus);
-        
+
         // 3. 筛选具有最小状态码且创建时间最早的节点
         WaybillOrderNodeVo.WaybillOrderNode selected = nodes.stream()
                 .filter(node -> Objects.equals(node.getOrderStatus(), minStatus))
                 .min(Comparator.comparing(node -> parseWaybillNodeCreateTime(node.getCreateTime())))
                 .orElse(null);
-                
+
         if (Objects.isNull(selected)) {
             log.warn("selectMinStatusEarliestNode: 状态码为 {} 的节点中未找到有效创建时间的节点", minStatus);
             return null;
         }
-        log.debug("selectMinStatusEarliestNode: 选中节点 ID: {}, 状态: {}, 创建时间: {}", 
+        log.debug("selectMinStatusEarliestNode: 选中节点 ID: {}, 状态: {}, 创建时间: {}",
                 selected.getId(), selected.getOrderStatus(), selected.getCreateTime());
-        
+
         // 4. 映射前端时间轴阶段信息
         // 将原始业务状态转换为前端展示用的阶段序号（phaseOrder）和阶段名称（phaseLabel）
         WaybillTimelinePhaseEnum.resolve(minStatus).ifPresent(phase -> {
-            log.debug("selectMinStatusEarliestNode: 映射前端阶段，原始状态: {} -> 阶段序号: {}, 阶段名称: {}", 
+            log.debug("selectMinStatusEarliestNode: 映射前端阶段，原始状态: {} -> 阶段序号: {}, 阶段名称: {}",
                     minStatus, phase.getPhaseOrder(), phase.getPhaseLabel());
             selected.setOrderStatus(phase.getPhaseOrder());
             selected.setOrderStatusName(phase.getPhaseLabel());
         });
-        
+
         return selected;
     }
 
@@ -6494,7 +6489,7 @@ public class KwtWaybillOrderV1Service {
      * 构建状态描述文本
      * 格式：车辆【川A5478C】司机【张三】装载货物【铁矿石】【参运】【28.70吨】
      */
-    private String buildStatusDescription(KwtWaybillOrderNode node, 
+    private String buildStatusDescription(KwtWaybillOrderNode node,
                                           KwtWaybillOrderSubtask subtask,
                                           Map<Long, KwtLogisticsOrderGoods> goodsMap,
                                           Map<String, String> unitMap) {
@@ -6552,7 +6547,7 @@ public class KwtWaybillOrderV1Service {
         if (status == null || subtask == null) {
             return "";
         }
-        
+
         // 根据状态返回不同的重量
         // CarWaybillV1Enum: 1-已接单, 5-到达装货点, 10-已装货, 15-已离场, 20-已卸货, 25-已完成, 30-审核驳回, 99-已取消
         if (status.equals(CarWaybillV1Enum.WAIT_LOADING.getCode())) {
@@ -6565,7 +6560,7 @@ public class KwtWaybillOrderV1Service {
             // 20-已卸货-卸货显示实卸量
             return String.valueOf(subtask.getUnloadAmount());
         }
-        
+
         return "";
     }
 
@@ -6581,7 +6576,7 @@ public class KwtWaybillOrderV1Service {
         // 暂时返回经纬度格式
         return String.format("经度:%s, 纬度:%s", lng, lat);
     }
-    
+
     /**
      * 根据运单号模糊查询运单ID和运单号列表
      *
@@ -6591,7 +6586,7 @@ public class KwtWaybillOrderV1Service {
     public List<WaybillOrderSimpleVo> queryWaybillOrderListByWOrderNo(String wOrderNo) {
         // 查询运单数据
         List<KwtWaybillOrder> waybillOrders = kwtWaybillOrderRepository.queryWaybillOrderListByWOrderNo(wOrderNo);
-        
+
         // 转换为VO
         return waybillOrders.stream()
                 .map(order -> {

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/ForkliftOrderService.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sckw.contract.api.RemoteContractService;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.common.enums.enums.ErrorCodeEnum;
+import com.sckw.core.exception.ApiException;
 import com.sckw.core.exception.BusinessPlatfromException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.CarWaybillV1Enum;
@@ -20,8 +21,11 @@ import com.sckw.order.api.dubbo.TradeOrderInfoService;
 import com.sckw.order.api.model.OrderUnitInfoDetailVO;
 import com.sckw.product.api.dubbo.GoodsInfoService;
 import com.sckw.product.api.model.KwpGoods;
+import com.sckw.redis.config.RedisLockUtil;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
+import com.sckw.transport.five.pojo.LoadPara;
+import com.sckw.transport.five.pojo.LoadUser;
 import com.sckw.transport.model.*;
 import com.sckw.transport.model.param.WaybillOrderLoadingParam;
 import com.sckw.transport.model.param.forklift.reponse.ForkliftOrderFilterResp;
@@ -73,7 +77,8 @@ public class ForkliftOrderService {
 
     @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 80000)
     TradeOrderInfoService tradeOrderInfoService;
-
+    @Resource
+    private RedisLockUtil redisLockUtil;
     @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
     RemoteSystemService remoteSystemService;
 
@@ -100,6 +105,7 @@ public class ForkliftOrderService {
 
     /**
      * 分页查询铲车订单
+     *
      * @param param
      * @return
      */
@@ -137,13 +143,14 @@ public class ForkliftOrderService {
 
     /**
      * 构建基础查询条件
+     *
      * @param param
      * @return
      */
     private LambdaQueryWrapper<KwtForkliftWaybillOrder> buildBaseQueryWrapper(ForkliftOrderQueryParam param) {
         LambdaQueryWrapper<KwtForkliftWaybillOrder> wrapper = Wrappers.<KwtForkliftWaybillOrder>lambdaQuery()
                 .eq(StringUtils.isNotBlank(param.getDriverId()), KwtForkliftWaybillOrder::getDriverId, param.getDriverId())
-                .in(CollectionUtils.isNotEmpty(param.getDictIdList()),KwtForkliftWaybillOrder::getDictId, param.getDictIdList())
+                .in(CollectionUtils.isNotEmpty(param.getDictIdList()), KwtForkliftWaybillOrder::getDictId, param.getDictIdList())
                 .orderByDesc(KwtForkliftWaybillOrder::getCreateTime)
                 .orderByDesc(KwtForkliftWaybillOrder::getId);
         if (ForkliftStatusEnum.PENDING_ORDERS.getCode().equals(param.getStatus())) {
@@ -177,7 +184,8 @@ public class ForkliftOrderService {
      * 查询匹配的运单ID（以铲车ID为主键）
      */
     private Set<Long> findMatchedForkliftOrderIds(String keyword, ForkliftOrderQueryParam param) {
-        Set<Long> forkliftOrderIds = ConcurrentHashMap.newKeySet();;
+        Set<Long> forkliftOrderIds = ConcurrentHashMap.newKeySet();
+        ;
         List<Runnable> searchTasks = Arrays.asList(
                 //1. 运单编号查询（主表字段，直接匹配）
                 () -> addMatchedIdsFromForkliftNo(keyword, forkliftOrderIds, param),
@@ -195,6 +203,7 @@ public class ForkliftOrderService {
 
     /**
      * 从铲车编号查询匹配铲车单号
+     *
      * @param keyword
      * @param forkliftOrderIds
      * @param param
@@ -213,6 +222,7 @@ public class ForkliftOrderService {
 
     /**
      * 车牌号、司机姓名查询
+     *
      * @param keyword
      * @param forkliftOrderIds
      * @param param
@@ -275,6 +285,7 @@ public class ForkliftOrderService {
 
     /**
      * 获取铲车订单数据
+     *
      * @param records
      * @return
      */
@@ -325,6 +336,7 @@ public class ForkliftOrderService {
 
     /**
      * 组装铲车订单信息
+     *
      * @param forkliftOrder
      * @param waybillOrderMap
      * @return
@@ -379,6 +391,7 @@ public class ForkliftOrderService {
 
     /**
      * 筛选
+     *
      * @param param
      * @return
      */
@@ -464,6 +477,7 @@ public class ForkliftOrderService {
 
     /**
      * 铲车订单状态统计
+     *
      * @param param
      * @return
      */
@@ -514,6 +528,7 @@ public class ForkliftOrderService {
 
     /**
      * 构建默认的状态统计列表（三种状态，数量均为0）
+     *
      * @return 默认统计列表
      */
     private List<StatisticsWaybillResp.OrderBillStatusStatistics> buildDefaultStatusStatistics() {
@@ -539,8 +554,115 @@ public class ForkliftOrderService {
         return defaultList;
     }
 
+    /**
+     * 500万吨铲车接单
+     *
+     * @param param
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void acceptOrderTaking(LoadPara param) {
+        String lockKey = TAKING_ORDER_LOCK_PREFIX + param.getForkliftNo();
+        if (redisLockUtil.tryLock(lockKey)) {
+            try {
+                KwtForkliftWaybillOrder forkliftWaybillOrder = forkliftWaybillOrderRepository.getByOrder(param.getForkliftNo());
+                if (forkliftWaybillOrder == null) {
+                    throw new ApiException("当前铲车订单不存在！");
+                }
+                if (!ForkliftStatusEnum.PENDING_ORDERS.getCode().equals(forkliftWaybillOrder.getStatus())) {
+                    throw new ApiException("当前铲车订单状态异常，不能接单！");
+                }
+                LoadUser loadUser = param.getLoadUser();
+                forkliftWaybillOrder.setStatus(ForkliftStatusEnum.ORDER_TAKING.getCode());
+                forkliftWaybillOrder.setDriverId(loadUser.getId());
+                forkliftWaybillOrder.setDriverPhone(loadUser.getMobile());
+                forkliftWaybillOrder.setDriverName(loadUser.getName());
+                forkliftWaybillOrder.setForkliftAcceptTime(new Date());
+                forkliftWaybillOrderRepository.updateById(forkliftWaybillOrder);
+
+                //修改司机状态
+                updateWaybillOrder(forkliftWaybillOrder);
+                ForkliftOrderTakingParam forkliftOrderTakingParam = new ForkliftOrderTakingParam();
+                forkliftOrderTakingParam.setForkliftOrderId(forkliftWaybillOrder.getId());
+                forkliftOrderTakingParam.setDriverId(forkliftWaybillOrder.getDriverId());
+                forkliftOrderTakingParam.setDriverPhone(forkliftWaybillOrder.getDriverPhone());
+                forkliftOrderTakingParam.setDriverName(forkliftWaybillOrder.getDriverName());
+
+                // 创建司机日志记录
+                creatWaybillOrderNode(forkliftOrderTakingParam, forkliftWaybillOrder);
+                log.info("铲车接单成功，订单ID：{}", forkliftWaybillOrder.getWOrderId());
+
+            } finally {
+                redisLockUtil.unlock(lockKey);
+            }
+        } else {
+            throw new ApiException("请求不可重复操作,请稍后重试！");
+        }
+
+    }
+
+    /**
+     * 取消接单
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void cancelOrderTaking(LoadPara param) {
+        String lockKey = TAKING_ORDER_LOCK_PREFIX + param.getForkliftNo();
+        if (redisLockUtil.tryLock(lockKey)) {
+            try {
+                KwtForkliftWaybillOrder forkliftWaybillOrder = forkliftWaybillOrderRepository.getByOrder(param.getForkliftNo());
+                if (forkliftWaybillOrder == null) {
+                    throw new ApiException("当前铲车订单不存在！");
+                }
+                if (!ForkliftStatusEnum.ORDER_TAKING.getCode().equals(forkliftWaybillOrder.getStatus())) {
+                    throw new ApiException("当前铲车订单状态异常，不能接单！");
+                }
+                forkliftWaybillOrder.setStatus(ForkliftStatusEnum.PENDING_ORDERS.getCode());
+                forkliftWaybillOrderRepository.updateById(forkliftWaybillOrder);
+
+            } finally {
+                redisLockUtil.unlock(lockKey);
+            }
+        } else {
+            throw new ApiException("请求不可重复操作,请稍后重试！");
+        }
+    }
+    @Transactional(rollbackFor = Exception.class)
+    public void finishOrderTaking(LoadPara param) {
+        String lockKey = TAKING_ORDER_LOCK_PREFIX + param.getForkliftNo();
+        if (redisLockUtil.tryLock(lockKey)) {
+            try {
+                KwtForkliftWaybillOrder forkliftWaybillOrder = forkliftWaybillOrderRepository.getByOrder(param.getForkliftNo());
+                if (forkliftWaybillOrder == null) {
+                    throw new ApiException("当前铲车订单不存在！");
+                }
+                if (!ForkliftStatusEnum.ORDER_TAKING.getCode().equals(forkliftWaybillOrder.getStatus())) {
+                    throw new ApiException("当前铲车订单状态异常，不能装载完成！");
+                }
+                forkliftWaybillOrder.setStatus(ForkliftStatusEnum.COMPLETED.getCode());
+                forkliftWaybillOrder.setFinishTime(new Date());
+                forkliftWaybillOrderRepository.updateById(forkliftWaybillOrder);
+
+                //更新司机运单状态：已装货
+                WaybillOrderLoadingParam loadingParam = new WaybillOrderLoadingParam();
+                loadingParam.setLng("");
+                loadingParam.setLat("");
+                loadingParam.setWaybillOrderId(forkliftWaybillOrder.getWOrderId());
+                waybillOrderService.loading(loadingParam);
+
+                forkliftWaybillOrder.setStatus(ForkliftStatusEnum.PENDING_ORDERS.getCode());
+                forkliftWaybillOrderRepository.updateById(forkliftWaybillOrder);
+
+            } finally {
+                redisLockUtil.unlock(lockKey);
+            }
+        } else {
+            throw new ApiException("请求不可重复操作,请稍后重试！");
+        }
+
+    }
     /**
      * 铲车接单
+     *
      * @param param
      * @return
      */
@@ -580,6 +702,7 @@ public class ForkliftOrderService {
 
     /**
      * 幂等性校验：检查是否已经存在该铲车针对该物流运单的有效运单
+     *
      * @param param 接单参数
      */
     private void checkIdempotent(ForkliftOrderTakingParam param) {
@@ -595,6 +718,7 @@ public class ForkliftOrderService {
 
     /**
      * 获取分布式锁（带重试机制）
+     *
      * @param lockKey       锁Key
      * @param requestId     请求ID（保证只有自己能释放锁）
      * @param expireSeconds 锁过期时间（秒）
@@ -627,6 +751,7 @@ public class ForkliftOrderService {
 
     /**
      * 释放分布式锁（使用Lua脚本保证原子性）
+     *
      * @param lockKey   锁Key
      * @param requestId 请求ID
      */
@@ -644,6 +769,7 @@ public class ForkliftOrderService {
 
     /**
      * 铲车接单
+     *
      * @param param
      */
     @Transactional(rollbackFor = Exception.class)
@@ -674,6 +800,7 @@ public class ForkliftOrderService {
 
     /**
      * 修改司机状态
+     *
      * @param forkliftWaybillOrder
      */
     private void updateWaybillOrder(KwtForkliftWaybillOrder forkliftWaybillOrder) {
@@ -687,6 +814,7 @@ public class ForkliftOrderService {
 
     /**
      * 修改运单状态
+     *
      * @param forkliftWaybillOrder
      */
     private void updateWaybillStatus(KwtForkliftWaybillOrder forkliftWaybillOrder) {
@@ -701,6 +829,7 @@ public class ForkliftOrderService {
 
     /**
      * 修改子运单状态
+     *
      * @param forkliftWaybillOrder
      */
     private void updateWaybillSubtaskStatus(KwtForkliftWaybillOrder forkliftWaybillOrder) {
@@ -714,6 +843,7 @@ public class ForkliftOrderService {
 
     /**
      * 创建日子轨迹记录
+     *
      * @param param
      * @param forkliftWaybillOrder
      * @return
@@ -746,6 +876,7 @@ public class ForkliftOrderService {
 
     /**
      * 铲车取消接单
+     *
      * @param param
      * @return
      */
@@ -765,6 +896,7 @@ public class ForkliftOrderService {
 
     /**
      * 装载完成
+     *
      * @param param
      * @return
      */
@@ -791,5 +923,4 @@ public class ForkliftOrderService {
     }
 
 
-
 }

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

@@ -36,7 +36,6 @@ import com.sckw.transport.model.param.ManagementContractParam;
 import com.sckw.transport.model.param.ManagementLogisticsOrderQuery;
 import com.sckw.transport.model.vo.*;
 import com.sckw.transport.model.vo.execlVo.ManagementLogisticsOrderExcelVo;
-import com.sckw.transport.service.KwtCommonService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.BeanUtils;
@@ -58,8 +57,7 @@ import java.util.stream.Collectors;
 @Service
 public class KwtManagementLogisticsOrderService {
 
-    @Autowired
-    KwtCommonService commonService;
+
 
     @Autowired
     KwtLogisticsOrderMapper logisticsOrderMapper;
@@ -104,402 +102,8 @@ public class KwtManagementLogisticsOrderService {
     @Autowired
     public KwtLogisticsOrderLineFreightRateMapper lineFreightRateMapper;
 
-    /**
-     * @param query
-     * @return
-     */
-    public PageRes selectLogisticsOrder(ManagementLogisticsOrderQuery query) {
-        List<Long> idsList = new ArrayList<>();
-        if (StringUtils.isNotBlank(query.getIds())) {
-            idsList = StringUtils.splitStrToList(query.getIds(), Long.class);
-        }
-        Long entId = LoginUserHolder.getEntId();
-        PageHelper.startPage(query.getPage(), query.getPageSize());
-        List<Integer> orderList = new ArrayList<>();
-
-        //客户经理权限过滤
-        List<Long> authEntIdList = LoginUserHolder.getAuthEntIdList();
-        //获取redis
-//        String managerKey = Global.getCustomerManagerUserLoginKey(SystemTypeEnum.MANAGE.getCode(), LoginUserHolder.getUserId());
-//        RSet<Object> set = RedissonUtils.getSet(managerKey);
-//        if (CollectionUtils.isEmpty(set)){
-//            List authUserIdList = JSONObject.parseObject(set.toString(), List.class);
-//            if(CollectionUtils.isNotEmpty(authUserIdList)){
-//                authEntIdList.addAll(authUserIdList);
-//            }
-//        }
-        if (CollectionUtils.isEmpty(authEntIdList)) {
-            List<Long> ids = remoteUserService.findEnterpriseIdsByUserIdIsMain(LoginUserHolder.getUserId());
-            if (CollectionUtils.isEmpty(ids)){
-                PageInfo<ManagementLogisticsOrderVO> pageInfo = new PageInfo<>();
-                return PageRes.build(pageInfo, new ArrayList<>());
-            }
-            authEntIdList.addAll(ids);
-        }
-
-        if (StringUtils.isNotBlank(query.getStatus())) {
-            if (String.valueOf(NumberConstant.SEVEN).equals(query.getStatus())) {
-                orderList.add(LogisticsOrderEnum.REJECT_ORDER.getCode());
-                orderList.add(LogisticsOrderEnum.CANCEL_ORDER.getCode());
-            } else {
-                orderList.add(Integer.valueOf(query.getStatus()));
-            }
-        }
-        //装卸货地址
-        String loadCode = query.getLoadAddressCode();
-        if (StringUtils.isNotBlank(loadCode)) {
-            switch (query.getLoadAddressLevel()) {
-                case 1 -> query.setLoadAddressCode(
-                        loadCode.substring(0, 2).trim());
-                case 2 -> query.setLoadAddressCode(
-                        loadCode.substring(0, 4).trim());
-                case 3 -> query.setLoadAddressCode(loadCode);
-            }
-        }
-        String unloadCode = query.getUnloadAddressCode();
-        if (StringUtils.isNotBlank(unloadCode)) {
-            switch (query.getUnloadAddressLevel()) {
-                case 1 -> query.setUnloadAddressCode(
-                        loadCode.substring(0, 2).trim());
-                case 2 -> query.setUnloadAddressCode(
-                        loadCode.substring(0, 4).trim());
-                case 3 -> query.setUnloadAddressCode(loadCode);
-            }
-        }
-        List<Long> longs = LoginUserHolder.getAuthUserIdList();
-        longs.add(LoginUserHolder.getUserId());
-        List<Long> longList = longs.stream().distinct().collect(Collectors.toList());
-//        LoginUserHolder.getIsMain()
-        List<ManagementLogisticsOrderVO> list = logisticsOrderMapper.selectManagementLogisticsOrderList(query, orderList, entId, longList, longList, idsList,authEntIdList);
-        PageInfo<ManagementLogisticsOrderVO> pageInfo = new PageInfo<>(list);
-        if (CollectionUtils.isEmpty(list)) {
-            return PageRes.build(pageInfo, list);
-        }
-//        List<AcceptCarriageOrderVO> detailRes = new ArrayList<>();
-        /**计量单位*/
-//        Map<String, String> unitTypeDictData = commonService.getDictData(DictTypeEnum.UNIT_TYPE.getType());
-        /**运价方式*/
-//        Map<String, String> priceDictData = commonService.getDictData(DictTypeEnum.PRICE_TYPE.getType());
-        /**计费方式*/
-        Map<String, String> chargingDictData = commonService.getDictData(DictTypeEnum.CHARGING_TYPE.getType());
-        /**结算周期*/
-        Map<String, String> settlementDictData = commonService.getDictData(DictTypeEnum.SETTLEMENT_CYCLE.getType());
-        /**签约方式*/
-        Map<String, String> signingWay = commonService.getDictData(DictTypeEnum.SIGNING_TYPE.getType());
-        /**合理损耗*/
-//        Map<String, String> taxRateTypeDictData = getDictData(DictTypeEnum.TAX_RATE_TYPE.getType());
-        /**订单来源*/
-        Map<String, String> orderSource = commonService.getDictData(DictTypeEnum.ORDER_SOURCE.getType());
-        Map<Long, UserCacheResDto> longUserMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
-        if (CollectionUtils.isNotEmpty(list)) {
-            List<Long> collect = list.stream().map(ManagementLogisticsOrderVO::getCreateBy).collect(Collectors.toList());
-            if (CollectionUtils.isNotEmpty(collect)) {
-                longUserMap = remoteSystemService.queryUserCacheMapByIds(collect);
-            }
-        }
-
-        List<ManagementLogisticsOrderVO> collect = list.stream().filter(item -> item.getBillingMode().equals(DictEnum.CHARGING_TYPE_4.getValue())).collect(Collectors.toList());
-        Map<Long, List<KwtLogisticsOrderLineFreightRate>> collect1 = new HashMap<>();
-        if (CollectionUtils.isNotEmpty(collect)) {
-            List<KwtLogisticsOrderLineFreightRate> kwtLogisticsOrderLineFreightRates = lineFreightRateMapper.selectListByOrderIdList(collect.stream().map(ManagementLogisticsOrderVO::getLOrderId).map(Long::parseLong).toList());
-            if (CollectionUtils.isNotEmpty(kwtLogisticsOrderLineFreightRates)) {
-                collect1 = kwtLogisticsOrderLineFreightRates.stream().collect(Collectors.groupingBy(KwtLogisticsOrderLineFreightRate::getLOrderId));
-            }
-        }
-        for (ManagementLogisticsOrderVO vo : list) {
-
-            List<KwtLogisticsOrderLineFreightRate> kwtLogisticsOrderLineFreightRates = collect1.get(Long.parseLong(vo.getLOrderId()));
-            if (CollectionUtils.isNotEmpty(kwtLogisticsOrderLineFreightRates)) {
-                vo.setPrices(kwtLogisticsOrderLineFreightRates.stream().map(item -> item.getName() + " " + item.getTransportPrice()).toList());
-            }
-
-            vo.setOrderSourceLabel(orderSource == null ? null : orderSource.get(vo.getOrderSource()));
-            vo.setAccountsCycleLabel(settlementDictData.get(vo.getAccountsCycle()));
-            vo.setAppointor(longUserMap.get(vo.getCreateBy()) == null ? null : longUserMap.get(vo.getCreateBy()).getName());
-            vo.setBillingModeLabel(chargingDictData.get(vo.getBillingMode()));
-            vo.setSigningLabel(signingWay.get(vo.getSigning()));
-            vo.setStatusLabel(LogisticsOrderEnum.getName(vo.getStatus()));
-//            vo.setLoadAddress(vo.getLoadCityName() + vo.getLoadAddress());
-//            vo.setUnloadAddress(vo.getUnloadCityName() + vo.getUnloadAddress());
-
-            String lOrderId = vo.getLOrderId();
-            List<String> loadName = new ArrayList<>();
-            List<String> loadAddressList = new ArrayList<>();
-            List<KwtLogisticsOrderAddress> loadAddress = logisticsOrderAddressMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-                    .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE)
-                    .eq(KwtLogisticsOrderAddress::getDelFlag, NumberConstant.ZERO)
-                    .eq(KwtLogisticsOrderAddress::getLOrderId, lOrderId)
-            );
-            loadAddress.forEach(address -> {
-                loadName.add(address.getName());
-                loadAddressList.add(address.getDetailAddress());
-            });
-
-            List<String> unloadName = new ArrayList<>();
-            List<String> unloadAddressList = new ArrayList<>();
-            List<KwtLogisticsOrderAddress> unloadAddress = logisticsOrderAddressMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-                    .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO)
-                    .eq(KwtLogisticsOrderAddress::getDelFlag, NumberConstant.ZERO)
-                    .eq(KwtLogisticsOrderAddress::getLOrderId, lOrderId)
-            );
-            unloadAddress.forEach(address -> {
-                unloadName.add(address.getName());
-                unloadAddressList.add(address.getDetailAddress());
-            });
-
-            vo.setLoadNames(loadName);
-            vo.setLoadAddresses(loadAddressList);
-            vo.setUnloadNames(unloadName);
-            vo.setUnloadAddresses(unloadAddressList);
-            List<LoadAddressVo> loadAddressAmount = logisticsOrderAddressMapper.findByAddressAndLoadAmount(Long.parseLong(lOrderId), NumberConstant.ONE);
-            vo.setLoading(loadAddressAmount);
-            List<UnLoadAddressVo> unloadAddressAmount = logisticsOrderAddressMapper.findByAddressAndUnLoadAmount(Long.parseLong(lOrderId), NumberConstant.TWO);
-            vo.setUnloading(unloadAddressAmount);
-            vo.setWaitDistributionAmount(vo.getCarryingCapacity().subtract(vo.getSubcontractAmount()).subtract(vo.getEntrustAmount()));
-            String tOrderId = vo.getTOrderId();
-            if (StringUtils.isNotBlank(tOrderId)) {
-                try {
-                    OrderDetailRes orderDetailById = tradeOrderInfoService.getOrderDetailById(Long.parseLong(tOrderId));
-                    if (orderDetailById != null) {
-                        List<UnitInfoDetailRes> unitInfo = orderDetailById.getUnitInfo();
-                        if (CollectionUtils.isNotEmpty(unitInfo)) {
-                            for (UnitInfoDetailRes detailRes : unitInfo) {
-                                if ("1".equals(detailRes.getUnitType())) {
-                                    vo.setReceiveGoodsUnit(detailRes.getFirmName());
-                                    vo.setReceiveGoodsUnitEntId(detailRes.getEntId() == null ? null : detailRes.getEntId().toString());
-                                }
-                                if ("2".equals(detailRes.getUnitType())) {
-                                    vo.setShipmentsUnit(detailRes.getFirmName());
-                                    vo.setShipmentsUnitEntId(detailRes.getEntId() == null ? null : detailRes.getEntId().toString());
-                                }
-                            }
-                        }
-                    }
-                } catch (Exception e) {
-                    System.out.println("查询贸易订单失败!" + tOrderId + ";" + e.getMessage());
-                }
-            }
-
-        }
-        return PageRes.build(pageInfo, list);
-    }
-
-    public HttpResult statisticsLogisticsOrder(ManagementLogisticsOrderQuery query) {
-
-        //客户经理权限过滤
-        List<Long> authEntIdList = LoginUserHolder.getAuthEntIdList();
-        if (CollectionUtils.isEmpty(authEntIdList)) {
-            List<Long> ids = remoteUserService.findEnterpriseIdsByUserIdIsMain(LoginUserHolder.getUserId());
-            if (CollectionUtils.isEmpty(ids)){
-                /**补全数据状态不齐的情况*/
-                List<TableTops> arrayList = new ArrayList<>();
-                List<TableTops> list =new ArrayList<>();
-                arrayList.addAll(list);
-                arrayList = commonService.packageReturnStatistics(list, arrayList);
-                // 查询结果
-                Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN);
-                map.put("tableTop", arrayList);
-                // 查询结果
-                return HttpResult.ok(map);
-            }
-            authEntIdList.addAll(ids);
-        }
-
-        Long entId = LoginUserHolder.getEntId();
-        List<Integer> orderList = new ArrayList<>();
-        if (StringUtils.isNotBlank(query.getStatus())) {
-            if (String.valueOf(NumberConstant.EIGHT).equals(query.getStatus())) {
-                orderList.add(LogisticsOrderEnum.REJECT_ORDER.getCode());
-                orderList.add(LogisticsOrderEnum.CANCEL_ORDER.getCode());
-            } else {
-                orderList.add(Integer.valueOf(query.getStatus()));
-            }
-        }
-        //装卸货地址
-        String loadCode = query.getLoadAddressCode();
-        if (StringUtils.isNotBlank(loadCode)) {
-            switch (query.getLoadAddressLevel()) {
-                case 1 -> query.setLoadAddressCode(
-                        loadCode.substring(0, 2).trim());
-                case 2 -> query.setLoadAddressCode(
-                        loadCode.substring(0, 4).trim());
-                case 3 -> query.setLoadAddressCode(loadCode);
-            }
-        }
-        String unloadCode = query.getUnloadAddressCode();
-        if (StringUtils.isNotBlank(unloadCode)) {
-            switch (query.getUnloadAddressLevel()) {
-                case 1 -> query.setUnloadAddressCode(
-                        loadCode.substring(0, 2).trim());
-                case 2 -> query.setUnloadAddressCode(
-                        loadCode.substring(0, 4).trim());
-                case 3 -> query.setUnloadAddressCode(loadCode);
-            }
-        }
-        List<Long> longs = LoginUserHolder.getAuthUserIdList();
-        longs.add(LoginUserHolder.getUserId());
-        List<Long> longList = longs.stream().distinct().collect(Collectors.toList());
-        List<TableTops> list = logisticsOrderMapper.countManagementLogisticsOrderListByStatus(query, orderList, entId, longList, longList,authEntIdList);
-        List<TableTops> arrayList = new ArrayList<>();
-        arrayList.addAll(list);
-        /**补全数据状态不齐的情况*/
-        arrayList = commonService.packageReturnStatistics(list, arrayList);
-        // 查询结果
-        Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN);
-        map.put("tableTop", arrayList);
-        // 查询结果
-        return HttpResult.ok(map);
-    }
-
-    public List<ManagementLogisticsOrderExcelVo> exportLogisticsOrder(ManagementLogisticsOrderQuery query) {
 
-        //客户经理权限过滤
-        List<Long> authEntIdList = LoginUserHolder.getAuthEntIdList();
-        if (CollectionUtils.isEmpty(authEntIdList)) {
-            List<Long> ids = remoteUserService.findEnterpriseIdsByUserIdIsMain(LoginUserHolder.getUserId());
-            if (CollectionUtils.isEmpty(ids)){
-                return new ArrayList<>();
-            }
-            authEntIdList.addAll(ids);
-        }
 
-        List<Long> idsList = new ArrayList<>();
-        if (StringUtils.isNotBlank(query.getIds())) {
-            idsList = StringUtils.splitStrToList(query.getIds(), Long.class);
-        }
-        Long entId = LoginUserHolder.getEntId();
-//        PageHelper.startPage(query.getPage(), query.getPageSize());
-        List<Integer> orderList = new ArrayList<>();
-        if (StringUtils.isNotBlank(query.getStatus())) {
-            if (String.valueOf(NumberConstant.SEVEN).equals(query.getStatus())) {
-                orderList.add(LogisticsOrderEnum.REJECT_ORDER.getCode());
-                orderList.add(LogisticsOrderEnum.CANCEL_ORDER.getCode());
-            } else {
-                orderList.add(Integer.valueOf(query.getStatus()));
-            }
-        }
-        //装卸货地址
-        String loadCode = query.getLoadAddressCode();
-        if (StringUtils.isNotBlank(loadCode)) {
-            switch (query.getLoadAddressLevel()) {
-                case 1 -> query.setLoadAddressCode(
-                        loadCode.substring(0, 2).trim());
-                case 2 -> query.setLoadAddressCode(
-                        loadCode.substring(0, 4).trim());
-                case 3 -> query.setLoadAddressCode(loadCode);
-            }
-        }
-        String unloadCode = query.getUnloadAddressCode();
-        if (StringUtils.isNotBlank(unloadCode)) {
-            switch (query.getUnloadAddressLevel()) {
-                case 1 -> query.setUnloadAddressCode(
-                        loadCode.substring(0, 2).trim());
-                case 2 -> query.setUnloadAddressCode(
-                        loadCode.substring(0, 4).trim());
-                case 3 -> query.setUnloadAddressCode(loadCode);
-            }
-        }
-        List<Long> longs = LoginUserHolder.getAuthUserIdList();
-        longs.add(LoginUserHolder.getUserId());
-        List<Long> longList = longs.stream().distinct().collect(Collectors.toList());
-        List<ManagementLogisticsOrderVO> list = logisticsOrderMapper.selectManagementLogisticsOrderList(query, orderList, entId, longList, longList, idsList,authEntIdList);
-        /**计费方式*/
-        Map<String, String> chargingDictData = commonService.getDictData(DictTypeEnum.CHARGING_TYPE.getType());
-        /**结算周期*/
-        Map<String, String> settlementDictData = commonService.getDictData(DictTypeEnum.SETTLEMENT_CYCLE.getType());
-        /**签约方式*/
-        Map<String, String> signingWay = commonService.getDictData(DictTypeEnum.SIGNING_TYPE.getType());
-        /**合理损耗单位*/
-        Map<String, String> taxRate = commonService.getDictData(DictTypeEnum.TAX_RATE_TYPE.getType());
-        /**运价方式*/
-        Map<String, String> priceType = commonService.getDictData(DictTypeEnum.PRICE_TYPE.getType());
-        /**订单来源*/
-        Map<String, String> orderSource = commonService.getDictData(DictTypeEnum.ORDER_SOURCE.getType());
-        Map<Long, UserCacheResDto> longUserMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
-        if (CollectionUtils.isNotEmpty(list)) {
-            List<Long> collect = list.stream().map(ManagementLogisticsOrderVO::getCreateBy).collect(Collectors.toList());
-            if (CollectionUtils.isNotEmpty(collect)) {
-                longUserMap = remoteSystemService.queryUserCacheMapByIds(collect);
-            }
-        }
-        List<ManagementLogisticsOrderExcelVo> exportList = new ArrayList<>();
-        for (ManagementLogisticsOrderVO vo : list) {
-            ManagementLogisticsOrderExcelVo managementLogisticsOrderExcelVo = new ManagementLogisticsOrderExcelVo();
-            BeanUtils.copyProperties(vo, managementLogisticsOrderExcelVo);
-            managementLogisticsOrderExcelVo.setOrderSourceLabel(orderSource == null ? null : orderSource.get(vo.getOrderSource()));
-//            managementLogisticsOrderExcelVo.setStatus(vo.getStatus().toString());
-            managementLogisticsOrderExcelVo.setPriceLabel(vo.getPrice() == null ? null : vo.getPrice().toString() + priceType.get(vo.getPriceType()));
-            managementLogisticsOrderExcelVo.setLossUnitLabel(vo.getLoss() == null ? null : vo.getLoss().toString() + taxRate.get(vo.getLossUnit()));
-            managementLogisticsOrderExcelVo.setGoodsPriceLabel(vo.getGoodsPrice() == null ? null : vo.getGoodsPrice().toString() + priceType.get(vo.getGoodsPriceUnit()));
-            managementLogisticsOrderExcelVo.setAccountsCycleLabel(settlementDictData.get(vo.getAccountsCycle()));
-            managementLogisticsOrderExcelVo.setAppointor(longUserMap.get(vo.getCreateBy()) == null ? null : longUserMap.get(vo.getCreateBy()).getName());
-            managementLogisticsOrderExcelVo.setBillingModeLabel(chargingDictData.get(vo.getBillingMode()));
-            managementLogisticsOrderExcelVo.setSigningLabel(signingWay.get(vo.getSigning()));
-            managementLogisticsOrderExcelVo.setStatusLabel(LogisticsOrderEnum.getName(vo.getStatus()));
-
-//            managementLogisticsOrderExcelVo.setLoadAddress(vo.getLoadCityName() + vo.getLoadAddress());
-//            managementLogisticsOrderExcelVo.setUnloadAddress(vo.getUnloadCityName() + vo.getUnloadAddress());
-
-            String lOrderId = vo.getLOrderId();
-            List<String> loadName = new ArrayList<String>();
-            List<String> loadAddressList = new ArrayList<String>();
-            List<KwtLogisticsOrderAddress> loadAddress = logisticsOrderAddressMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-                    .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE)
-                    .eq(KwtLogisticsOrderAddress::getDelFlag, NumberConstant.ZERO)
-                    .eq(KwtLogisticsOrderAddress::getLOrderId, lOrderId)
-            );
-            loadAddress.forEach(address -> {
-                loadName.add(address.getName());
-                loadAddressList.add(address.getDetailAddress());
-            });
-
-            List<String> unloadName = new ArrayList<String>();
-            List<String> unloadAddressList = new ArrayList<String>();
-            List<KwtLogisticsOrderAddress> unloadAddress = logisticsOrderAddressMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-                    .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO)
-                    .eq(KwtLogisticsOrderAddress::getDelFlag, NumberConstant.ZERO)
-                    .eq(KwtLogisticsOrderAddress::getLOrderId, lOrderId)
-            );
-            unloadAddress.forEach(address -> {
-                unloadName.add(address.getName());
-                unloadAddressList.add(address.getDetailAddress());
-            });
-            managementLogisticsOrderExcelVo.setLoadName(StringUtils.stringListSpliceToString(loadName));
-            managementLogisticsOrderExcelVo.setLoadAddress(StringUtils.stringListSpliceToString(loadAddressList));
-            managementLogisticsOrderExcelVo.setUnloadName(StringUtils.stringListSpliceToString(unloadName));
-            managementLogisticsOrderExcelVo.setUnloadAddress(StringUtils.stringListSpliceToString(unloadAddressList));
-            BigDecimal subtract = vo.getCarryingCapacity().subtract(vo.getSubcontractAmount()).subtract(vo.getEntrustAmount());
-            DecimalFormat df = new DecimalFormat("0.00");
-            managementLogisticsOrderExcelVo.setWaitDistributionAmount(subtract == null ? null : df.format(subtract));
-            String tOrderId = vo.getTOrderId();
-            if (StringUtils.isNotBlank(tOrderId)) {
-                try {
-                    OrderDetailRes orderDetailById = tradeOrderInfoService.getOrderDetailById(Long.parseLong(tOrderId));
-                    if (orderDetailById != null) {
-                        List<UnitInfoDetailRes> unitInfo = orderDetailById.getUnitInfo();
-                        if (CollectionUtils.isNotEmpty(unitInfo)) {
-                            for (UnitInfoDetailRes detailRes : unitInfo) {
-                                if ("1".equals(detailRes.getUnitType())) {
-                                    managementLogisticsOrderExcelVo.setReceiveGoodsUnit(detailRes.getFirmName());
-                                }
-                                if ("2".equals(detailRes.getUnitType())) {
-                                    managementLogisticsOrderExcelVo.setShipmentsUnit(detailRes.getFirmName());
-                                }
-                            }
-                        }
-                    }
-                } catch (Exception e) {
-                    log.info("获取收发货单位异常:torderId{},错误信息：{}", tOrderId, e.getMessage(), e);
-                }
-            }
-            managementLogisticsOrderExcelVo.setSubcontractAmount(Objects.isNull(vo.getSubcontractAmount()) ? null : df.format(vo.getSubcontractAmount()) + priceType.get(vo.getPriceType()));
-            managementLogisticsOrderExcelVo.setEntrustAmount(Objects.isNull(vo.getEntrustAmount()) ? null : df.format(vo.getEntrustAmount()) + priceType.get(vo.getPriceType()));
-            managementLogisticsOrderExcelVo.setLoadAmount(Objects.isNull(vo.getLoadAmount()) ? null : df.format(vo.getLoadAmount()) + priceType.get(vo.getPriceType()));
-            managementLogisticsOrderExcelVo.setUnloadAmount(Objects.isNull(vo.getUnloadAmount()) ? null : df.format(vo.getUnloadAmount()) + priceType.get(vo.getPriceType()));
-            exportList.add(managementLogisticsOrderExcelVo);
-        }
-        return exportList;
-    }
 
     public HttpResult getOrderDetail(String orderIdStr, String orderNo) {
         HttpResult httpResult = new HttpResult();
@@ -831,90 +435,5 @@ public class KwtManagementLogisticsOrderService {
     }
 
 
-    public HttpResult getLogisticsContract(ManagementContractParam contractParam) {
-        List<Long> contractIds = StringUtils.splitStrToList(contractParam.getContractIds(), Long.class);
-        List<SckwLogisticsOrderVO> list = logisticsOrderMapper.selectOrderListByContractId(null, null, contractIds);
-        List<SckwLogisticsOrderVO> returnList = new ArrayList<>();
-        /**计量单位*/
-        Map<String, String> dictResDtoMap = commonService.getDictData(DictTypeEnum.UNIT_TYPE.getType());
-        /**支付方式*/
-        Map<String, String> tradeTypeDictData = commonService.getDictData(DictTypeEnum.TRADE_TYPE.getType());
-        /**运价方式*/
-//        Map<String, String> priceDictData = getDictData(DictTypeEnum.PRICE_TYPE.getType());
-        /**计费方式*/
-//        Map<String, String> chargingDictData = getDictData(DictTypeEnum.CHARGING_TYPE.getType());
-        /**结算周期*/
-        Map<String, String> settlementDictData = commonService.getDictData(DictTypeEnum.SETTLEMENT_CYCLE.getType());
-        /**签约方式*/
-//        Map<String, String> signingWay = getDictData(DictTypeEnum.SIGNING_TYPE.getType());
-        /**合理损耗*/
-        Map<String, String> taxRateTypeDictData = commonService.getDictData(DictTypeEnum.TAX_RATE_TYPE.getType());
-        if (CollectionUtils.isNotEmpty(list)) {
-            for (SckwLogisticsOrderVO vo : list) {
-                vo.setPaymentLabel(vo.getPayment() == null ? null : tradeTypeDictData.get(vo.getPayment().toString()));
-                vo.setStatusLabel(LogisticsOrderEnum.getDestination(vo.getStatus()));
-                vo.setLossUnitLabel(vo.getLossUnit() == null ? null : taxRateTypeDictData.get(vo.getLossUnit()));
-                vo.setUnitLabel(vo.getUnit() == null ? null : dictResDtoMap.get(vo.getUnit()));
-                vo.setGoodsPriceUnitLabel(vo.getGoodsPriceUnit() == null ? null : dictResDtoMap.get(vo.getGoodsPriceUnit()));
-                vo.setSettlementCycleLabel(vo.getSettlementCycle() == null ? null : settlementDictData.get(vo.getSettlementCycle().toString()));
-                UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(vo.getCreateBy());
-                vo.setCreateByName(userCacheResDto == null ? null : userCacheResDto.getName());
-            }
-            returnList = list.stream().skip((contractParam.getPage() - 1) * contractParam.getPageSize()).limit(contractParam.getPageSize()).collect(Collectors.toList());
-        }
-        PageResult build = PageResult.build(contractParam.getPage(), contractParam.getPageSize(), list.stream().count(), returnList);
-        return HttpResult.ok(build);
-    }
 
-    /**
-     * 运营端-贸易订单查询物流订单数据
-     *
-     * @param ids
-     * @param page
-     * @param pageSize
-     * @return
-     */
-    public HttpResult selectLogisticsOrderByTradeOrder(String ids, Integer page, Integer pageSize) {
-//        PageHelper.startPage(page, pageSize);
-        List<Long> tradeOrderIds = StringUtils.splitStrToList(ids, Long.class);
-        if (CollectionUtils.isEmpty(tradeOrderIds)) {
-            throw new BusinessException("贸易订单id不能为空");
-        }
-        List<LogisticsOrderDto> returnList = new ArrayList<>();
-        tradeOrderIds = tradeOrderIds.stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList());
-        /**数据展示*/
-        List<LogisticsOrderDto> list = logisticsOrderMapper.selectOrderListByTradeOrderIds(tradeOrderIds, null);
-//        PageInfo<LogisticsOrderDTO> pageInfo = new PageInfo<>(list);
-        if (CollectionUtils.isEmpty(list)) {
-            return HttpResult.ok();
-        }
-        /**计量单位*/
-        Map<String, String> unitTypeDictData = commonService.getDictData(DictTypeEnum.UNIT_TYPE.getType());
-        /**运价方式*/
-        Map<String, String> priceDictData = commonService.getDictData(DictTypeEnum.PRICE_TYPE.getType());
-        /**合理损耗*/
-        Map<String, String> taxRateTypeDictData = commonService.getDictData(DictTypeEnum.TAX_RATE_TYPE.getType());
-        if (CollectionUtils.isNotEmpty(list)) {
-            for (LogisticsOrderDto logisticsOrderDTO : list) {
-                logisticsOrderDTO.setStatusLabel(LogisticsOrderEnum.getDestination(logisticsOrderDTO.getStatus()));
-                String createName = StringUtils.isBlank(logisticsOrderDTO.getCreateBy()) ? null :
-                        (remoteSystemService.queryUserCacheById(Long.parseLong(logisticsOrderDTO.getCreateBy())) == null ? null :
-                                remoteSystemService.queryUserCacheById(Long.parseLong(logisticsOrderDTO.getCreateBy())).getName());
-                logisticsOrderDTO.setCreateName(createName);
-                logisticsOrderDTO.setPriceLabel(priceDictData.get(logisticsOrderDTO.getPriceType()));
-                logisticsOrderDTO.setLossUnitLabel(taxRateTypeDictData.get(logisticsOrderDTO.getLossUnit()));
-                logisticsOrderDTO.setGoodsPriceUnitLabel(priceDictData.get(logisticsOrderDTO.getGoodsPriceUnit()));
-                logisticsOrderDTO.setUnitLabel(unitTypeDictData.get(logisticsOrderDTO.getUnit()));
-            }
-            returnList.addAll(list);
-        }
-        /**基于多个传递数据查询->手动分页*/
-        List<LogisticsOrderDto> subList = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(returnList)) {
-            subList = returnList.stream().skip((page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-        }
-
-        PageResult build = PageResult.build(page, pageSize, returnList.stream().count(), subList);
-        return HttpResult.ok(build);
-    }
 }

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

@@ -1,10 +1,8 @@
 package com.sckw.transport.service.operateService;
 
-import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.constant.NumberConstant;
 import com.sckw.core.model.enums.CarWaybillEnum;
-import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.StringUtils;
@@ -15,15 +13,11 @@ import com.sckw.mongo.model.SckwWaybillOrder;
 import com.sckw.mongo.model.TableTops;
 import com.sckw.system.api.RemoteUserService;
 import com.sckw.transport.model.param.ManagementWaybillOrderQuery;
-import com.sckw.transport.model.vo.ManagementCarWaybillVo;
 import com.sckw.transport.model.vo.execlVo.ManagementWaybillOrderExcelVO;
-import com.sckw.transport.service.KwtCommonService;
 import com.sckw.transport.service.KwtWaybillManagementService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
 import org.springframework.data.mongodb.core.aggregation.AggregationResults;
@@ -31,8 +25,6 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
@@ -50,8 +42,6 @@ public class KwtManagementWaybillOrderService {
     @Autowired
     private MongoTemplate mongoTemplate;
 
-    @Autowired
-    private KwtCommonService commonService;
 
     @Autowired
     private KwtWaybillManagementService waybillManagementService;
@@ -63,7 +53,7 @@ public class KwtManagementWaybillOrderService {
      * @param query 权限过滤 相关联的企业
      * @return
      */
-    public Criteria newBuildWaybillOrdersQuery(ManagementWaybillOrderQuery query,List<Long> authEntIdList) {
+    public Criteria newBuildWaybillOrdersQuery(ManagementWaybillOrderQuery query, List<Long> authEntIdList) {
         // 模糊匹配
         // 根据条件查询所有并排序，且分页
         // 设置模糊查询匹配规则  忽略大小写
@@ -135,122 +125,6 @@ public class KwtManagementWaybillOrderService {
     @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
     RemoteUserService remoteUserService;
 
-    /**
-     * 运单列表
-     *
-     * @param query
-     * @return
-     */
-    public HttpResult selectWaybillOrder(ManagementWaybillOrderQuery query) {
-        List<ManagementCarWaybillVo> returnList = new ArrayList<>();
-
-        //客户经理权限过滤
-        List<Long> authEntIdList = LoginUserHolder.getAuthEntIdList();
-        if (CollectionUtils.isEmpty(authEntIdList)) {
-            List<Long> ids = remoteUserService.findEnterpriseIdsByUserIdIsMain(LoginUserHolder.getUserId());
-            if (CollectionUtils.isEmpty(ids)){
-                PageResult build = PageResult.build(query.getPage(), query.getPageSize(), 0L, returnList);
-                return HttpResult.ok(build);
-            }
-            authEntIdList.addAll(ids);
-        }
-
-        Criteria criteria = newBuildWaybillOrdersQuery(query,authEntIdList);
-
-        Query queryFormat = new Query(criteria);
-        // in查询
-        List<Long> wOrderIds = StringUtils.splitStrToList(query.getIds(), ",", Long.class);
-        if (CollectionUtils.isNotEmpty(wOrderIds)) {
-            queryFormat.addCriteria(Criteria.where("wOrderId").in(wOrderIds));
-        }
-        // 总记录数
-        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);
-
-        if (CollectionUtils.isNotEmpty(list)) {
-            for (SckwWaybillOrder waybillOrder : list) {
-                ManagementCarWaybillVo vo = new ManagementCarWaybillVo();
-                vo.setLOrderNo(waybillOrder.getLOrderNo() == null ?
-                        null : waybillOrder.getLOrderNo());
-                vo.setWOrderNo(waybillOrder.getWOrderNo() == null ?
-                        null : waybillOrder.getWOrderNo());
-                vo.setWOrderId(waybillOrder.getWOrderId() == null ?
-                        String.valueOf(waybillOrder.get_id()) : String.valueOf(waybillOrder.getWOrderId()));
-                vo.setTruckNo(waybillOrder.getTruckNo());
-                vo.setDriverName(waybillOrder.getDriverName() == null ?
-                        null : String.valueOf(waybillOrder.getDriverName()));
-                vo.setType(String.valueOf(waybillOrder.getType()));
-                String typeString = "";
-                if (waybillOrder.getType().equals(NumberConstant.ONE)) {
-                    typeString = "趟次";
-                }
-                if (waybillOrder.getType().equals(NumberConstant.TWO)) {
-                    typeString = "循环";
-                }
-                vo.setTypeLabel(typeString);
-                vo.setStatus(waybillOrder.getStatus() == null ?
-                        null : String.valueOf(waybillOrder.getStatus()));
-                vo.setStatusLabel(CarWaybillEnum.getName(waybillOrder.getStatus()));
-                // 托量单位
-                vo.setUnit(waybillOrder.getUnit() == null ? null : waybillOrder.getUnit());
-                if (waybillOrder.getUnit() != null) {
-                    Map<String, String> unitType = commonService.getDictData(DictTypeEnum.UNIT_TYPE.getType());
-                    String sysDict = unitType.get(waybillOrder.getUnit());
-                    vo.setUnitLabel(sysDict);
-                }
-                vo.setSendCarTime(waybillOrder.getCreateTime() == null ?
-                        null : DateUtil.getDateTime(waybillOrder.getCreateTime()));
-                vo.setStartTime(waybillOrder.getStartTime() == null ?
-                        null : waybillOrder.getStartTime());
-                vo.setEndTime(waybillOrder.getEndTime() == null ?
-                        null : waybillOrder.getEndTime());
-                vo.setEntrustAmount(String.valueOf(waybillOrder.getEntrustAmount()));
-                vo.setLoadName(waybillOrder.getLoadName() == null ?
-                        null : waybillOrder.getLoadName());
-                vo.setLoadAddress((waybillOrder.getLoadCityName() == null ? "" : waybillOrder.getLoadCityName())
-                        .concat(waybillOrder.getLoadDetailAddress() == null ? "" : waybillOrder.getLoadDetailAddress()));
-                vo.setUnloadName(waybillOrder.getUnloadName() == null ?
-                        null : waybillOrder.getUnloadName());
-                vo.setUnloadAddress((waybillOrder.getUnloadCityName() == null ? "" : waybillOrder.getUnloadCityName())
-                        .concat(waybillOrder.getUnloadDetailAddress() == null ? "" : waybillOrder.getUnloadDetailAddress()));
-                vo.setLoadAmount(waybillOrder.getLoadAmount() == null ?
-                        null : String.valueOf(waybillOrder.getLoadAmount()));
-                vo.setUnloadAmount(waybillOrder.getUnloadAmount() == null ?
-                        null : String.valueOf(waybillOrder.getUnloadAmount()));
-                vo.setLoadDateTime(waybillOrder.getLoadTime() == null ?
-                        null : DateUtil.getDateTime(waybillOrder.getLoadTime()));
-                vo.setUnloadDateTime(waybillOrder.getUnloadTime() == null ?
-                        null : DateUtil.getDateTime(waybillOrder.getUnloadTime()));
-                vo.setCreateTime(waybillOrder.getCreateTime() == null ?
-                        null : DateUtil.getDateTime(waybillOrder.getCreateTime()));
-                vo.setUpdateTime(waybillOrder.getUpdateTime() == null ?
-                        null : DateUtil.getDateTime(waybillOrder.getUpdateTime()));
-                // 货损量
-                BigDecimal deficitAmount = waybillOrder.getDeficitAmount() == null ?
-                        BigDecimal.valueOf(0) : waybillOrder.getDeficitAmount();
-                vo.setDeficitAmount(String.valueOf(deficitAmount));
-                // 计算扣亏量
-                BigDecimal loadAmount = waybillOrder.getLoadAmount() == null ? NumberConstant.ZERO_TWO : waybillOrder.getLoadAmount();
-                BigDecimal unloadAmount = waybillOrder.getUnloadAmount() == null ? NumberConstant.ZERO_TWO : waybillOrder.getUnloadAmount();
-                BigDecimal deficitRealAmount = commonService.deficitLossAmount(
-                        waybillOrder.getLoadAmount(),
-                        loadAmount.subtract(unloadAmount),
-                        waybillOrder.getLoss(),
-                        waybillOrder.getLossUnit()
-                );
-                vo.setDeficitRealAmount(deficitRealAmount.setScale(2, RoundingMode.HALF_UP).toString());
-
-                vo.setGoodsPriceUnit(waybillOrder.getGoodsPriceUnit() == null ?
-                        null : String.valueOf(waybillOrder.getGoodsPriceUnit()));
-                returnList.add(vo);
-            }
-        }
-        PageResult build = PageResult.build(query.getPage(), query.getPageSize(), total, returnList);
-        return HttpResult.ok(build);
-    }
 
     /**
      * 运单分类统计
@@ -276,14 +150,14 @@ public class KwtManagementWaybillOrderService {
         List<Long> authEntIdList = LoginUserHolder.getAuthEntIdList();
         if (CollectionUtils.isEmpty(authEntIdList)) {
             List<Long> ids = remoteUserService.findEnterpriseIdsByUserIdIsMain(LoginUserHolder.getUserId());
-            if (CollectionUtils.isEmpty(ids)){
+            if (CollectionUtils.isEmpty(ids)) {
                 //填充默认值
-               return getDefaultWaybillOrder(statuses);
+                return getDefaultWaybillOrder(statuses);
             }
             authEntIdList.addAll(ids);
         }
 
-        Criteria criteria = newBuildWaybillOrdersQuery(query,authEntIdList);
+        Criteria criteria = newBuildWaybillOrdersQuery(query, authEntIdList);
         Aggregation aggregation = Aggregation.newAggregation(
                 Aggregation.match(criteria),
                 Aggregation.group("status").count().as("total"),
@@ -292,7 +166,7 @@ public class KwtManagementWaybillOrderService {
         AggregationResults<TableTops> outputTypeCount = mongoTemplate.aggregate(aggregation, SckwWaybillOrder.class, TableTops.class);
         List<TableTops> results = outputTypeCount.getMappedResults();
         // 填充默认值
-        Map<String,TableTops> listMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, TableTops> listMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         TableTops topTotal = new TableTops();
         topTotal.setName("全部");
         topTotal.setValue("all");
@@ -307,7 +181,7 @@ public class KwtManagementWaybillOrderService {
         }
         Integer allTotal = 0;
         for (TableTops result : results) {
-            if(listMap.containsKey(result.getValue())) {
+            if (listMap.containsKey(result.getValue())) {
                 listMap.get(result.getValue()).setTotal(result.getTotal());
             }
             allTotal += result.getTotal();
@@ -319,7 +193,7 @@ public class KwtManagementWaybillOrderService {
     private HttpResult getDefaultWaybillOrder(List<Integer> statuses) {
         List<TableTops> results = new ArrayList<>();
         // 填充默认值
-        Map<String,TableTops> listMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, TableTops> listMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         TableTops topTotal = new TableTops();
         topTotal.setName("全部");
         topTotal.setValue("all");
@@ -334,7 +208,7 @@ public class KwtManagementWaybillOrderService {
         }
         Integer allTotal = 0;
         for (TableTops result : results) {
-            if(listMap.containsKey(result.getValue())) {
+            if (listMap.containsKey(result.getValue())) {
                 listMap.get(result.getValue()).setTotal(result.getTotal());
             }
             allTotal += result.getTotal();
@@ -356,13 +230,13 @@ public class KwtManagementWaybillOrderService {
         List<Long> authEntIdList = LoginUserHolder.getAuthEntIdList();
         if (CollectionUtils.isEmpty(authEntIdList)) {
             List<Long> ids = remoteUserService.findEnterpriseIdsByUserIdIsMain(LoginUserHolder.getUserId());
-            if (CollectionUtils.isEmpty(ids)){
+            if (CollectionUtils.isEmpty(ids)) {
                 return list;
             }
             authEntIdList.addAll(ids);
         }
 
-        Criteria criteria = newBuildWaybillOrdersQuery(query,authEntIdList);
+        Criteria criteria = newBuildWaybillOrdersQuery(query, authEntIdList);
         Query queryFormat = new Query(criteria);
         // in查询
         List<Long> wOrderIds = StringUtils.splitStrToList(query.getIds(), ",", Long.class);
@@ -400,13 +274,4 @@ public class KwtManagementWaybillOrderService {
         return list;
     }
 
-    /**
-     * 运单详情
-     *
-     * @param id
-     * @return
-     */
-    public HttpResult getOrderDetail(Long id) {
-        return waybillManagementService.waybillData(id);
-    }
 }