1.调整代码结构

2.调整项目代码目录层次
3.去除注释无用代码
4.代码review

.gitignore

@@ -25,3 +25,5 @@ hs_err_pid*
 ### logs目录 ###
 logs
 
+.flattened-pom.xml
+

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/controller/KwcCarrierController.java

@@ -2,7 +2,7 @@ package com.sckw.contract.controller;
 
 import com.sckw.contract.model.vo.req.IdReqVo;
 import com.sckw.contract.model.vo.req.QueryListReqVo;
-import com.sckw.contract.service.KwcContractLogisticsService;
+import com.sckw.contract.service.operateService.KwcContractLogisticsService;
 import com.sckw.core.model.enums.EntTypeEnum;
 import com.sckw.core.web.response.HttpResult;
 import jakarta.servlet.http.HttpServletResponse;

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/controller/KwcCheckedController.java

@@ -1,14 +1,10 @@
 package com.sckw.contract.controller;
 
 import com.sckw.contract.model.vo.req.*;
-import com.sckw.contract.service.*;
-import com.sckw.core.exception.BusinessException;
-import com.sckw.core.exception.SystemException;
+import com.sckw.contract.service.operateService.KwcContractLogisticsService;
 import com.sckw.core.model.enums.EntTypeEnum;
-import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.excel.utils.ExcelUtil;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,8 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 /**
  * @author czh
  * @desc 托运合同

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/controller/KwcContractSaleController.java

@@ -1,7 +1,7 @@
 package com.sckw.contract.controller;
 
 import com.sckw.contract.model.vo.req.*;
-import com.sckw.contract.service.KwcContractTradeService;
+import com.sckw.contract.service.operateService.KwcContractTradeService;
 import com.sckw.core.model.enums.EntTypeEnum;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/controller/KwcPurchaseController.java

@@ -2,7 +2,7 @@ package com.sckw.contract.controller;
 
 import com.sckw.contract.model.vo.req.IdReqVo;
 import com.sckw.contract.model.vo.req.QueryListReqVo;
-import com.sckw.contract.service.KwcContractTradeService;
+import com.sckw.contract.service.operateService.KwcContractTradeService;
 import com.sckw.core.model.enums.EntTypeEnum;
 import com.sckw.core.web.response.HttpResult;
 import jakarta.servlet.http.HttpServletResponse;

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/CommonBusinessService.java

@@ -14,6 +14,8 @@ import com.sckw.contract.model.entity.KwcContractLogisticsUnit;
 import com.sckw.contract.model.entity.KwcContractTrade;
 import com.sckw.contract.model.entity.KwcContractTradeUnit;
 import com.sckw.contract.model.vo.req.ESignCallBackReqVo;
+import com.sckw.contract.service.operateService.KwcContractLogisticsService;
+import com.sckw.contract.service.operateService.KwcContractTradeService;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.ClientTypeEnum;

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractLogisticsGoodsService.java

@@ -11,14 +11,14 @@ import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.IdWorker;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
-import com.sckw.product.api.dubbo.GoodsInfoService;
-import com.sckw.product.api.model.KwpGoods;
-import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -33,8 +33,6 @@ public class KwcContractLogisticsGoodsService {
     @Autowired
     private KwcContractLogisticsGoodsMapper kwcContractLogisticsGoodsMapper;
 
-    @DubboReference(version = "1.0.0", group = "design", check = false)
-    private GoodsInfoService goodsInfoService;
 
 
     /**

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractLogisticsService.java → sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractLogisticsService.java

@@ -1,4 +1,4 @@
-package com.sckw.contract.service;
+package com.sckw.contract.service.operateService;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -15,6 +15,10 @@ import com.sckw.contract.model.entity.KwcContractLogisticsUnit;
 import com.sckw.contract.model.report.LogisticsListExport;
 import com.sckw.contract.model.vo.req.*;
 import com.sckw.contract.model.vo.res.*;
+import com.sckw.contract.service.CommonBusinessService;
+import com.sckw.contract.service.KwcContractLogisticsGoodsService;
+import com.sckw.contract.service.KwcContractLogisticsTrackService;
+import com.sckw.contract.service.KwcContractLogisticsUnitService;
 import com.sckw.core.common.enums.enums.DictEnum;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.BusinessException;

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractTradeService.java → sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractTradeService.java

@@ -1,4 +1,4 @@
-package com.sckw.contract.service;
+package com.sckw.contract.service.operateService;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -15,6 +15,10 @@ import com.sckw.contract.model.entity.KwcContractTradeUnit;
 import com.sckw.contract.model.report.TradeListExport;
 import com.sckw.contract.model.vo.req.*;
 import com.sckw.contract.model.vo.res.*;
+import com.sckw.contract.service.CommonBusinessService;
+import com.sckw.contract.service.KwcContractTradeGoodsService;
+import com.sckw.contract.service.KwcContractTradeTrackService;
+import com.sckw.contract.service.KwcContractTradeUnitService;
 import com.sckw.core.common.enums.enums.DictEnum;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.SystemException;

sckw-modules/sckw-file/src/main/java/com/sckw/file/controller/FileApiController.java → sckw-modules/sckw-file/src/main/java/com/sckw/file/controller/KwfFileController.java

@@ -38,13 +38,13 @@ import java.util.Map;
 @RestController
 @RequestMapping("/file")
 @AllArgsConstructor
-public class FileApiController {
+public class KwfFileController {
 
     @Autowired
     private FileService fileService;
 
     @Autowired
-    private FileDubboApiServiceImpl fileDubboApiService;
+    private FileDubboApiServiceImpl fileApiService;
 
     /**
      * 上传文件至OSS
@@ -204,7 +204,7 @@ public class FileApiController {
     @GlobalTransactional(rollbackFor = Exception.class)
     public HttpResult fileInfoInsertByOSS(@RequestBody FileInfo fileInfo) {
         try {
-            return fileDubboApiService.fileInfoInsert(fileInfo);
+            return fileApiService.fileInfoInsert(fileInfo);
         } catch (ParseException e) {
             throw new RuntimeException(e);
         }

sckw-modules/sckw-file/src/main/java/com/sckw/file/service/FileService.java

@@ -137,7 +137,7 @@ public class FileService {
             for (MultipartFile multipartFile : multipartFiles) {
                 Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN);
                 //文件大小
-                String fileSize = FileUtils.getFileSize(multipartFile);
+//                String fileSize = FileUtils.getFileSize(multipartFile);
                 //文件名称
                 String originalFilename = multipartFile.getOriginalFilename();
                 map.put("code", HttpStatus.SUCCESS_CODE);
@@ -183,7 +183,7 @@ public class FileService {
 
     public void remove(String fileName) {
         String str = FileUtils.getOSSAddressPrefix();
-        String fileNameSubstring = StringUtils.substring(fileName, str.length() + 1);
+//        String fileNameSubstring = StringUtils.substring(fileName, str.length() + 1);
         FileUtils.remove(fileName);
     }
 

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfDriverService.java

@@ -882,11 +882,11 @@ public class KwfDriverService {
         driverImport.setRemark(JSON.toJSONString(returnFileInfo));
         kwfDriverImportDao.insert(driverImport);
 
-        try {
-            //remoteFileService.fileInfoInsert(fileInfo);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+//        try {
+//            //remoteFileService.fileInfoInsert(fileInfo);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
     }
 
     /**

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckReportService.java

@@ -20,8 +20,13 @@ import com.sckw.fleet.dao.KwfDriverMapper;
 import com.sckw.fleet.dao.KwfTruckMapper;
 import com.sckw.fleet.dao.KwfTruckReportImportMapper;
 import com.sckw.fleet.dao.KwfTruckReportMapper;
-import com.sckw.fleet.model.*;
-import com.sckw.fleet.model.dto.*;
+import com.sckw.fleet.model.KwfDriver;
+import com.sckw.fleet.model.KwfTruck;
+import com.sckw.fleet.model.KwfTruckReport;
+import com.sckw.fleet.model.KwfTruckReportImport;
+import com.sckw.fleet.model.dto.KwfChangeFleetDto;
+import com.sckw.fleet.model.dto.KwfTruckReportDto;
+import com.sckw.fleet.model.dto.KwfTruckReportExcelImportDto;
 import com.sckw.fleet.model.vo.KwfTableTopCount;
 import com.sckw.fleet.model.vo.KwfTruckReportVo;
 import com.sckw.system.api.RemoteSystemService;
@@ -30,11 +35,11 @@ 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 org.apache.dubbo.config.annotation.DubboReference;
-import org.checkerframework.checker.units.qual.K;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -68,15 +73,6 @@ public class KwfTruckReportService {
     @DubboReference(version = "1.0.0", group = "design", check = false,timeout = 8000)
     private RemoteUserService remoteUserService;
 
-    /**
-     * @param key 主键id
-     * @desc 根据主键查询
-     * @author zk
-     * @date 2023/7/15
-     **/
-    public KwfTruckReport selectByKey(Long key) {
-        return null;
-    }
 
     /**
      * @param params 参数
@@ -515,12 +511,12 @@ public class KwfTruckReportService {
         truckReportImport.setUrl(returnFileInfo.getFilePath());
         truckReportImport.setRemark(JSON.toJSONString(returnFileInfo));
         kwfTruckReportImportDao.insert(truckReportImport);
-
-        try {
-            //remoteFileService.fileInfoInsert(fileInfo);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+//
+//        try {
+//            //remoteFileService.fileInfoInsert(fileInfo);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
     }
 
     /**

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckService.java

@@ -700,11 +700,11 @@ public class KwfTruckService {
         truckImport.setRemark(JSON.toJSONString(returnFileInfo));
         kwfTruckImportDao.insert(truckImport);
 
-        try {
-            //remoteFileService.fileInfoInsert(fileInfo);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+//        try {
+//            //remoteFileService.fileInfoInsert(fileInfo);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
     }
 
     /**
@@ -1105,7 +1105,6 @@ public class KwfTruckService {
                     return truckGpsMap;
                 }
                 JSONArray trucks = result.getJSONArray("data");
-                //log.info("车牌号数量="+ truckNos.size() + " GPS数量=" + (trucks != null ? trucks.size() : 0) + " 响应时间="+(entTime - begTime));
                 for (int i = 0; trucks != null && i < trucks.size(); i++) {
                     JSONObject truck = trucks.getJSONObject(i);
                     JSONObject locateInfo = truck.getJSONObject("locateInfo");

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/CommonBusinessService.java

@@ -49,9 +49,6 @@ public class CommonBusinessService {
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
-    @DubboReference(version = "1.0.0", group = "design", check = false)
-    private RemoteUserService remoteUserService;
-
     @Autowired
     private KwmCooperateMapper kwmCooperateMapper;
 

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmAddressService.java

@@ -60,8 +60,6 @@ public class KwmAddressService {
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteUserService remoteUserService;
 
-    @Autowired
-    private StreamBridge streamBridge;
 
     /**
      * @param reqVo 分页入参
@@ -220,20 +218,6 @@ public class KwmAddressService {
         Integer defaultType = kwmAddress.getDefaultType();
         Integer setDefaultType = reqVo.getDefaultType();
 
-//        LambdaQueryWrapper<KwmAddress> wrapper = new LambdaQueryWrapper<>();
-//        wrapper.eq(KwmAddress::getEntId, entId).
-//                eq(KwmAddress::getDelFlag, Global.NO).
-//                eq(KwmAddress::getStatus, Global.NO);
-//        List<KwmAddress> entAddress = kwmAddressMapper.selectList(wrapper);
-//        List<Integer> defaultTypeList = entAddress.stream().map(KwmAddress::getDefaultType).distinct().toList();
-//        if (defaultType.equals(AddressDefaultTypeEnum.SHIPMENT.getCode()) && (defaultTypeList.contains(AddressDefaultTypeEnum.SHIPMENT.getCode()) || defaultTypeList.contains(AddressDefaultTypeEnum.BOTH.getCode()))) {
-//            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.MSG_021);
-//        }
-//
-//        if (defaultType.equals(AddressDefaultTypeEnum.TAKE.getCode()) && (defaultTypeList.contains(AddressDefaultTypeEnum.TAKE.getCode()) || defaultTypeList.contains(AddressDefaultTypeEnum.BOTH.getCode()))) {
-//            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.MSG_021);
-//        }
-
         //当前是收货或者卸货
         if (!defaultType.equals(AddressDefaultTypeEnum.NO.getCode()) && !defaultType.equals(AddressDefaultTypeEnum.BOTH.getCode())) {
             if (defaultType.equals(setDefaultType)) {

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmCooperateApplyService.java

@@ -1,8 +1,5 @@
 package com.sckw.manage.service;
 
-import java.io.IOException;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -12,10 +9,12 @@ import com.sckw.core.model.enums.CooperateStatusEnum;
 import com.sckw.core.model.enums.CooperateTypeEnum;
 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.IdWorker;
+import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
-import com.sckw.excel.utils.EasyExcelUtil;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.manage.dao.KwmCooperateMapper;
 import com.sckw.manage.dao.KwmCooperateTypeMapper;
@@ -24,7 +23,6 @@ import com.sckw.manage.model.dto.res.CooperateManageQueryResDto;
 import com.sckw.manage.model.dto.res.CooperateQueryDto;
 import com.sckw.manage.model.entity.KwmCooperate;
 import com.sckw.manage.model.entity.KwmCooperateType;
-import com.sckw.manage.model.report.AddressQueryExport;
 import com.sckw.manage.model.report.CooperateManageExport;
 import com.sckw.manage.model.vo.req.CooperateApplyQueryReqVo;
 import com.sckw.manage.model.vo.req.CooperateApproveReqVo;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operationManagement/LedgerLogisticsController.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/LedgerLogisticsController.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.controller.operationManagement;
+package com.sckw.payment.controller.operate;
 
 import com.sckw.core.model.page.PageRes;
 import com.sckw.core.web.response.HttpResult;
@@ -7,7 +7,7 @@ import com.sckw.payment.model.vo.LedgerLogistics;
 import com.sckw.payment.model.vo.excel.LedgerLogisticsExport;
 import com.sckw.payment.model.vo.req.LedgerListReq;
 import com.sckw.payment.model.vo.req.LogisticsReq;
-import com.sckw.payment.service.operationManagement.LedgerLogisticsService;
+import com.sckw.payment.service.operateService.LedgerLogisticsService;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operationManagement/LedgerTradeController.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/LedgerTradeController.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.controller.operationManagement;
+package com.sckw.payment.controller.operate;
 
 import com.sckw.core.model.page.PageRes;
 import com.sckw.core.web.response.HttpResult;
@@ -7,7 +7,7 @@ import com.sckw.payment.model.vo.LedgerSell;
 import com.sckw.payment.model.vo.excel.LedgerTradeExport;
 import com.sckw.payment.model.vo.req.LedgerListReq;
 import com.sckw.payment.model.vo.req.TradeReq;
-import com.sckw.payment.service.operationManagement.LedgerTradeService;
+import com.sckw.payment.service.operateService.LedgerTradeService;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operationManagement/OperateWalletController.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/OperateWalletController.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.controller.operationManagement;
+package com.sckw.payment.controller.operate;
 
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.payment.model.vo.req.CashPageReq;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operationManagement/SettlementLogisticsController.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/SettlementLogisticsController.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.controller.operationManagement;
+package com.sckw.payment.controller.operate;
 
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.ExcelUtil;
@@ -6,7 +6,7 @@ import com.sckw.payment.model.constant.LogisticsUnitType;
 import com.sckw.payment.model.vo.SettlementLogistics;
 import com.sckw.payment.model.vo.excel.SettlementLogisticsExportVo;
 import com.sckw.payment.model.vo.req.SettlementReq;
-import com.sckw.payment.service.operationManagement.SettlementLogisticsService;
+import com.sckw.payment.service.operateService.SettlementLogisticsService;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operationManagement/SettlementOfflineController.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/SettlementOfflineController.java

@@ -1,9 +1,9 @@
-package com.sckw.payment.controller.operationManagement;
+package com.sckw.payment.controller.operate;
 
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.payment.model.constant.SettlementOrderTypeEnum;
 import com.sckw.payment.model.vo.req.SettlementOfflineReq;
-import com.sckw.payment.service.operationManagement.SettlementOfflineService;
+import com.sckw.payment.service.operateService.SettlementOfflineService;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.GetMapping;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operationManagement/SettlementTradeController.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/SettlementTradeController.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.controller.operationManagement;
+package com.sckw.payment.controller.operate;
 
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.ExcelUtil;
@@ -6,7 +6,7 @@ import com.sckw.payment.model.constant.TradeUnitType;
 import com.sckw.payment.model.vo.SettlementTrade;
 import com.sckw.payment.model.vo.excel.SettlementTradeExportVo;
 import com.sckw.payment.model.vo.req.SettlementTradeReq;
-import com.sckw.payment.service.operationManagement.SettlementTradeService;
+import com.sckw.payment.service.operateService.SettlementTradeService;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operationManagement/SettlementWalletController.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/SettlementWalletController.java

@@ -1,10 +1,10 @@
-package com.sckw.payment.controller.operationManagement;
+package com.sckw.payment.controller.operate;
 
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.payment.model.constant.SettlementOrderTypeEnum;
 import com.sckw.payment.model.constant.SettlementWalletPayTypeEnum;
 import com.sckw.payment.model.vo.req.SettlementWalletReq;
-import com.sckw.payment.service.operationManagement.SettlementWalletService;
+import com.sckw.payment.service.operateService.SettlementWalletService;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import org.springframework.validation.annotation.Validated;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementTradeService.java

@@ -46,7 +46,6 @@ public class KwpSettlementTradeService {
     private final KwpSettlementTradeMapper settlementTradeMapper;
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
-    private final KwpLedgerTradeUnitService tradeUnitService;
     @Resource
     private KwpSettlementWalletService kwpSettlementWalletService;
     @Resource

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/PayCenterService.java

@@ -377,9 +377,6 @@ public class PayCenterService {
         if (Objects.isNull(money)) {
             throw new BusinessException("提现金额不能为空");
         }
-//        if (StringUtils.isBlank(remarks)) {
-//            throw new BusinessException("备注不能为空");
-//        }
         String sync = postHttp(PayCenterEnum.WITHDRAW_TAKE, new HashMap<>() {{
             put("uid", uid);
             put("channel", channel);

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/operationManagement/LedgerLogisticsService.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/operateService/LedgerLogisticsService.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.service.operationManagement;
+package com.sckw.payment.service.operateService;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/operationManagement/LedgerTradeService.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/operateService/LedgerTradeService.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.service.operationManagement;
+package com.sckw.payment.service.operateService;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.github.pagehelper.PageHelper;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/operationManagement/SettlementLogisticsService.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/operateService/SettlementLogisticsService.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.service.operationManagement;
+package com.sckw.payment.service.operateService;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/operationManagement/SettlementOfflineService.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/operateService/SettlementOfflineService.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.service.operationManagement;
+package com.sckw.payment.service.operateService;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/operationManagement/SettlementTradeService.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/operateService/SettlementTradeService.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.service.operationManagement;
+package com.sckw.payment.service.operateService;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/operationManagement/SettlementWalletService.java → sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/operateService/SettlementWalletService.java

@@ -1,4 +1,4 @@
-package com.sckw.payment.service.operationManagement;
+package com.sckw.payment.service.operateService;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;

sckw-modules/sckw-product/src/main/java/com/sckw/product/controller/operation/GoodsManagerController.java → sckw-modules/sckw-product/src/main/java/com/sckw/product/controller/operate/GoodsManagerController.java

@@ -1,4 +1,4 @@
-package com.sckw.product.controller.operation;
+package com.sckw.product.controller.operate;
 
 import com.sckw.core.exception.CustomPromptException;
 import com.sckw.core.utils.CollectionUtils;
@@ -9,7 +9,7 @@ import com.sckw.product.model.OperationGoodsListExport;
 import com.sckw.product.model.vo.req.OperatorGoodsExportQueryVO;
 import com.sckw.product.model.vo.req.OperatorGoodsListQueryVO;
 import com.sckw.product.model.vo.req.OperatorGoodsStsQueryVO;
-import com.sckw.product.service.operation.GoodsManagerService;
+import com.sckw.product.service.operateService.GoodsManagerService;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/operation/GoodsManagerService.java → sckw-modules/sckw-product/src/main/java/com/sckw/product/service/operateService/GoodsManagerService.java

@@ -1,4 +1,4 @@
-package com.sckw.product.service.operation;
+package com.sckw.product.service.operateService;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsUserService.java

@@ -12,7 +12,6 @@ import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.redis.constant.RedisConstant;
 import com.sckw.redis.utils.RedissonUtils;
-import com.sckw.system.api.RemoteUserService;
 import com.sckw.system.api.model.dto.req.RegisterReqDto;
 import com.sckw.system.api.model.dto.req.UpdatePasswordReqDto;
 import com.sckw.system.api.model.dto.res.AreaTreeFrontResDto;
@@ -24,8 +23,8 @@ import com.sckw.system.dubbo.RemoteSystemServiceImpl;
 import com.sckw.system.model.*;
 import com.sckw.system.model.report.KwsUserExcel;
 import com.sckw.system.model.vo.req.*;
-import com.sckw.system.model.vo.res.KwsUserSystemTypeVo;
 import com.sckw.system.model.vo.res.KwsUserResVo;
+import com.sckw.system.model.vo.res.KwsUserSystemTypeVo;
 import com.sckw.transport.api.dubbo.TransportStatisticsService;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -76,8 +75,6 @@ public class KwsUserService {
 
     @Autowired
     private RemoteSystemServiceImpl remoteSystemService;
-    @Autowired
-    private RemoteUserService remoteUserService;
 
     @Autowired
     private CommonService commonService;

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

@@ -1,4 +1,4 @@
-package com.sckw.transport.controller.operationManagement;
+package com.sckw.transport.controller.operate;
 
 import com.alibaba.fastjson.JSONObject;
 import com.sckw.core.exception.CustomPromptException;
@@ -12,7 +12,7 @@ import com.sckw.transport.model.param.ManagementContractParam;
 import com.sckw.transport.model.param.ManagementLogisticsOrderQuery;
 import com.sckw.transport.model.param.OrderQuery;
 import com.sckw.transport.model.vo.execlVo.ManagementLogisticsOrderExcelVo;
-import com.sckw.transport.service.KwtManagementLogisticsOrderService;
+import com.sckw.transport.service.operateService.KwtManagementLogisticsOrderService;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;

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

@@ -1,4 +1,4 @@
-package com.sckw.transport.controller.operationManagement;
+package com.sckw.transport.controller.operate;
 
 import com.alibaba.fastjson.JSONObject;
 import com.sckw.core.exception.CustomPromptException;
@@ -8,7 +8,7 @@ import com.sckw.excel.config.easyexcel.RequestHolder;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.transport.model.param.ManagementWaybillOrderQuery;
 import com.sckw.transport.model.vo.execlVo.ManagementWaybillOrderExcelVO;
-import com.sckw.transport.service.KwtManagementWaybillOrderService;
+import com.sckw.transport.service.operateService.KwtManagementWaybillOrderService;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;

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

@@ -552,9 +552,7 @@ public class KwtAcceptCarriageOrderService {
      */
     private void insertSubcontractLogisticsOrderUnit(SubcontractConsignmentDTO bo, Long orderId) {
         EntCacheResDto consignentMap = remoteSystemService.queryEntTreeById(Long.parseLong(bo.getConsignCompanyId()));
-//        .setContactsId(consignentMap.get(Long.parseLong(bo.getConsignCompanyId())).getContactsId())
         EntCacheResDto checkentMap = remoteSystemService.queryEntTreeById(Long.parseLong(bo.getCheckCompanyId()));
-////.setContactsId(checkentMap.get(Long.parseLong(bo.getCheckCompanyId())).getContactsId())
         KwtLogisticsOrderUnit checkUnit = new KwtLogisticsOrderUnit()
                 .setLOrderId(orderId)
                 .setId(new IdWorker(NumberConstant.ONE).nextId())
@@ -699,7 +697,6 @@ public class KwtAcceptCarriageOrderService {
                 KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
                                 .eq(StringUtils.isNotBlank(orderDTO.getLOrderId()), KwtLogisticsOrder::getId, orderDTO.getLOrderId())
                                 .eq(StringUtils.isNotBlank(orderDTO.getLOrderNo()), KwtLogisticsOrder::getLOrderNo, orderDTO.getLOrderNo())
-                        /*.eq(KwtLogisticsOrder::getEntId, LoginUserHolder.getEntId())*/
                 );
                 if (logisticsOrder == null) {
                     result.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
@@ -985,7 +982,7 @@ public class KwtAcceptCarriageOrderService {
         /**车载计算方式*/
         Map<String, String> weightDictData = getDictData(DictTypeEnum.WEIGHT_CAR.getType());
         /**签约方式*/
-        Map<String, String> singDictData = getDictData(DictTypeEnum.SIGNING_TYPE.getType());
+//        Map<String, String> singDictData = getDictData(DictTypeEnum.SIGNING_TYPE.getType());
         /**计费方式*/
         Map<String, String> chargingDictData = getDictData(DictTypeEnum.CHARGING_TYPE.getType());
         /**结算周期*/
@@ -1042,51 +1039,6 @@ public class KwtAcceptCarriageOrderService {
             allList.addAll(voList);
         }
         return PageRes.build(pageInfo, allList);
-//        for (String lOrderId : stringList) {
-//            List<SubcontractConsignmentVO> list = logisticsOrderMapper.getSubcontractConsignmentNotPage(lOrderId);
-//            //联查数据
-//            if (CollectionUtils.isNotEmpty(list)) {
-//                for (SubcontractConsignmentVO subcontractConsignmentVO : list) {
-//                    //关联父级承运单据号
-//                    if (subcontractConsignmentVO.getPid() != null) {
-//                        KwtLogisticsOrder kwtLogisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(KwtLogisticsOrder::getId, subcontractConsignmentVO.getPid()));
-//                        if (kwtLogisticsOrder != null) {
-//                            subcontractConsignmentVO.setCarrierOrderNo(kwtLogisticsOrder.getLOrderNo());
-//                        }
-//                    }
-//                    subcontractConsignmentVO.setStatusLabel(LogisticsOrderEnum.getDestination(subcontractConsignmentVO.getStatus()));
-//                    if (subcontractConsignmentVO.getPriceType() != null) {
-//                        subcontractConsignmentVO.setPriceTypeLabel(priceDictData == null ? null : priceDictData.get(subcontractConsignmentVO.getPriceType()));
-//                    }
-//                    if (subcontractConsignmentVO.getLossUnit() != null) {
-//                        subcontractConsignmentVO.setLossUnitLabel(weightDictData == null ? null : weightDictData.get(subcontractConsignmentVO.getLossUnit()));
-//                    }
-//                    if (subcontractConsignmentVO.getGoodsPriceUnit() != null) {
-//                        subcontractConsignmentVO.setGoodsPriceUnitLabel(priceDictData == null ? null : priceDictData.get(subcontractConsignmentVO.getGoodsPriceUnit()));
-//                    }
-//                    //分包托运不需要展示签约方式
-////                subcontractConsignmentVO.setContractSigningWay(singDictData == null ? null : singDictData.get(subcontractConsignmentVO.getContractSigningWay()));
-//                    if (subcontractConsignmentVO.getBillingMode() != null) {
-//                        subcontractConsignmentVO.setBillingModeLabel(chargingDictData == null ? null : chargingDictData.get(subcontractConsignmentVO.getBillingMode()));
-//                    }
-//                    if (subcontractConsignmentVO.getSettlementCycle() != null) {
-//                        subcontractConsignmentVO.setSettlementCycleLabel(settlementDictData == null ? null : settlementDictData.get(subcontractConsignmentVO.getSettlementCycle()));
-//                    }
-//                    if (subcontractConsignmentVO.getCreateBy() != null) {
-//                        UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(Long.parseLong(subcontractConsignmentVO.getCreateBy()));
-//                        if (userCacheResDto != null) {
-//                            subcontractConsignmentVO.setCreateName(userCacheResDto.getName());
-//                        }
-//                    }
-//                    subcontractConsignmentVO.setLoadAddressDetail(subcontractConsignmentVO.getLoadCityName() + subcontractConsignmentVO.getLoadAddress());
-//                    subcontractConsignmentVO.setUnloadAddressDetail(subcontractConsignmentVO.getUnloadCityName() + subcontractConsignmentVO.getUnloadAddress());
-//                }
-//                allList.addAll(list);
-//            }
-//        }
-//        List<SubcontractConsignmentVO> returnList = allList.stream().skip((page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-//        PageResult build = PageResult.build(page, pageSize, allList.stream().count(), returnList);
-//        return HttpResult.ok(build);
     }
 
 
@@ -1187,12 +1139,10 @@ public class KwtAcceptCarriageOrderService {
             Map<String, String> dictData = commonService.getDictData(DictTypeEnum.TRUCK_TYPE.getType());
             for (DriverListVo driverListVo : list) {
                 if (!driverListVo.getCirculateId().isEmpty()) {
-//                    driverListVo.setStatus(1);
                     driverListVo.setStatusLabel(CarWaybillEnum.PENDING_ORDER.getDestination());
                 }
                 if (!ObjectUtils.isEmpty(truck)) {
-//                    driverListVo.setTransportStatus(truck.get(driverListVo.getTruckNo()) == null ? null : truck.get(driverListVo.getTruckNo()).getBusinessStatus());
-                    if (truck.get(driverListVo.getTruckNo()) != null) {
+                   if (truck.get(driverListVo.getTruckNo()) != null) {
                         driverListVo.setTransportStatus(truck.get(driverListVo.getTruckNo()) == null ? null : truck.get(driverListVo.getTruckNo()).getBusinessStatus());
                     }
                     if (driverListVo.getTransportStatus() != null) {
@@ -1200,8 +1150,7 @@ public class KwtAcceptCarriageOrderService {
                     }
                     String truckType = truck.get(driverListVo.getTruckNo()).getTruckType();
                     if (StringUtils.isNotBlank(truckType)) {
-//                        driverListVo.setCarType(truck.get(driverListVo.getTruckNo()) == null ? null : truck.get(driverListVo.getTruckNo()).getTruckType());
-                        driverListVo.setCarType(dictData.get(truckType));
+                       driverListVo.setCarType(dictData.get(truckType));
                     }
                 }
             }
@@ -1350,13 +1299,6 @@ public class KwtAcceptCarriageOrderService {
                 streamBridge.send("sckw-busSum", com.alibaba.fastjson2.JSON.toJSONString(busSum));
                 jsonObject.put("status", HttpStatus.SUCCESS_CODE);
                 jsonObject.put("message", "停止接单成功");
-
-//                KwtWaybillOrder waybillOrder = waybillOrderMapper.selectOne(new LambdaUpdateWrapper<KwtWaybillOrder>().eq(KwtWaybillOrder::getId, wOrderId));
-//                if (waybillOrder == null) {
-//                    jsonObject.put("status", HttpStatus.GLOBAL_EXCEPTION_CODE);
-//                    jsonObject.put("message", "单据不存在或者单据异常");
-//                } else {
-//                }
                 list.add(jsonObject);
             });
         }
@@ -1802,12 +1744,6 @@ public class KwtAcceptCarriageOrderService {
     public HttpResult getCancelReason(String id, Integer status) {
         Map<String, String> map = logisticsOrderMapper.getRejectReason(id, status);
         return HttpResult.ok(map);
-//        KwtLogisticsOrderTrack track = logisticsOrderTrackMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderTrack>()
-//                .eq(KwtLogisticsOrderTrack::getLOrderId, Long.parseLong(id))
-//                /**.eq(KwtLogisticsOrderTrack::getStatus, LogisticsOrderEnum.SEND_BACK.getCode())*/
-//                .eq(KwtLogisticsOrderTrack::getStatus,status)
-//        );
-//        return HttpResult.ok(track == null ? null : track.getRemark());
     }
 
     /**
@@ -2065,8 +2001,6 @@ public class KwtAcceptCarriageOrderService {
                 , MessageEnum.NEW_LOGISTICS_ORDER, MessageEnum.NEW_CARRIAGE_ORDER
                 , "1"
         );
-
-//        System.out.println("承运订单新建订单-消息列表推送 end ");
         return HttpResult.ok();
     }
 
@@ -2456,7 +2390,7 @@ public class KwtAcceptCarriageOrderService {
         /**计量单位*/
         Map<String, String> unitTypeDictData = getDictData(DictTypeEnum.UNIT_TYPE.getType());
         /**运价方式*/
-        Map<String, String> priceDictData = getDictData(DictTypeEnum.PRICE_TYPE.getType());
+//        Map<String, String> priceDictData = getDictData(DictTypeEnum.PRICE_TYPE.getType());
         /**计费方式*/
         Map<String, String> chargingDictData = getDictData(DictTypeEnum.CHARGING_TYPE.getType());
         /**结算周期*/
@@ -2527,7 +2461,6 @@ public class KwtAcceptCarriageOrderService {
                         }
                     }
                 } catch (BusinessException e) {
-//                    throw new RuntimeException(e);
                     log.info("查询失败:{},信息:{}", vo.getTOrderId(), e.getMessage(), e);
                 }
             }
@@ -2590,14 +2523,6 @@ public class KwtAcceptCarriageOrderService {
      * @return
      */
     public HttpResult statisticsCarriage(AcceptCarriageOrderQuery query) {
-//        Long entId = LoginUserHolder.getEntId();
-//        Long queryEntId = 0L;
-//        Map<Long, EntCacheResDto> entMap = remoteSystemService.queryEntTreeByIds(Collections.singletonList(entId));
-//        if (entMap == null) {
-//            queryEntId = entId;
-//        } else {
-//            queryEntId = entMap.get(entId).getId();
-//        }
         String type = "2";
         HttpResult httpResult = statisticsAcceptCarriage(query, type);
         return httpResult;
@@ -2704,7 +2629,7 @@ public class KwtAcceptCarriageOrderService {
         /**结算周期*/
         Map<String, String> settlementDictData = getDictData(DictTypeEnum.SETTLEMENT_CYCLE.getType());
         /**签约方式*/
-        Map<String, String> signingWay = getDictData(DictTypeEnum.SIGNING_TYPE.getType());
+//        Map<String, String> signingWay = getDictData(DictTypeEnum.SIGNING_TYPE.getType());
         /**合理损耗单位*/
         Map<String, String> taxRate = getDictData(DictTypeEnum.TAX_RATE_TYPE.getType());
         /**运价方式*/
@@ -2738,24 +2663,6 @@ public class KwtAcceptCarriageOrderService {
             String unitLabel = unitTypeDictData == null ? vo.getUnit() : (unitTypeDictData.get(vo.getUnit()) == null ? vo.getUnit() : unitTypeDictData.get(vo.getUnit()));
             carriageOrderExcelVo.setLoadAmount(carriageOrderExcelVo.getLoadAmount() + unitLabel);
             carriageOrderExcelVo.setUnloadAmount(carriageOrderExcelVo.getUnloadAmount() + unitLabel);
-
-//            if (vo.getTOrderId() != null) {
-//                try {
-//                    OrderDetailRes orderDetailRes = tradeOrderInfoService.getOrderDetailById(Long.valueOf(vo.getTOrderId()));
-//                    if (orderDetailRes != null) {
-//                        List<UnitInfoDetailRes> unitInfo = orderDetailRes.getUnitInfo();
-//                        for (UnitInfoDetailRes detailRes : unitInfo) {
-//                            if (String.valueOf(NumberConstant.ONE).equals(detailRes.getUnitType())) {
-//                                carriageOrderExcelVo.setShipmentsUnit(detailRes.getFirmName());
-//                            } else {
-//                                carriageOrderExcelVo.setReceiveGoodsUnit(detailRes.getFirmName());
-//                            }
-//                        }
-//                    }
-//                } catch (Exception e) {
-//                    log.error("tradeOrderInfoService.getOrderDetailById error id:{}.errorMessage:{}",vo.getTOrderId(),e.getMessage(),e);
-//                }
-//            }
             BigDecimal subtract = vo.getCarryingCapacity().subtract(vo.getSubcontractAmount()).subtract(vo.getEntrustAmount());
             DecimalFormat df = new DecimalFormat("0.00");
             carriageOrderExcelVo.setWaitDistributionAmount(subtract == null ? null : df.format(subtract));

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

@@ -421,54 +421,6 @@ public class KwtCommonService {
         streamBridge.send("sckw-message", JSON.toJSONString(message));
     }
 
-
-    /**
-     * 发起物流托运-[贸易订单物流托运确认/承运订单分包托运确认]
-     *
-     * @param consignUnit  托运单位
-     * @param carriageUnit 承运单位
-     * @param orderNo      单据号
-     * @param createBy     创建人
-     * @param entId        创建数据的企业id
-     */
-    public void initIatingLogisticsConsignment(KwtLogisticsOrderUnit consignUnit, KwtLogisticsOrderUnit carriageUnit, String orderNo, Long createBy, Long entId) {
-        boolean flag = false;
-        if (createBy.equals(consignUnit.getContactsId()) || createBy.equals(carriageUnit.getContactsId())) {
-            flag = true;
-        }
-        Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN);
-        map.put("orderNo", orderNo);
-        if (flag && createBy.equals(consignUnit.getContactsId())) {
-            sendMessageLogistics(consignUnit, carriageUnit, map);
-        } else if (flag && createBy.equals(carriageUnit.getContactsId())) {
-            sendMessageLogistics(consignUnit, carriageUnit, map);
-        } else {
-            UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(createBy);
-            //给订单创建人发消息
-            List<UserInfo> userInfos = new ArrayList<>();
-            UserInfo createUser = new UserInfo();
-            createUser.setUserId(createBy).setEntId(entId);
-            userInfos.add(createUser);
-            map.put("companyName", userCacheResDto == null ? null : userCacheResDto.getEntInfo().getFirmName());
-            SckwMessage msg = new SckwMessage();
-            msg.setRequestId(UUIDUtils.get32UUID())
-                    .setMessageEnum(MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT)
-                    .setParams(map)
-                    .setMsgUrls(new HashMap<>(NumberConstant.SIXTEEN) {
-                        {
-                            put("pc", messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl());
-                            put("app", messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl());
-                        }
-                    })
-                    .setUserInfos(userInfos)
-                    .setCreateBy(LoginUserHolder.getUserId());
-            log.info("发起物流托运-[贸易订单物流托运确认/承运订单分包托运确认]-创建人：{}", JSON.toJSONString(msg));
-            streamBridge.send("sckw-message", JSON.toJSONString(msg));
-//            sendMessageLogistics(checkUnit, carriageUnit, map);
-        }
-
-    }
-
     /**
      * 给承运和托运双方发送消息
      * @param checkUnit 托运单位
@@ -543,133 +495,7 @@ public class KwtCommonService {
     }
 
     /**
-     * 托运订单-新建订单
-     * 承运订单-新建订单
-     *
-     * @param checkUnit                托运单位
-     * @param map                      请求参数
-     * @param messageEnum              消息枚举
-     * @param consignLogisticsOrderUrl 页面地址url
-     */
-    private void sendMessageNewLogisticsOrder(KwtLogisticsOrderUnit checkUnit, Map<String, Object> map, MessageEnum messageEnum, String consignLogisticsOrderUrl) {
-        //给业务联系人发消息[承运方]
-        List<UserInfo> userInfoList = new ArrayList<>();
-        UserInfo userInfo = new UserInfo();
-        userInfo.setUserId(checkUnit.getContactsId()).setEntId(checkUnit.getTopEntId());
-        userInfoList.add(userInfo);
-        map.put("companyName", checkUnit.getFirmName());
-        SckwMessage sckwMessage = new SckwMessage();
-        sckwMessage.setRequestId(UUIDUtils.get32UUID())
-                .setMessageEnum(messageEnum)
-                .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));
-
-    }
-
-    /**
-     * 撤销托运
-     *
-     * @param consignUnit         托运订单
-     * @param carriageUnit        承运订单
-     * @param orderNo             物流订单
-     * @param createBy            创建人
-     * @param entId               当前单据企业id
-     * @param consignMessageEnum  托运单位使用的消息枚举
-     * @param carriageMessageEnum 承运单位使用的消息枚举
-     */
-    public void cancelLogisticsConsignment(KwtLogisticsOrderUnit consignUnit, KwtLogisticsOrderUnit carriageUnit, String orderNo, Long createBy, Long entId,
-                                           MessageEnum consignMessageEnum, MessageEnum carriageMessageEnum) {
-        boolean flag = false;
-        if (createBy.equals(consignUnit.getContactsId()) || createBy.equals(carriageUnit.getContactsId())) {
-            flag = true;
-        }
-        Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN);
-        map.put("orderNo", orderNo);
-        if (flag && createBy.equals(consignUnit.getContactsId())) {
-            sendMessagePublicLogistics(consignUnit, carriageUnit, map, consignMessageEnum);
-        } else if (flag && createBy.equals(carriageUnit.getContactsId())) {
-            sendMessagePublicLogistics(consignUnit, carriageUnit, map, carriageMessageEnum);
-        } else {
-            UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(createBy);
-            //给订单创建人发消息
-            List<UserInfo> userInfos = new ArrayList<>();
-            UserInfo createUser = new UserInfo();
-            createUser.setUserId(createBy).setEntId(entId);
-            userInfos.add(createUser);
-            map.put("companyName", userCacheResDto == null ? null : userCacheResDto.getEntInfo().getFirmName());
-            SckwMessage msg = new SckwMessage();
-            msg.setRequestId(UUIDUtils.get32UUID())
-                    .setMessageEnum(consignMessageEnum)
-                    .setParams(map)
-                    .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
-                        put("pc", consignLogisticsOrderUrl);
-                        put("app", carriageLogisticsOrderUrl);
-                    }})
-                    .setUserInfos(userInfos)
-                    .setCreateBy(LoginUserHolder.getUserId());
-            log.info(MessageEnum.getDesc(consignMessageEnum) + "-创建人：{}", JSON.toJSONString(msg));
-            streamBridge.send("sckw-message", JSON.toJSONString(msg));
-            sendMessagePublicLogistics(consignUnit, carriageUnit, map, consignMessageEnum);
-        }
-    }
-
-
-    /**
-     * 公共推送消息处理
-     *
-     * @param consignUnit         托运订单
-     * @param carriageUnit        承运订单
-     * @param orderNo             物流订单
-     * @param createBy            创建人
-     * @param entId               当前单据企业id
-     * @param consignMessageEnum  托运单位使用的消息枚举
-     * @param carriageMessageEnum 承运单位使用的消息枚举
-     */
-    public void publicLogisticsConsignmentPushMessage(KwtLogisticsOrderUnit consignUnit, KwtLogisticsOrderUnit carriageUnit, String orderNo, Long createBy, Long entId,
-                                                      MessageEnum consignMessageEnum, MessageEnum carriageMessageEnum) {
-        boolean flag = false;
-        if (createBy.equals(consignUnit.getContactsId()) || createBy.equals(carriageUnit.getContactsId())) {
-            flag = true;
-        }
-        Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN);
-        map.put("orderNo", orderNo);
-        if (flag && createBy.equals(consignUnit.getContactsId())) {
-            sendMessagePublicLogistics(consignUnit, carriageUnit, map, consignMessageEnum);
-        } else if (flag && createBy.equals(carriageUnit.getContactsId())) {
-            sendMessagePublicLogistics(consignUnit, carriageUnit, map, carriageMessageEnum);
-        } else {
-            UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(createBy);
-            //给订单创建人发消息
-            List<UserInfo> userInfos = new ArrayList<>();
-            UserInfo createUser = new UserInfo();
-            createUser.setUserId(createBy).setEntId(entId);
-            userInfos.add(createUser);
-            map.put("companyName", userCacheResDto == null ? null : userCacheResDto.getEntInfo().getFirmName());
-            SckwMessage msg = new SckwMessage();
-            msg.setRequestId(UUIDUtils.get32UUID())
-                    .setMessageEnum(consignMessageEnum)
-                    .setParams(map)
-                    .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
-                        put("pc", consignLogisticsOrderUrl);
-                        put("app", carriageLogisticsOrderUrl);
-                    }})
-                    .setUserInfos(userInfos)
-                    .setCreateBy(LoginUserHolder.getUserId());
-            log.info(MessageEnum.getDesc(consignMessageEnum) + "-创建人：{}", JSON.toJSONString(msg));
-            streamBridge.send("sckw-message", JSON.toJSONString(msg));
-//            sendMessagePublicLogistics(consignUnit, carriageUnit, map,consignMessageEnum);
-        }
-    }
-
-    /**
-     * 脱水消息
+     * 推送消息
      * @param consignUnit 托运单位
      * @param carriageUnit 承运单位
      * @param map          消息参数
@@ -716,57 +542,7 @@ public class KwtCommonService {
         streamBridge.send("sckw-message", JSON.toJSONString(message));
     }
 
-    /**
-     * 推送消息
-     * @param consignUnit                     托运单位
-     * @param carriageUnit                    承运单位
-     * @param orderNo                         单据号
-     * @param createBy                        创建人
-     * @param entId                           企业id
-     * @param consignMessageEnum              托运消息体
-     * @param carriageMessageEnum             承运消息体
-     * @param pcConsignLogisticsAddOrderUrl   pc托运url
-     * @param pcCarriageLogisticsAddOrderUrl  pc承运url
-     * @param appConsignLogisticsAddOrderUrl  app托运url
-     * @param appCarriageLogisticsAddOrderUrl app承运url
-     */
-    public void pushMessageByUrl(KwtLogisticsOrderUnit consignUnit, KwtLogisticsOrderUnit carriageUnit, String orderNo, Long createBy, Long entId,
-                                 MessageEnum consignMessageEnum, MessageEnum carriageMessageEnum,
-                                 String pcConsignLogisticsAddOrderUrl, String pcCarriageLogisticsAddOrderUrl,
-                                 String appConsignLogisticsAddOrderUrl, String appCarriageLogisticsAddOrderUrl) {
-        boolean flag = false;
-        if (createBy.equals(consignUnit.getContactsId()) || createBy.equals(carriageUnit.getContactsId())) {
-            flag = true;
-        }
-        Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN);
-        map.put("orderNo", orderNo);
-        if (flag && createBy.equals(consignUnit.getContactsId())) {
-            sendPushMessageByUrlLogistics(consignUnit, carriageUnit, map, consignMessageEnum, carriageMessageEnum);
-        } else if (flag && createBy.equals(carriageUnit.getContactsId())) {
-            sendPushMessageByUrlLogistics(consignUnit, carriageUnit, map, consignMessageEnum, carriageMessageEnum);
-        } else {
-            UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(createBy);
-            //给订单创建人发消息
-            List<UserInfo> userInfos = new ArrayList<>();
-            UserInfo createUser = new UserInfo();
-            createUser.setUserId(createBy).setEntId(entId);
-            userInfos.add(createUser);
-            map.put("companyName", userCacheResDto == null ? null : userCacheResDto.getEntInfo().getFirmName());
-            SckwMessage msg = new SckwMessage();
-            msg.setRequestId(UUIDUtils.get32UUID())
-                    .setMessageEnum(carriageMessageEnum)
-                    .setParams(map)
-                    .setMsgUrls(new HashMap<>(NumberConstant.SIXTEEN) {{
-                        put("pc", pcCarriageLogisticsAddOrderUrl);
-                        put("app", appCarriageLogisticsAddOrderUrl);
-                    }})
-                    .setUserInfos(userInfos)
-                    .setCreateBy(LoginUserHolder.getUserId());
-            log.info(MessageEnum.getDesc(consignMessageEnum) + "-创建人：{}", JSON.toJSONString(msg));
-            streamBridge.send("sckw-message", JSON.toJSONString(msg));
-            sendPushMessageByUrlLogistics(consignUnit, carriageUnit, map, consignMessageEnum, carriageMessageEnum);
-        }
-    }
+
 
     /**
      * 推送消息

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

@@ -353,16 +353,14 @@ public class KwtConsignOrderService {
         for (String id : list) {
             KwtLogisticsOrder order = kwtLogisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
                             .eq(StringUtils.isNotBlank(id), KwtLogisticsOrder::getId, Long.parseLong(id))
-                    /**      .eq(StringUtils.isNotBlank(orderDto.getOrderNo()), KwtLogisticsOrder::getLOrderNo, orderDto.getOrderNo())*/
-                    /**.eq(KwtLogisticsOrder::getEntId, LoginUserHolder.getEntId())*/);
+                    );
             if (ObjectUtils.isEmpty(order)) {
                 continue;
             }
             List<KwtWaybillOrder> kwtWaybillOrders = kwtWaybillOrderMapper.selectList(new LambdaQueryWrapper<KwtWaybillOrder>()
                             .eq(StringUtils.isNotBlank(order.getId()), KwtWaybillOrder::getLOrderId, order.getId())
                             .orderByDesc(KwtWaybillOrder::getCreateTime)
-                    /**.last("limit " + (orderDto.getPage() - 1) + " , " + orderDto.getPageSize()*/);
-            /**.eq(KwtWaybillOrder::getEntId, LoginUserHolder.getEntId()));*/
+                    );
             if (CollectionUtils.isNotEmpty(kwtWaybillOrders)) {
                 for (KwtWaybillOrder kwtWaybillOrder : kwtWaybillOrders) {
                     CarWaybillVO carWaybillVo = new CarWaybillVO();
@@ -384,9 +382,9 @@ public class KwtConsignOrderService {
                      */
                     BigDecimal loadAmount = kwtWaybillOrder.getLoadAmount() == null ? NumberConstant.ZERO_TWO : kwtWaybillOrder.getLoadAmount();
                     //已委托量
-                    BigDecimal entrustAmount = kwtWaybillOrder.getEntrustAmount() == null ? NumberConstant.ZERO_TWO : kwtWaybillOrder.getEntrustAmount();
+//                    BigDecimal entrustAmount = kwtWaybillOrder.getEntrustAmount() == null ? NumberConstant.ZERO_TWO : kwtWaybillOrder.getEntrustAmount();
                     //合理损耗值
-                    BigDecimal multiply = loadAmount.multiply(loss.divide(BigDecimal.valueOf(1000L)));
+//                    BigDecimal multiply = loadAmount.multiply(loss.divide(BigDecimal.valueOf(1000L)));
                     //亏吨量
                     BigDecimal defectiveWeigh = kwtWaybillOrder.getDeficitAmount() == null ? NumberConstant.ZERO_TWO : kwtWaybillOrder.getDeficitAmount();
                     //扣亏量/吨
@@ -627,28 +625,20 @@ public class KwtConsignOrderService {
         }
         List<CarWaybillVO> returnList = new ArrayList<>();
         list = list.stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList());
-//        kwtLogisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>()
-//                .eq(KwtLogisticsOrder::getDelFlag,NumberConstant.ZERO)
-//                .in(KwtLogisticsOrder::getId,list)
-//                .orderByDesc(KwtLogisticsOrder::getId)
-//        );
         /**计量单位*/
         Map<String, String> unitDictData = commonService.getDictData(DictTypeEnum.UNIT_TYPE.getType());
         /**趟次数据*/
         for (Long id : list) {
             KwtLogisticsOrder order = kwtLogisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
                             .eq(StringUtils.isNotBlank(id), KwtLogisticsOrder::getId, id)
-                    /**      .eq(StringUtils.isNotBlank(orderDto.getOrderNo()), KwtLogisticsOrder::getLOrderNo, orderDto.getOrderNo())*/
-                    /**.eq(KwtLogisticsOrder::getEntId, LoginUserHolder.getEntId())*/);
+                   );
             if (ObjectUtils.isEmpty(order)) {
                 continue;
             }
             List<KwtWaybillOrder> kwtWaybillOrders = kwtWaybillOrderMapper.selectList(new LambdaQueryWrapper<KwtWaybillOrder>()
                             .eq(StringUtils.isNotBlank(order.getId()), KwtWaybillOrder::getLOrderId, order.getId())
-                            /**.eq(KwtWaybillOrder::getType,NumberConstant.ONE)*/
                             .orderByDesc(KwtWaybillOrder::getCreateTime)
-                    /**.last("limit " + (orderDto.getPage() - 1) + " , " + orderDto.getPageSize()*/);
-            /**.eq(KwtWaybillOrder::getEntId, LoginUserHolder.getEntId()));*/
+                    );
             if (CollectionUtils.isNotEmpty(kwtWaybillOrders)) {
                 for (KwtWaybillOrder kwtWaybillOrder : kwtWaybillOrders) {
                     CarWaybillVO carWaybillVo = new CarWaybillVO();
@@ -670,9 +660,9 @@ public class KwtConsignOrderService {
                      */
                     BigDecimal loadAmount = kwtWaybillOrder.getLoadAmount() == null ? NumberConstant.ZERO_TWO : kwtWaybillOrder.getLoadAmount();
                     //已委托量
-                    BigDecimal entrustAmount = kwtWaybillOrder.getEntrustAmount() == null ? NumberConstant.ZERO_TWO : kwtWaybillOrder.getEntrustAmount();
+//                    BigDecimal entrustAmount = kwtWaybillOrder.getEntrustAmount() == null ? NumberConstant.ZERO_TWO : kwtWaybillOrder.getEntrustAmount();
                     //合理损耗值
-                    BigDecimal multiply = loadAmount.multiply(loss.divide(BigDecimal.valueOf(1000L)));
+//                    BigDecimal multiply = loadAmount.multiply(loss.divide(BigDecimal.valueOf(1000L)));
                     //亏吨量
                     BigDecimal defectiveWeigh = kwtWaybillOrder.getDeficitAmount() == null ? NumberConstant.ZERO_TWO : kwtWaybillOrder.getDeficitAmount();
                     //扣亏量/吨
@@ -821,12 +811,6 @@ public class KwtConsignOrderService {
     }
 
     private HttpResult getAcceptCarListByOrder(OrderDTO orderDto) {
-//        KwtLogisticsOrder logisticsOrder = kwtLogisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
-//                .eq(KwtLogisticsOrder::getId, orderDto.getId()));
-//        if (logisticsOrder == null) {
-////            log.error("托运订单获取车辆信息 error id:{},请求参数:{}", orderDto.getId(), JSONObject.toJSONString(orderDto));
-//            HttpResult.error("物流订单不存在");
-//        }
         /**
          * 除了已作废的运单对应的车辆不查出（已作废：拒绝接单、拒绝出车、单趟撤回），其他状态的运单对应的车辆带出去重
          * */
@@ -1734,11 +1718,6 @@ public class KwtConsignOrderService {
         if (CollectionUtils.isEmpty(list)) {
             return HttpResult.ok(res);
         }
-//        List<KwtLogisticsOrderUnit> unitInfo = kwtLogisticsOrderUnitMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderUnit>()
-//                .eq(KwtLogisticsOrderUnit::getEntId, entId));
-//        if (CollectionUtils.isEmpty(unitInfo)) {
-//            return HttpResult.ok(res);
-//        }
         Set<Long> lOrderIds = list.stream().map(KwtLogisticsOrderUnit::getLOrderId).distinct().collect(Collectors.toSet());
         //订单ids获取地址信息
         List<KwtLogisticsOrderAddress> addressList = kwtLogisticsOrderAddressMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
@@ -1836,26 +1815,6 @@ public class KwtConsignOrderService {
             vo.setUnloadCityName(vo.getUnloadName());
             vo.setPriceLabel(vo.getPriceType() == null ? null : priceDictData.get(vo.getPriceType()));
             vo.setUnitLabel(unitTypeDictData == null ? vo.getUnit() : (unitTypeDictData.get(vo.getUnit()) == null ? vo.getUnit() : unitTypeDictData.get(vo.getUnit())));
-//            if (vo.getTOrderId() != null) {
-//                try {
-//                    OrderDetailRes orderDetailRes = tradeOrderInfoService.getOrderDetailById(Long.valueOf(vo.getTOrderId()));
-//                    if (orderDetailRes != null) {
-//                        List<UnitInfoDetailRes> unitInfo = orderDetailRes.getUnitInfo();
-//                        for (UnitInfoDetailRes detailRes : unitInfo) {
-//                            if (String.valueOf(NumberConstant.ONE).equals(detailRes.getUnitType())) {
-//                                vo.setShipmentsUnitEntId(String.valueOf(detailRes.getEntId()));
-//                                vo.setShipmentsUnit(detailRes.getFirmName());
-//                            } else {
-//                                vo.setReceiveGoodsUnitEntId(String.valueOf(detailRes.getEntId()));
-//                                vo.setReceiveGoodsUnit(detailRes.getFirmName());
-//                            }
-//                        }
-//                    }
-//                } catch (Exception e) {
-////                    throw new RuntimeException(e);
-//                    log.info(vo.getTOrderId() + "查询错误:{}", e.getMessage(), e);
-//                }
-//            }
             vo.setWaitDistributionAmount(vo.getCarryingCapacity().subtract(vo.getSubcontractAmount()).subtract(vo.getEntrustAmount()));
             String tOrderId = vo.getTOrderId();
             if (StringUtils.isNotBlank(tOrderId)) {
@@ -2027,7 +1986,7 @@ public class KwtConsignOrderService {
         /**结算周期*/
         Map<String, String> settlementDictData = commonService.getDictData(DictTypeEnum.SETTLEMENT_CYCLE.getType());
         /**签约方式*/
-        Map<String, String> signingWay = commonService.getDictData(DictTypeEnum.SIGNING_TYPE.getType());
+//        Map<String, String> signingWay = commonService.getDictData(DictTypeEnum.SIGNING_TYPE.getType());
         /**合理损耗单位*/
         Map<String, String> taxRate = commonService.getDictData(DictTypeEnum.TAX_RATE_TYPE.getType());
         /**运价方式*/
@@ -2062,19 +2021,6 @@ public class KwtConsignOrderService {
             consignOrderExcelVo.setLoadAmount(consignOrderExcelVo.getLoadAmount() + unitLabel);
             consignOrderExcelVo.setUnloadAmount(consignOrderExcelVo.getUnloadAmount() + unitLabel);
 
-//            if (vo.getTOrderId() != null) {
-//                OrderDetailRes orderDetailRes = tradeOrderInfoService.getOrderDetailById(Long.valueOf(vo.getTOrderId()));
-//                if (orderDetailRes != null) {
-//                    List<UnitInfoDetailRes> unitInfo = orderDetailRes.getUnitInfo();
-//                    for (UnitInfoDetailRes detailRes : unitInfo) {
-//                        if (String.valueOf(NumberConstant.ONE).equals(detailRes.getUnitType())) {
-//                            consignOrderExcelVo.setShipmentsUnit(detailRes.getFirmName());
-//                        } else {
-//                            consignOrderExcelVo.setReceiveGoodsUnit(detailRes.getFirmName());
-//                        }
-//                    }
-//                }
-//            }
             BigDecimal subtract = vo.getCarryingCapacity().subtract(vo.getSubcontractAmount()).subtract(vo.getEntrustAmount());
             DecimalFormat df = new DecimalFormat("0.00");
             consignOrderExcelVo.setWaitDistributionAmount(subtract == null ? null : df.format(subtract));

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

@@ -1027,47 +1027,8 @@ public class KwtLogisticsConsignmentService {
         List<OrderCarDTO> returnList = new ArrayList<>();
         returnList.addAll(orderCarList);
         return PageRes.build(info, returnList);
-//        stringList = stringList.stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList());
-//        for (String id : stringList) {
-//            List<OrderCarDTO> list = waybillOrderMapper.selectWaybillOrderCarListNotPage(id);
-//            List<String> collect = list.stream().map(OrderCarDTO::getTruckNo).distinct().collect(Collectors.toList());
-//            if (CollectionUtils.isNotEmpty(collect)) {
-//                Map<String, RTruckVo> truck = remoteFleetService.findTruck(collect);
-//                for (OrderCarDTO orderCarDTO : list) {
-//                    orderCarDTO.setStatusLabel(CarWaybillEnum.getName(orderCarDTO.getStatus()));
-//                    orderCarDTO.setLoadAmount(truck.get(orderCarDTO.getTruckNo()) == null ?
-//                            null : (truck.get(orderCarDTO.getTruckNo()).getActualWeight() == null ?
-//                            null : (String.valueOf(truck.get(orderCarDTO.getTruckNo()).getActualWeight()))));
-//                }
-//            }
-//            if (CollectionUtils.isNotEmpty(list)) {
-//                returnList.addAll(list);
-//            }
-//        }
-//        List<OrderCarDTO> 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);
     }
 
-    //    /**
-//     * 销售订单获取车辆信息
-//     *
-//     * @param id
-//     * @param page
-//     * @param pageSize
-//     * @return
-//     */
-//    public HttpResult sellLogisticsCar(String id, Integer page, Integer pageSize) {
-//        Long count = getLogisticsCarDataCount(id);
-//        Integer newPage = (page - 1) * pageSize;
-//        List<OrderCarDTO> list = getLogisticsCarData(id, newPage, pageSize);
-//        PageResult build = PageResult.build(page, pageSize, count, list);
-//        return HttpResult.ok(build);
-//    }
-
     /**
      * 销售订单-车辆列表-销售订单id
      *
@@ -1116,10 +1077,6 @@ public class KwtLogisticsConsignmentService {
         List<String> stringList = list.stream().map(OrderCarDTO::getTruckNo).collect(Collectors.toList());
         Map<String, RTruckVo> truck = remoteFleetService.findTruck(stringList);
         for (OrderCarDTO orderCarDTO : list) {
-//            orderCarDTO.setDriverId(String.valueOf(orderCarDTO.getDriverId()));
-//            orderCarDTO.setDriverName(orderCarDTO.getDriverName());
-//            orderCarDTO.setDriverPhone(orderCarDTO.getDriverPhone());
-//            orderCarDTO.setDriverCard(orderCarDTO.getDriverCard());
             orderCarDTO.setLoadAmount(truck.get(orderCarDTO.getTruckNo()) == null ?
                     null : (truck.get(orderCarDTO.getTruckNo()).getActualWeight() == null ?
                     null : (String.valueOf(truck.get(orderCarDTO.getTruckNo()).getActualWeight()))));
@@ -1387,13 +1344,9 @@ public class KwtLogisticsConsignmentService {
             try {
                 //1采购 2销售
                 if (String.valueOf(NumberConstant.ONE).equals(type)) {
-                    log.info("采购订单-托运订单列表-完结订单 处理开始 seata xid:{}", RootContext.getXID());
                     purchaseOrderFinish(orderFinishDTO);
-                    log.info("采购订单-托运订单列表-完结订单 处理结束 seata xid:{}", RootContext.getXID());
                 } else if (String.valueOf(NumberConstant.TWO).equals(type)) {
-                    log.info("销售订单-托运订单列表-完结订单 处理开始 seata xid:{}", RootContext.getXID());
                     sellOrderFinish(orderFinishDTO);
-                    log.info("销售订单-托运订单列表-完结订单 处理结束 seata xid:{}", RootContext.getXID());
                 } else {
                     throw new RuntimeException("完结订单-单据类型异常!");
                 }

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

@@ -373,7 +373,7 @@ public class KwtLogisticsOrderGoodsService {
      */
     public List<GoodsLoadingParam> goodsLoadingParams(KwtLogisticsOrder logisticsOrder, boolean operator) {
         List<GoodsLoadingParam> loadingParams = new ArrayList<>();
-        //住单位
+        //主单位
         BigDecimal amount = logisticsOrder.getAmount();
         loadingParams.add(new GoodsLoadingParam(logisticsOrder.getUnit(), operator ? amount : amount.negate(), logisticsOrder.getTotalLoadAmount()));
 

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

@@ -153,7 +153,7 @@ public class KwtTransportCommonService {
         KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
                         .eq(KwtLogisticsOrder::getId, dto.getId())
                         .eq(StringUtils.isNotBlank(dto.getDocumentNo()), KwtLogisticsOrder::getLOrderNo, dto.getDocumentNo())
-                /**.eq(KwtLogisticsOrder::getEntId, LoginUserHolder.getEntId())*/);
+                );
         if (logisticsOrder == null) {
             log.info("查无单据:{}", JSONObject.toJSONString(dto));
             throw new RuntimeException("查无单据");
@@ -361,8 +361,7 @@ public class KwtTransportCommonService {
             try {
                 KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
                                 .eq(KwtLogisticsOrder::getId, orderDto.getId())
-                        /* .eq(KwtLogisticsOrder::getLOrderNo, orderDto.getOrderNo())*/
-                        /**.eq(KwtLogisticsOrder::getEntId, LoginUserHolder.getEntId())*/);
+                );
                 if (logisticsOrder == null) {
                     result.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
                     result.setMsg("单据不存在");
@@ -650,7 +649,7 @@ public class KwtTransportCommonService {
                 //亏吨量
                 BigDecimal defectiveWeighNumber = loadAmount.subtract(unloadAmount);
                 //合理损耗值
-                BigDecimal lossAmount = loadAmount.multiply(logisticsOrderDTO.getLoss() == null ? NumberConstant.ZERO_TWO : logisticsOrderDTO.getLoss());
+//                BigDecimal lossAmount = loadAmount.multiply(logisticsOrderDTO.getLoss() == null ? NumberConstant.ZERO_TWO : logisticsOrderDTO.getLoss());
                 //扣亏量
 //                BigDecimal deductWeighNumber = defectiveWeighNumber.subtract(lossAmount);
 //                if (deductWeighNumber.compareTo(new BigDecimal("0")) < 0) {

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

@@ -1,4 +1,4 @@
-package com.sckw.transport.service;
+package com.sckw.transport.service.operateService;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
@@ -36,6 +36,7 @@ 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;

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

@@ -1,4 +1,4 @@
-package com.sckw.transport.service;
+package com.sckw.transport.service.operateService;
 
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.model.constant.Global;
@@ -17,6 +17,8 @@ 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;

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

@@ -2359,7 +2359,9 @@
             tab.delFlag = 0
             AND ((
                 tab.createType = 1
-            and tab.entId = #{entId}
+            <if test="entId != null">
+                and tab.entId = #{entId}
+            </if>
             <if test="userIds != null and userIds.size() > 0">
                 AND tab.createBy IN
                 <foreach collection="userIds" open="(" close=")" item="item" separator=",">