Merge remote-tracking branch 'origin/dev' into dev

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

@@ -1,21 +1,10 @@
 package com.sckw.contract.service;
 
-import java.io.*;
-import java.net.URL;
-import java.util.Date;
-
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sckw.contract.dao.KwcContractLogisticsMapper;
 import com.sckw.contract.dubbo.RemoteContractServiceImpl;
-import com.sckw.contract.model.dto.req.EsignGetFlowReqDto;
 import com.sckw.contract.model.dto.req.QueryListReqDto;
 import com.sckw.contract.model.dto.res.QueryListResDto;
 import com.sckw.contract.model.entity.KwcContractLogistics;
@@ -38,7 +27,6 @@ import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.excel.utils.EasyExcelUtil;
 import com.sckw.product.api.dubbo.GoodsInfoService;
 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 lombok.extern.slf4j.Slf4j;
@@ -47,6 +35,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
 /**
  * @author PC
  * @description 针对表【kwc_contract_logistics(物流合同（承运合同/托运合同）)】的数据库操作Service实现
@@ -242,7 +235,7 @@ public class KwcContractLogisticsService {
             logisticsBaseInfoResVo.setContractCode(kwcContractLogistics.getContractNo());
             logisticsBaseInfoResVo.setContractName(kwcContractLogistics.getName());
             logisticsBaseInfoResVo.setEndTime(Objects.isNull(kwcContractLogistics.getEndTime()) ? Global.EMPTY_STRING : DateUtils.format(kwcContractLogistics.getEndTime()));
-            logisticsBaseInfoResVo.setSigningWayName(DictEnum.getLabel(DictTypeEnum.SIGNING_WAY.getType(), String.valueOf(kwcContractLogistics.getSigningWay())));
+            logisticsBaseInfoResVo.setSigningWayName(DictEnum.getLabel(DictTypeEnum.SIGNING_TYPE.getType(), String.valueOf(kwcContractLogistics.getSigningWay())));
             logisticsBaseInfoResVo.setSigningWay(StringUtils.objectStr(kwcContractLogistics.getSigningWay()));
             logisticsBaseInfoResVo.setStartTime(kwcContractLogistics.getStartTime());
             logisticsBaseInfoResVo.setAmount(kwcContractLogistics.getAmount());

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

@@ -57,7 +57,7 @@ public class KwTransportController {
         try {
             httpResult = acceptCarriageService.acceptCarriageOrderList(query,"2");
         } catch (Exception e) {
-            log.error("托运订单查询失败:{}", e.getMessage(), e);
+            log.error("承运订单首页条件查询 查询失败:{}", e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
         }
         return httpResult;

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

@@ -17,6 +17,7 @@ import com.sckw.report.service.param.AcceptCarriageOrderQuery;
 import com.sckw.report.service.vo.AcceptCarriageOrderExcelVo;
 import com.sckw.report.service.vo.AcceptCarriageOrderVo;
 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 lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -60,6 +61,7 @@ public class KwAcceptCarriageService {
      * @return
      */
     public HttpResult acceptCarriageOrderList(AcceptCarriageOrderQuery query, String unitType) {
+        Query query1 = new Query();
         //模糊匹配
         //根据条件查询所有并排序，且分页
         //设置模糊查询匹配规则  忽略大小写
@@ -72,10 +74,24 @@ public class KwAcceptCarriageService {
 //        } else {
 //            criteria.and("carrierEntId").is(LoginUserHolder.getEntId());
 //        }
-        if (unitType.equals(NumberConstant.ONE)) {
-            criteria.and("checkTopEntId").is(LoginUserHolder.getEntId());
+        List<Long> entIds = new ArrayList<>();
+        entIds.add(LoginUserHolder.getEntId());
+        Long entId = LoginUserHolder.getEntId();
+//        Map<Long, EntCacheResDto> entMap = remoteSystemService.queryEntTreeByIds(entIds);
+        if (unitType.equals(String.valueOf(NumberConstant.ONE))) {
+            //托运
+//            criteria.and("checkTopEntId").is(entMap.get(LoginUserHolder.getEntId()).getId());
+            criteria.and("checkTopEntId").is(entId);
+//            criteria.orOperator(
+//                    Criteria.where("checkTopEntId").is(entId),
+//                    Criteria.where("checkEntId").is(entId));
         } else {
-            criteria.and("carrierTopEntId").is(LoginUserHolder.getEntId());
+            //承运企业主键ID
+//            criteria.and("carrierTopEntId").is(entMap.get(LoginUserHolder.getEntId()).getId());
+            criteria.and("carrierTopEntId").is(entId);
+//            criteria.orOperator(
+//                    Criteria.where("carrierTopEntId").is(entId),
+//                    Criteria.where("carrierEntId").is(entId));
         }
         //装卸货地址
         String loadCode = query.getLoadAddressCode();
@@ -98,12 +114,12 @@ public class KwAcceptCarriageService {
                 case 3 -> criteria.and("unloadCityCode").is(unloadCode);
             }
         }
-        if (StringUtils.isNotBlank(query.getLoadAddress())) {
-            criteria.and("loadDetailAddress").is(query.getLoadAddress());
-        }
-        if (StringUtils.isNotBlank(query.getUnloadAddress())) {
-            criteria.and("unloadDetailAddress").is(query.getUnloadAddress());
-        }
+//        if (StringUtils.isNotBlank(query.getLoadAddress())) {
+//            criteria.and("loadDetailAddress").is(query.getLoadAddress());
+//        }
+//        if (StringUtils.isNotBlank(query.getUnloadAddress())) {
+//            criteria.and("unloadDetailAddress").is(query.getUnloadAddress());
+//        }
         if (StringUtils.isNotBlank(query.getStatus())) {
             if (String.valueOf(NumberConstant.EIGHT).equals(query.getStatus())) {
                 List<String> status = new ArrayList<>();
@@ -152,12 +168,13 @@ public class KwAcceptCarriageService {
             criteria.orOperator(c1, c2, c3, c4, c5);
         }
 
-        Query query1 = new Query(criteria);
+
         //in查询
         List<String> stringList = StringUtils.splitStrToList(query.getIds(), StringConstant.COMMA, String.class);
         if (CollectionUtils.isNotEmpty(stringList)) {
             query1.addCriteria(Criteria.where("lOrderId").in(query.getIds()));
         }
+        query1.addCriteria(criteria);
         // 12. 总记录数
         long total = mongoTemplate.count(query1, SckwLogisticsOrder.class);
         // 10. 分页
@@ -187,10 +204,17 @@ public class KwAcceptCarriageService {
 //        } else {
 //            criteria.and("carrierEntId").is(LoginUserHolder.getEntId());
 //        }
-        if (unitType.equals(NumberConstant.ONE)) {
-            criteria.and("carrierTopEntId").is(LoginUserHolder.getEntId());
-        } else {
+        List<Long> entIds = new ArrayList<>();
+        entIds.add(LoginUserHolder.getEntId());
+        Map<Long, EntCacheResDto> entMap = remoteSystemService.queryEntTreeByIds(entIds);
+        if (unitType.equals(String.valueOf(NumberConstant.ONE))) {
+            //托运
+//            criteria.and("checkTopEntId").is(entMap.get(LoginUserHolder.getEntId()).getId());
             criteria.and("checkTopEntId").is(LoginUserHolder.getEntId());
+        } else {
+            //承运企业主键ID
+//            criteria.and("carrierTopEntId").is(entMap.get(LoginUserHolder.getEntId()).getId());
+            criteria.and("carrierTopEntId").is(LoginUserHolder.getEntId());
         }
         //装卸货地址
         String loadCode = param.getLoadAddressCode();
@@ -213,12 +237,12 @@ public class KwAcceptCarriageService {
                 case 3 -> criteria.and("unloadCityCode").is(unloadCode);
             }
         }
-        if (StringUtils.isNotBlank(param.getLoadAddress())) {
-            criteria.and("loadDetailAddress").is(param.getLoadAddress());
-        }
-        if (StringUtils.isNotBlank(param.getUnloadAddress())) {
-            criteria.and("unloadDetailAddress").is(param.getUnloadAddress());
-        }
+//        if (StringUtils.isNotBlank(param.getLoadAddress())) {
+//            criteria.and("loadDetailAddress").is(param.getLoadAddress());
+//        }
+//        if (StringUtils.isNotBlank(param.getUnloadAddress())) {
+//            criteria.and("unloadDetailAddress").is(param.getUnloadAddress());
+//        }
 
         if (StringUtils.isNotBlank(param.getStatus())) {
             if (String.valueOf(NumberConstant.EIGHT).equals(param.getStatus())) {
@@ -299,7 +323,7 @@ public class KwAcceptCarriageService {
      * @param list
      * @param returnList
      */
-    private void packageReturnAcceptCarriageOrderList(List<SckwLogisticsOrder> list, List<AcceptCarriageOrderVo> returnList) {
+    public void packageReturnAcceptCarriageOrderList(List<SckwLogisticsOrder> list, List<AcceptCarriageOrderVo> returnList) {
         /**计量单位*/
         Map<String, String> unitTypeDictData = getDictData(DictTypeEnum.UNIT_TYPE.getType());
         /**运价方式*/
@@ -309,9 +333,9 @@ public class KwAcceptCarriageService {
         /**结算周期*/
         Map<String, String> settlementDictData = getDictData(DictTypeEnum.SETTLEMENT_CYCLE.getType());
         /**签约方式*/
-        Map<String, String> signingWay = getDictData(DictTypeEnum.SIGNING_WAY.getType());
+        Map<String, String> signingWay = getDictData(DictTypeEnum.SIGNING_TYPE.getType());
         /**合理损耗*/
-        Map<String, String> taxRateTypeDictData = getDictData(DictTypeEnum.TAX_RATE_TYPE.getType());
+//        Map<String, String> taxRateTypeDictData = getDictData(DictTypeEnum.TAX_RATE_TYPE.getType());
         for (SckwLogisticsOrder logisticsOrder : list) {
             AcceptCarriageOrderVo vo = new AcceptCarriageOrderVo();
             vo.setAccountsCycle(logisticsOrder.getSettlementCycle() == null ?
@@ -365,8 +389,10 @@ public class KwAcceptCarriageService {
             vo.setReceiveGoodsUnitEntId(logisticsOrder.getReceiveGoodsUnitEntId());
             vo.setReceiveGoodsUnit(logisticsOrder.getReceiveGoodsUnit());
             vo.setGoodsPrice(logisticsOrder.getGoodsPrice());
-            vo.setGoodsPriceUnit(logisticsOrder.getGoodsPriceUnit());
+            vo.setGoodsPriceUnit(priceDictData.get(logisticsOrder.getGoodsPriceUnit()));
             vo.setSigningLabel(signingWay.get(logisticsOrder.getContractSigningWay()));
+//            vo.setSigningLabel(logisticsOrder.getContractSigningWay() == null ? null :
+//                    (logisticsOrder.getContractSigningWay().equals("1")?"线上签约":"线下签约"));
             vo.setLossUnit(logisticsOrder.getLossUnit());
             vo.setStatusLabel(LogisticsOrderEnum.getDestination(logisticsOrder.getStatus()));
             vo.setAccountsCycleLabel(logisticsOrder.getSettlementCycle() == null ?
@@ -383,7 +409,7 @@ public class KwAcceptCarriageService {
      * @param mappedResults
      * @param arrayList
      */
-    private List<TableTops> packageReturnStatistics(List<com.sckw.mongo.model.TableTops> mappedResults, List<TableTops> 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 = transportService.getDiffrentList(collect, codeList);
@@ -466,10 +492,15 @@ public class KwAcceptCarriageService {
 //        } else {
 //            criteria.and("carrierEntId").is(LoginUserHolder.getEntId());
 //        }
-        if (unitType.equals(NumberConstant.ONE)) {
-            criteria.and("carrierTopEntId").is(LoginUserHolder.getEntId());
+        List<Long> entIds = new ArrayList<>();
+        entIds.add(LoginUserHolder.getEntId());
+        Map<Long, EntCacheResDto> entMap = remoteSystemService.queryEntTreeByIds(entIds);
+        if (unitType.equals(String.valueOf(NumberConstant.ONE))) {
+            //托运
+            criteria.and("checkTopEntId").is(entMap.get(LoginUserHolder.getEntId()).getId());
         } else {
-            criteria.and("checkTopEntId").is(LoginUserHolder.getEntId());
+            //承运企业主键ID
+            criteria.and("carrierTopEntId").is(entMap.get(LoginUserHolder.getEntId()).getId());
         }
         criteria.and("delFlag").is(String.valueOf(NumberConstant.ZERO));
         List<String> stringList = StringUtils.splitStrToList(query.getIds(), StringConstant.COMMA, String.class);
@@ -532,7 +563,7 @@ public class KwAcceptCarriageService {
         return returnList;
     }
 
-    private void packageReturnList(List<SckwLogisticsOrder> list, List<AcceptCarriageOrderExcelVo> returnList) {
+    public void packageReturnList(List<SckwLogisticsOrder> list, List<AcceptCarriageOrderExcelVo> returnList) {
         for (SckwLogisticsOrder logisticsOrder : list) {
             AcceptCarriageOrderExcelVo vo = new AcceptCarriageOrderExcelVo();
             vo.setAccountsCycle(logisticsOrder.getSettlementCycle() == null ?

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

@@ -13,11 +13,12 @@ import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.DateUtil;
 import com.sckw.mongo.model.SckwLogisticsOrder;
 import com.sckw.mongo.model.TableTops;
-import com.sckw.order.api.dubbo.TradeOrderInfoService;
 import com.sckw.report.service.param.ConsignOrderQuery;
 import com.sckw.report.service.vo.ConsignOrderExcelVo;
 import com.sckw.report.service.vo.ConsignOrderVo;
 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 lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,8 +54,6 @@ public class KwConsignService {
     @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteSystemService remoteSystemService;
 
-    @DubboReference(version = "1.0.0", group = "design", check = false)
-    TradeOrderInfoService tradeOrderInfoService;
 
     /**
      * 托运订单列表查询
@@ -76,10 +75,22 @@ public class KwConsignService {
 //        } else {
 //            criteria.and("carrierEntId").is(LoginUserHolder.getEntId());
 //        }
-        if (unitType.equals(NumberConstant.ONE)) {
-            criteria.and("checkTopEntId").is(LoginUserHolder.getEntId());
+        List<Long> entIds = new ArrayList<>();
+        entIds.add(LoginUserHolder.getEntId());
+        Long entId = LoginUserHolder.getEntId();
+//        Map<Long, EntCacheResDto> entMap = remoteSystemService.queryEntTreeByIds(entIds);
+        if (unitType.equals(String.valueOf(NumberConstant.ONE))) {
+            //托运
+//            criteria.and("checkTopEntId").is(entMap.get(LoginUserHolder.getEntId()).getId());
+            criteria.orOperator(
+                    Criteria.where("checkTopEntId").is(entId),
+                    Criteria.where("checkEntId").is(entId));
         } else {
-            criteria.and("carrierTopEntId").is(LoginUserHolder.getEntId());
+            //承运企业主键ID
+//            criteria.and("carrierTopEntId").is(entMap.get(LoginUserHolder.getEntId()).getId());
+            criteria.orOperator(
+                    Criteria.where("carrierTopEntId").is(entId),
+                    Criteria.where("carrierEntId").is(entId));
         }
         //装卸货地址
         String loadCode = query.getLoadAddressCode();
@@ -102,12 +113,12 @@ public class KwConsignService {
                 case 3 -> criteria.and("unloadCityCode").is(unloadCode);
             }
         }
-        if (StringUtils.isNotBlank(query.getLoadAddress())) {
-            criteria.and("loadDetailAddress").is(query.getLoadAddress());
-        }
-        if (StringUtils.isNotBlank(query.getUnloadAddress())) {
-            criteria.and("unloadDetailAddress").is(query.getUnloadAddress());
-        }
+//        if (StringUtils.isNotBlank(query.getLoadAddress())) {
+//            criteria.and("loadDetailAddress").is(query.getLoadAddress());
+//        }
+//        if (StringUtils.isNotBlank(query.getUnloadAddress())) {
+//            criteria.and("unloadDetailAddress").is(query.getUnloadAddress());
+//        }
         if (StringUtils.isNotBlank(query.getStatus())) {
             criteria.and("status").is(query.getStatus());
         }
@@ -170,6 +181,19 @@ public class KwConsignService {
      * @param returnList
      */
     public void packageReturnList(List<SckwLogisticsOrder> list, List<ConsignOrderVo> returnList) {
+        /**计量单位*/
+//    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> signingWay = getDictData(DictTypeEnum.SIGNING_TYPE.getType());
+        /**合理损耗*/
+//        Map<String, String> taxRateTypeDictData = getDictData(DictTypeEnum.TAX_RATE_TYPE.getType());
+
         for (SckwLogisticsOrder logisticsOrder : list) {
             ConsignOrderVo vo = new ConsignOrderVo();
             vo.setAccountsCycle(logisticsOrder.getSettlementCycle() == null ?
@@ -219,8 +243,11 @@ public class KwConsignService {
             vo.setReceiveGoodsUnitEntId(logisticsOrder.getReceiveGoodsUnitEntId());
             vo.setReceiveGoodsUnit(logisticsOrder.getReceiveGoodsUnit());
             vo.setGoodsPrice(logisticsOrder.getGoodsPrice());
-            vo.setGoodsPriceUnit(logisticsOrder.getGoodsPriceUnit());
+//            vo.setGoodsPriceUnit(logisticsOrder.getGoodsPriceUnit());
+            vo.setGoodsPriceUnit(priceDictData.get(logisticsOrder.getGoodsPriceUnit()));
             vo.setSigningLabel(signingWay.get(logisticsOrder.getContractSigningWay()));
+//            vo.setSigningLabel(logisticsOrder.getContractSigningWay() == null ? null :
+//                    (logisticsOrder.getContractSigningWay().equals("1")?"线上签约":"线下签约"));
             vo.setLossUnit(logisticsOrder.getLossUnit());
             vo.setStatusLabel(LogisticsOrderEnum.getDestination(logisticsOrder.getStatus()));
             vo.setAccountsCycleLabel(logisticsOrder.getSettlementCycle() == null ?
@@ -231,30 +258,14 @@ public class KwConsignService {
     }
 
     public Map<String, String> getDictData(String type) {
-        tradeOrderInfoService.getOrderDetailById(5456465L);
         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));
-//        }
+        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;
     }
 
-
-
-    /**计量单位*/
-//    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> signingWay = getDictData(DictTypeEnum.SIGNING_WAY.getType());
-    /**合理损耗*/
-    Map<String, String> taxRateTypeDictData = getDictData(DictTypeEnum.TAX_RATE_TYPE.getType());
-
     /**
      * 托运订单导出
      *
@@ -275,10 +286,15 @@ public class KwConsignService {
 //        } else {
 //            criteria.and("carrierEntId").is(LoginUserHolder.getEntId());
 //        }
+        List<Long> entIds = new ArrayList<>();
+        entIds.add(LoginUserHolder.getEntId());
+        Map<Long, EntCacheResDto> entMap = remoteSystemService.queryEntTreeByIds(entIds);
         if (unitType.equals(NumberConstant.ONE)) {
-            criteria.and("checkTopEntId").is(LoginUserHolder.getEntId());
+            //托运
+            criteria.and("checkTopEntId").is(entMap.get(LoginUserHolder.getEntId()).getId());
         } else {
-            criteria.and("carrierTopEntId").is(LoginUserHolder.getEntId());
+            //承运企业主键ID
+            criteria.and("carrierTopEntId").is(entMap.get(LoginUserHolder.getEntId()).getId());
         }
         criteria.and("delFlag").is(String.valueOf(NumberConstant.ZERO));
         List<String> stringList = StringUtils.splitStrToList(query.getIds(), StringConstant.COMMA, String.class);
@@ -391,10 +407,22 @@ public class KwConsignService {
 //        } else {
 //            criteria.and("carrierEntId").is(LoginUserHolder.getEntId());
 //        }
-        if (unitType.equals(NumberConstant.ONE)) {
-            criteria.and("checkTopEntId").is(LoginUserHolder.getEntId());
+        List<Long> entIds = new ArrayList<>();
+        entIds.add(LoginUserHolder.getEntId());
+        Long entId = LoginUserHolder.getEntId();
+//        Map<Long, EntCacheResDto> entMap = remoteSystemService.queryEntTreeByIds(entIds);
+        if (unitType.equals(String.valueOf(NumberConstant.ONE))) {
+            //托运
+//            criteria.and("checkTopEntId").is(entMap.get(LoginUserHolder.getEntId()).getId());
+            criteria.orOperator(
+                    Criteria.where("checkTopEntId").is(entId),
+                    Criteria.where("checkEntId").is(entId));
         } else {
-            criteria.and("carrierTopEntId").is(LoginUserHolder.getEntId());
+            //承运企业主键ID
+//            criteria.and("carrierTopEntId").is(entMap.get(LoginUserHolder.getEntId()).getId());
+            criteria.orOperator(
+                    Criteria.where("carrierTopEntId").is(entId),
+                    Criteria.where("carrierEntId").is(entId));
         }
         //装卸货地址
         String loadCode = param.getLoadAddressCode();
@@ -417,12 +445,12 @@ public class KwConsignService {
                 case 3 -> criteria.and("unloadCityCode").is(unloadCode);
             }
         }
-        if (StringUtils.isNotBlank(param.getLoadAddress())) {
-            criteria.and("loadDetailAddress").is(param.getLoadAddress());
-        }
-        if (StringUtils.isNotBlank(param.getUnloadAddress())) {
-            criteria.and("unloadDetailAddress").is(param.getUnloadAddress());
-        }
+//        if (StringUtils.isNotBlank(param.getLoadAddress())) {
+//            criteria.and("loadDetailAddress").is(param.getLoadAddress());
+//        }
+//        if (StringUtils.isNotBlank(param.getUnloadAddress())) {
+//            criteria.and("unloadDetailAddress").is(param.getUnloadAddress());
+//        }
         if (StringUtils.isNotBlank(param.getStatus())) {
             criteria.and("status").is(param.getStatus());
         }

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

@@ -25,8 +25,6 @@ import com.sckw.report.service.vo.WaybillsCountVo;
 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.transport.api.dubbo.TransportDubboService;
-import com.sckw.transport.api.model.vo.KwtLogisticsOrderVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -63,8 +61,8 @@ public class KwTransportService {
     @Autowired
     private MongoTemplate mongoTemplate;
 
-    @DubboReference(version = "1.0.0", group = "design", check = false)
-    TransportDubboService transportDubboService;
+//    @DubboReference(version = "1.0.0", group = "design", check = false)
+//    TransportDubboService transportDubboService;
 
     @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteSystemService remoteSystemService;
@@ -144,10 +142,10 @@ public class KwTransportService {
         return HttpResult.ok(all1);
     }
 
-    public List<KwtLogisticsOrderVO> transportDubboService(List<String> ids) {
-        List<KwtLogisticsOrderVO> acceptCarriageOrderDetail = transportDubboService.getAcceptCarriageOrderDetail(ids);
-        return acceptCarriageOrderDetail;
-    }
+//    public List<KwtLogisticsOrderVO> transportDubboService(List<String> ids) {
+//        List<KwtLogisticsOrderVO> acceptCarriageOrderDetail = transportDubboService.getAcceptCarriageOrderDetail(ids);
+//        return acceptCarriageOrderDetail;
+//    }
 
     /**
      * 获取运单列表

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

@@ -12,6 +12,7 @@ import com.sckw.core.common.enums.StringConstant;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.enums.CarWaybillEnum;
+import com.sckw.core.model.enums.CooperateTypeEnum;
 import com.sckw.core.model.enums.LogisticsOrderEnum;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.CollectionUtils;
@@ -25,6 +26,7 @@ import com.sckw.excel.utils.ValidUtil;
 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.FindEntCooperateResVo;
 import com.sckw.mongo.enums.BusinessTypeEnum;
 import com.sckw.mongo.model.SckwLogisticsOrder;
 import com.sckw.mongo.model.SckwWaybillOrder;
@@ -1499,10 +1501,10 @@ public class AcceptCarriageOrderService {
         /**2023-08-16 新增校验承运企业与托运企业是否存在合作关系*/
         String consignCompanyId = orderDTO.getConsignCompanyId();
         String acceptCompanyId = orderDTO.getAcceptCompanyId();
-//        List<FindEntCooperateResVo> entCooperate = remoteManageService.findEntCooperate(Long.parseLong(acceptCompanyId), Long.parseLong(consignCompanyId), CooperateTypeEnum.CONSIGN.getCode());
-//        if (entCooperate == null) {
-//            return HttpResult.error("该托运企业与我方并无合作关系!");
-//        }
+        List<FindEntCooperateResVo> entCooperate = remoteManageService.findEntCooperate(Long.parseLong(acceptCompanyId), Long.parseLong(consignCompanyId), CooperateTypeEnum.CONSIGN.getCode());
+        if (entCooperate == null) {
+            return HttpResult.error("该托运企业与我方并无合作关系!");
+        }
         /**保存新建数据*/
         Long lOrderId = new IdWorker(NumberConstant.ONE).nextId();
         /**生成订单编号*/
@@ -1691,6 +1693,9 @@ public class AcceptCarriageOrderService {
         order.setWOrderNo(lOrderNo);
         order.setCarryingCapacity(orderDTO.getAmount());
         order.setBillingMode(orderDTO.getBillingMode());
+        order.setDelFlag(String.valueOf(NumberConstant.ZERO));
+        order.setStartTime(orderDTO.getStartTime());
+        order.setEndTime(orderDTO.getEndTime());
         SckwBusSum busSum = new SckwBusSum();
         busSum.setBusSumType(BusinessTypeEnum.LOGISTICS_ORDER_TYPE.getName());
         busSum.setMethod(NumberConstant.ONE);

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

@@ -9,6 +9,7 @@ import com.sckw.contract.api.model.dto.res.ContractCommonInfoResDto;
 import com.sckw.core.common.enums.NumberConstant;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.enums.CarWaybillEnum;
+import com.sckw.core.model.enums.CooperateTypeEnum;
 import com.sckw.core.model.enums.LogisticsOrderEnum;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.CollectionUtils;
@@ -22,6 +23,7 @@ import com.sckw.excel.utils.ValidUtil;
 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.FindEntCooperateResVo;
 import com.sckw.mongo.enums.BusinessTypeEnum;
 import com.sckw.mongo.model.SckwLogisticsOrder;
 import com.sckw.order.api.dubbo.TradeOrderInfoService;
@@ -942,10 +944,10 @@ public class ConsignOrderService {
         /**2023-08-16 新增校验承运企业与托运企业是否存在合作关系*/
         String consignCompanyId = addOrderDTO.getConsignCompanyId();
         String acceptCompanyId = addOrderDTO.getAcceptCompanyId();
-//        List<FindEntCooperateResVo> entCooperate = remoteManageService.findEntCooperate(Long.parseLong(consignCompanyId), Long.parseLong(acceptCompanyId), CooperateTypeEnum.CARRIAGE.getCode());
-//        if (entCooperate == null) {
-//            return HttpResult.error("该承运企业与我方企业并无合作关系!");
-//        }
+        List<FindEntCooperateResVo> entCooperate = remoteManageService.findEntCooperate(Long.parseLong(consignCompanyId), Long.parseLong(acceptCompanyId), CooperateTypeEnum.CARRIAGE.getCode());
+        if (entCooperate == null) {
+            return HttpResult.error("该承运企业与我方企业并无合作关系!");
+        }
         /**保存新建数据*/
         Long lOrderId = new IdWorker(NumberConstant.ONE).nextId();
         /**生成订单编号*/
@@ -1313,6 +1315,9 @@ public class ConsignOrderService {
         order.setWOrderNo(lOrderNo);
         order.setCarryingCapacity(addOrderDTO.getAmount());
         order.setBillingMode(addOrderDTO.getBillingMode());
+        order.setDelFlag(String.valueOf(NumberConstant.ZERO));
+        order.setStartTime(addOrderDTO.getStartTime());
+        order.setEndTime(addOrderDTO.getEndTime());
         SckwBusSum busSum = new SckwBusSum();
         busSum.setBusSumType(BusinessTypeEnum.LOGISTICS_ORDER_TYPE.getName());
         busSum.setMethod(NumberConstant.ONE);
@@ -1328,12 +1333,18 @@ public class ConsignOrderService {
     public HttpResult getLogisticsOrderAddressList() {
         Long entId = LoginUserHolder.getEntId();
         AddressDropListDTO res = new AddressDropListDTO();
-        List<KwtLogisticsOrderUnit> unitInfo = kwtLogisticsOrderUnitMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderUnit>()
-                .eq(KwtLogisticsOrderUnit::getEntId, entId));
-        if (CollectionUtils.isEmpty(unitInfo)) {
+        List<KwtLogisticsOrderUnit> list = kwtLogisticsOrderUnitMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderUnit>()
+                .eq(KwtLogisticsOrderUnit::getTopEntId, entId)
+        );
+        if (CollectionUtils.isEmpty(list)){
             return HttpResult.ok(res);
         }
-        Set<Long> lOrderIds = unitInfo.stream().map(KwtLogisticsOrderUnit::getLOrderId).collect(Collectors.toSet());
+//        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>()
                 .in(KwtLogisticsOrderAddress::getLOrderId, lOrderIds));