提交新增合同文件校验

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

@@ -1,5 +1,9 @@
 package com.sckw.contract.controller;
 
+import com.sckw.contract.api.model.dto.res.ContractLogisticsOrderResDto;
+import com.sckw.contract.api.model.dto.res.ContractTradeOrderDto;
+import com.sckw.contract.api.model.dto.res.ContractTradeOrderInfo;
+import com.sckw.contract.api.model.dto.res.LogisticsOrderDto;
 import com.sckw.contract.model.vo.req.*;
 import com.sckw.contract.model.vo.res.ContractDetailResp;
 import com.sckw.contract.model.vo.res.QueryListResVo;
@@ -21,6 +25,8 @@ 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
@@ -260,4 +266,21 @@ public class KwcContractSaleController {
     public BaseResult<ContractDetailResp> queryContractDetail(@Valid @RequestBody ContractDetailReq req) {
         return BaseResult.success(kwcContractTradeService.queryContractDetail(req));
     }
+
+    /**
+     * 查询物流合同
+     */
+    @PostMapping("/queryContractLogisticsOrder")
+    @Operation(summary = "查询物流合同")
+    public BaseResult<List<ContractLogisticsOrderResDto>> queryContractLogisticsOrder(@Valid @RequestBody LogisticsOrderDto req) {
+        return BaseResult.success(kwcContractTradeService.queryContractLogisticsOrder(req));
+    }
+    /**
+     * 查询贸易合同
+     */
+    @PostMapping("/queryContractTradeOrder")
+    @Operation(summary = "查询贸易合同")
+    public BaseResult<List<ContractTradeOrderInfo>> queryContractTradeOrder(@Valid @RequestBody ContractTradeOrderDto req) {
+        return BaseResult.success(kwcContractTradeService.queryContractTradeOrder(req));
+    }
 }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/dubbo/RemoteContractServiceImpl.java

@@ -11,6 +11,7 @@ import com.sckw.contract.model.dto.res.QueryContractValidCountResDto;
 import com.sckw.contract.model.entity.*;
 import com.sckw.contract.repository.*;
 import com.sckw.contract.service.KwcContractLogisticsUnitService;
+import com.sckw.contract.service.operateService.KwcContractTradeService;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.ContractStatusEnum;
@@ -65,6 +66,7 @@ public class RemoteContractServiceImpl implements RemoteContractService {
     private final KwcContractTradeGoodsRepository kwcContractTradeGoodsRepository;
     private final KwcContractLogisticsUnitRepository kwcContractLogisticsUnitRepository;
     private final KwcContractLogisticsGoodsRepository kwcContractLogisticsGoodsRepository;
+    private final KwcContractTradeService kwcContractTradeService;
 
     @Override
     public Map<Long, ContractCommonInfoResDto> queryContractBaseInfo(List<Long> contractIds) {
@@ -246,147 +248,20 @@ public class RemoteContractServiceImpl implements RemoteContractService {
     @Override
     public List<ContractLogisticsOrderResDto> queryContractLogisticsOrder(LogisticsOrderDto logisticsOrderDto) {
         log.info("查询物流合同请求：{}",JSON.toJSONString( logisticsOrderDto));
-
-        if (Objects.isNull(logisticsOrderDto.getGoodsId())) {
-            throw new BusinessException("商品id不能为空！");
-        }
-        if (Objects.isNull(logisticsOrderDto.getEntId())) {
-            throw new BusinessException("托运方企业id不能为空！");
-        }
-        //查询物流公司
-        List<KwcContractLogisticsUnit> contractLogistics =
-                kwcContractLogisticsUnitRepository.queryByEntId(logisticsOrderDto.getEntId());
-        if (org.apache.commons.collections4.CollectionUtils.isEmpty(contractLogistics)){
-            return Collections.emptyList();
-        }
-        //物流订单和类型组成唯一key
-        Map<String, KwcContractLogisticsUnit> contractLogisticsMap =
-                contractLogistics.stream()
-                .collect(Collectors.toMap(c -> c.getContractId() + "_" + c.getUnitType(),
-                        Function.identity(), (x, y) -> x));
-        //物流订单合id
-        Set<Long> logTradeContractIds =
-                contractLogistics.stream().map(KwcContractLogisticsUnit::getContractId).collect(Collectors.toSet());
-
-        //查询商品信息
-       List<KwcContractLogisticsGoods> kwcContractLogisticsGoods = kwcContractLogisticsGoodsRepository.queryByLogIdsAndGoodsId(logTradeContractIds,
-                logisticsOrderDto.getGoodsId());
-       if (org.apache.commons.collections4.CollectionUtils.isEmpty(kwcContractLogisticsGoods)){
-           return Collections.emptyList();
-       }
-       //合同id和商品映射
-        Map<Long, KwcContractLogisticsGoods> contractLogisticsGoodsMap =
-                kwcContractLogisticsGoods.stream().collect(Collectors.toMap(KwcContractLogisticsGoods::getContractId,
-                Function.identity(), (x, y) -> x));
-        Set<Long> logTradeContractIdList =
-                kwcContractLogisticsGoods.stream().map(KwcContractLogisticsGoods::getContractId).collect(Collectors.toSet());
-       //查询物流订单
-        List<KwcContractLogistics> logistics = contractLogisticsRepository.queryByLogisticContractIds(logTradeContractIdList);
-        if (CollectionUtils.isEmpty( logistics)){
-            return Collections.emptyList();
-        }
-       return logistics.stream()
-                .map(log -> getContractLogisticsOrderResDto(log, contractLogisticsMap, contractLogisticsGoodsMap))
-               .collect(Collectors.toList());
+        return kwcContractTradeService.queryContractLogisticsOrder(logisticsOrderDto);
 
     }
 
-    @NotNull
-    private static ContractLogisticsOrderResDto getContractLogisticsOrderResDto(KwcContractLogistics log, Map<String, KwcContractLogisticsUnit> contractLogisticsMap, Map<Long, KwcContractLogisticsGoods> contractLogisticsGoodsMap) {
-        ContractLogisticsOrderResDto contractLogisticsOrderResDto = new ContractLogisticsOrderResDto();
-        contractLogisticsOrderResDto.setId(log.getId());
-        contractLogisticsOrderResDto.setContactName(log.getName());
-        contractLogisticsOrderResDto.setContractNo(log.getContractNo());
-        contractLogisticsOrderResDto.setSigningWay(log.getSigningWay());
-        contractLogisticsOrderResDto.setStatus(log.getStatus());
-        KwcContractLogisticsUnit consignEnt = contractLogisticsMap.getOrDefault(log.getId() + "_" + CooperateTypeEnum.CONSIGN.getCode(),
-                new KwcContractLogisticsUnit());
-        KwcContractLogisticsUnit acceptCarriageEnt = contractLogisticsMap.getOrDefault(log.getId() + "_" + CooperateTypeEnum.CARRIAGE.getCode(),
-                new KwcContractLogisticsUnit());
-        contractLogisticsOrderResDto.setConsignEntId(consignEnt.getContractId());
-        contractLogisticsOrderResDto.setConsignEntName(consignEnt.getFirmName());
-        contractLogisticsOrderResDto.setAcceptCarriageEntId(acceptCarriageEnt.getContractId());
-        contractLogisticsOrderResDto.setAcceptCarriageEntName(acceptCarriageEnt.getFirmName());
-        KwcContractLogisticsGoods goods = contractLogisticsGoodsMap.getOrDefault(log.getId(),
-                new KwcContractLogisticsGoods());
-        contractLogisticsOrderResDto.setPrice(goods.getPrice());
-        return contractLogisticsOrderResDto;
-    }
+
 
     @Override
     public List<ContractTradeOrderInfo> queryContractTradeOrder(ContractTradeOrderDto contractTradeOrderDto) {
         log.info("查询贸易合同订单，请求：{}", JSON.toJSONString(contractTradeOrderDto));
-        checkParam(contractTradeOrderDto.getGoodsId(), contractTradeOrderDto.getEntId(), contractTradeOrderDto.getEntType());
-        //查询贸易合同企业信息
-        List<KwcContractTradeUnit> tradeUnits = kwcContractTradeUnitRepository.queryByEntIdAndUnitType(contractTradeOrderDto.getEntId(),
-                contractTradeOrderDto.getEntType());
-        if (org.apache.commons.collections4.CollectionUtils.isEmpty(tradeUnits)){
-            return Collections.emptyList();
-        }
-        Set<Long> contractIds =
-                tradeUnits.stream().map(KwcContractTradeUnit::getContractId).collect(Collectors.toSet());
-        //查询商品信息
-        List<KwcContractTradeGoods> kwcContractGoods = kwcContractTradeGoodsRepository.queryByContractIdsAndGoodsId(contractIds,
-                contractTradeOrderDto.getGoodsId());
-        if (org.apache.commons.collections4.CollectionUtils.isEmpty(kwcContractGoods)){
-            return Collections.emptyList();
-        }
-        Set<Long> contractIdList = kwcContractGoods.stream()
-                        .map(KwcContractTradeGoods::getContractId)
-                        .collect(Collectors.toSet());
-        //查询贸易合同
-        List<KwcContractTrade> kwcContractTrades = kwcContractTradeRepository.queryByContractIds(contractIdList);
-        if (org.apache.commons.collections4.CollectionUtils.isEmpty(kwcContractTrades)){
-            return Collections.emptyList();
-        }
-       return kwcContractTrades.stream().map(RemoteContractServiceImpl::getContractTradeOrderInfo)
-               .collect(Collectors.toList());
+       return kwcContractTradeService.queryContractTradeOrder(contractTradeOrderDto);
     }
 
-    private static void checkParam(Long contractTradeOrderDto, Long contractTradeOrderDto1, Integer contractTradeOrderDto2) {
-        if (Objects.isNull(contractTradeOrderDto)) {
-            throw new BusinessException("商品id不能为空！");
-        }
-        if (Objects.isNull(contractTradeOrderDto1)) {
-            throw new BusinessException("托运方企业id不能为空！");
-        }
-        if (Objects.isNull(contractTradeOrderDto2)) {
-            throw new BusinessException("企业类型不能为空！");
-        }
-    }
 
-    @NotNull
-    private static ContractTradeOrderInfo getContractTradeOrderInfo(KwcContractTrade c) {
-        ContractTradeOrderInfo contractTradeOrderInfo = new ContractTradeOrderInfo();
-        contractTradeOrderInfo.setId(c.getId());
-        contractTradeOrderInfo.setEntId(c.getEntId());
-        contractTradeOrderInfo.setContractNo(c.getContractNo());
-        contractTradeOrderInfo.setName(c.getName());
-        contractTradeOrderInfo.setSigningWay(c.getSigningWay());
-        contractTradeOrderInfo.setTrading(c.getTrading());
-        contractTradeOrderInfo.setStartTime(c.getStartTime());
-        contractTradeOrderInfo.setEndTime(c.getEndTime());
-        contractTradeOrderInfo.setAmount(c.getAmount());
-        contractTradeOrderInfo.setPerformedAmount(c.getPerformedAmount());
-        contractTradeOrderInfo.setSigningUrl(c.getSigningUrl());
-        contractTradeOrderInfo.setSignedUrl(c.getSignedUrl());
-        contractTradeOrderInfo.setSigningNo(c.getSigningNo());
-        contractTradeOrderInfo.setContractPid(c.getContractPid());
-        contractTradeOrderInfo.setRemark(c.getRemark());
-        contractTradeOrderInfo.setStatus(c.getStatus());
-        contractTradeOrderInfo.setCreateBy(c.getCreateBy());
-        contractTradeOrderInfo.setCreateTime(c.getCreateTime());
-        contractTradeOrderInfo.setUpdateBy(c.getUpdateBy());
-        contractTradeOrderInfo.setUpdateTime(c.getUpdateTime());
-        contractTradeOrderInfo.setDelFlag(c.getDelFlag());
-        contractTradeOrderInfo.setBusinessId(c.getBusinessId());
-        contractTradeOrderInfo.setSettlement(c.getSettlement());
-        contractTradeOrderInfo.setConsignment(c.getConsignment());
-        contractTradeOrderInfo.setUnloadWay(c.getUnloadWay());
-        contractTradeOrderInfo.setSalesmanId(c.getSalesmanId());
-        contractTradeOrderInfo.setSalesmanPhone(c.getSalesmanPhone());
-        return contractTradeOrderInfo;
-    }
+
 
 
     private ContractCommonInfoResDto fillContractLogistics(KwcContractLogistics kwcContractLogistics) {

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/repository/KwcContractTradeRepository.java

@@ -82,4 +82,10 @@ public class KwcContractTradeRepository extends ServiceImpl<KwcContractTradeMapp
                 .eq(KwcContractTrade::getDelFlag,0)
                 .in(KwcContractTrade::getContractPid, contractPids));
     }
+
+    public List<KwcContractTrade> findByContractIds(Set<Long> contractIdList) {
+        return list(Wrappers.<KwcContractTrade>lambdaQuery()
+                .eq(KwcContractTrade::getDelFlag, 0)
+                .in(KwcContractTrade::getId, contractIdList));
+    }
 }

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

@@ -4,12 +4,15 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import com.sckw.contract.api.model.dto.res.ContractLogisticsOrderResDto;
+import com.sckw.contract.api.model.dto.res.ContractTradeOrderDto;
+import com.sckw.contract.api.model.dto.res.ContractTradeOrderInfo;
+import com.sckw.contract.api.model.dto.res.LogisticsOrderDto;
 import com.sckw.contract.dao.KwcContractTradeMapper;
 import com.sckw.contract.model.dto.req.QueryListReqDto;
 import com.sckw.contract.model.dto.res.QueryListResDto;
@@ -97,6 +100,7 @@ public class KwcContractTradeService {
     private final KwcContractTradeOrderRepository kwcContractTradeOrderRepository;
     private final KwcContractLogisticsUnitRepository kwcContractLogisticsUnitRepository;
     private final KwcContractLogisticsGoodsRepository kwcContractLogisticsGoodsRepository;
+    private final KwcContractLogisticsRepository contractLogisticsRepository;
 
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
@@ -1633,4 +1637,165 @@ public class KwcContractTradeService {
         queryListResVo.setSignTime(t.getSignTime());
         return queryListResVo;
     }
+
+
+    public List<ContractLogisticsOrderResDto> queryContractLogisticsOrder(LogisticsOrderDto logisticsOrderDto) {
+        log.info("查询物流合同请求：{}",JSON.toJSONString( logisticsOrderDto));
+
+        if (Objects.isNull(logisticsOrderDto.getGoodsId())) {
+            throw new BusinessException("商品id不能为空！");
+        }
+        if (Objects.isNull(logisticsOrderDto.getEntId())) {
+            throw new BusinessException("托运方企业id不能为空！");
+        }
+        //通过托运企业查询物流公司
+        List<KwcContractLogisticsUnit> contractLogistics =
+                kwcContractLogisticsUnitRepository.queryByEntId(logisticsOrderDto.getEntId());
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(contractLogistics)){
+            return Collections.emptyList();
+        }
+        //物流订单合id
+        Set<Long> logTradeContractIds =
+                contractLogistics.stream().map(KwcContractLogisticsUnit::getContractId).collect(Collectors.toSet());
+
+        //查询商品信息
+        List<KwcContractLogisticsGoods> kwcContractLogisticsGoods = kwcContractLogisticsGoodsRepository.queryByLogIdsAndGoodsId(logTradeContractIds,
+                logisticsOrderDto.getGoodsId());
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(kwcContractLogisticsGoods)){
+            return Collections.emptyList();
+        }
+        //合同id和商品映射
+        Map<Long, KwcContractLogisticsGoods> contractLogisticsGoodsMap =
+                kwcContractLogisticsGoods.stream().collect(Collectors.toMap(KwcContractLogisticsGoods::getContractId,
+                        Function.identity(), (x, y) -> x));
+        Set<Long> logTradeContractIdList =
+                kwcContractLogisticsGoods.stream().map(KwcContractLogisticsGoods::getContractId).collect(Collectors.toSet());
+        //查询物流订单
+        List<KwcContractLogistics> logistics = contractLogisticsRepository.queryByLogisticContractIds(logTradeContractIdList);
+        if (CollectionUtils.isEmpty( logistics)){
+            return Collections.emptyList();
+        }
+        //查询企业
+        List<KwcContractLogisticsUnit> units = kwcContractLogisticsUnitRepository.queryByContractIds(logTradeContractIdList);
+        //物流订单和类型组成唯一key
+        Map<String, KwcContractLogisticsUnit> contractLogisticsMap = Maps.newHashMap();
+        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(units)){
+            contractLogisticsMap = units.stream()
+                            .collect(Collectors.toMap(c -> c.getContractId() + "_" + c.getUnitType(),
+                                    Function.identity(), (x, y) -> x));
+        }
+        Map<String, KwcContractLogisticsUnit> finalContractLogisticsMap = contractLogisticsMap;
+        return logistics.stream()
+                .filter(log -> Objects.equals(log.getStatus(),ContractStatusEnum.SIGNED.getCode()))
+                .map(log -> getContractLogisticsOrderResDto(log, finalContractLogisticsMap, contractLogisticsGoodsMap))
+                .collect(Collectors.toList());
+
+    }
+
+    @NotNull
+    private static ContractLogisticsOrderResDto getContractLogisticsOrderResDto(KwcContractLogistics log, Map<String, KwcContractLogisticsUnit> contractLogisticsMap, Map<Long, KwcContractLogisticsGoods> contractLogisticsGoodsMap) {
+        ContractLogisticsOrderResDto contractLogisticsOrderResDto = new ContractLogisticsOrderResDto();
+        contractLogisticsOrderResDto.setId(log.getId());
+        contractLogisticsOrderResDto.setContactName(log.getName());
+        contractLogisticsOrderResDto.setContractNo(log.getContractNo());
+        contractLogisticsOrderResDto.setSigningWay(log.getSigningWay());
+        contractLogisticsOrderResDto.setStatus(log.getStatus());
+        KwcContractLogisticsUnit consignEnt = contractLogisticsMap.getOrDefault(log.getId() + "_" + CooperateTypeEnum.CONSIGN.getCode(),
+                new KwcContractLogisticsUnit());
+        KwcContractLogisticsUnit acceptCarriageEnt = contractLogisticsMap.getOrDefault(log.getId() + "_" + CooperateTypeEnum.CARRIAGE.getCode(),
+                new KwcContractLogisticsUnit());
+        contractLogisticsOrderResDto.setConsignEntId(consignEnt.getContractId());
+        contractLogisticsOrderResDto.setConsignEntName(consignEnt.getFirmName());
+        contractLogisticsOrderResDto.setAcceptCarriageEntId(acceptCarriageEnt.getContractId());
+        contractLogisticsOrderResDto.setAcceptCarriageEntName(acceptCarriageEnt.getFirmName());
+        KwcContractLogisticsGoods goods = contractLogisticsGoodsMap.getOrDefault(log.getId(),
+                new KwcContractLogisticsGoods());
+        contractLogisticsOrderResDto.setPrice(goods.getPrice());
+        return contractLogisticsOrderResDto;
+    }
+
+
+
+    public List<ContractTradeOrderInfo> queryContractTradeOrder(ContractTradeOrderDto contractTradeOrderDto) {
+        log.info("查询贸易合同订单，请求：{}", JSON.toJSONString(contractTradeOrderDto));
+        checkParam(contractTradeOrderDto.getGoodsId(), contractTradeOrderDto.getEntId(), contractTradeOrderDto.getEntType());
+        //查询贸易合同企业信息
+        List<KwcContractTradeUnit> tradeUnits = kwcContractTradeUnitRepository.queryByEntIdAndUnitType(contractTradeOrderDto.getEntId(),
+                contractTradeOrderDto.getEntType());
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(tradeUnits)){
+            return Collections.emptyList();
+        }
+        Map<String, KwcContractTradeUnit> conTractTradeUnitMap =
+                tradeUnits.stream().collect(Collectors.toMap(x -> x.getContractId() +
+                        "_" + x.getUnitType(), Function.identity(),
+                (x, y) -> x));
+        Set<Long> contractIds =
+                tradeUnits.stream().map(KwcContractTradeUnit::getContractId).collect(Collectors.toSet());
+        //查询商品信息
+        List<KwcContractTradeGoods> kwcContractGoods = kwcContractTradeGoodsRepository.queryByContractIdsAndGoodsId(contractIds,
+                contractTradeOrderDto.getGoodsId());
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(kwcContractGoods)){
+            return Collections.emptyList();
+        }
+        //只查询已签约的
+        Set<Long> contractIdList = kwcContractGoods.stream()
+                .filter(x->Objects.equals(x.getStatus(), ContractStatusEnum.SIGNED.getCode()))
+                .map(KwcContractTradeGoods::getContractId)
+                .collect(Collectors.toSet());
+        //查询贸易合同
+        List<KwcContractTrade> kwcContractTrades = kwcContractTradeRepository.findByContractIds(contractIdList);
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(kwcContractTrades)){
+            return Collections.emptyList();
+        }
+        return kwcContractTrades.stream()
+                .map(x-> getContractTradeOrderInfo(x, conTractTradeUnitMap,contractTradeOrderDto.getEntType()))
+                .collect(Collectors.toList());
+    }
+    private static void checkParam(Long contractTradeOrderDto, Long contractTradeOrderDto1, Integer contractTradeOrderDto2) {
+        if (Objects.isNull(contractTradeOrderDto)) {
+            throw new BusinessException("商品id不能为空！");
+        }
+        if (Objects.isNull(contractTradeOrderDto1)) {
+            throw new BusinessException("托运方企业id不能为空！");
+        }
+        if (Objects.isNull(contractTradeOrderDto2)) {
+            throw new BusinessException("企业类型不能为空！");
+        }
+    }
+    @NotNull
+    private static ContractTradeOrderInfo getContractTradeOrderInfo(KwcContractTrade c, Map<String,
+            KwcContractTradeUnit> conTractTradeUnitMap,Integer entType) {
+        ContractTradeOrderInfo contractTradeOrderInfo = new ContractTradeOrderInfo();
+        contractTradeOrderInfo.setId(c.getId());
+        KwcContractTradeUnit unit = conTractTradeUnitMap.getOrDefault(c.getId() + "_" + entType,
+                new KwcContractTradeUnit());
+        contractTradeOrderInfo.setEntId(unit.getEntId());
+        contractTradeOrderInfo.setContractNo(unit.getFirmName());
+        contractTradeOrderInfo.setName(c.getName());
+        contractTradeOrderInfo.setSigningWay(c.getSigningWay());
+        contractTradeOrderInfo.setTrading(c.getTrading());
+        contractTradeOrderInfo.setStartTime(c.getStartTime());
+        contractTradeOrderInfo.setEndTime(c.getEndTime());
+        contractTradeOrderInfo.setAmount(c.getAmount());
+        contractTradeOrderInfo.setPerformedAmount(c.getPerformedAmount());
+        contractTradeOrderInfo.setSigningUrl(c.getSigningUrl());
+        contractTradeOrderInfo.setSignedUrl(c.getSignedUrl());
+        contractTradeOrderInfo.setSigningNo(c.getSigningNo());
+        contractTradeOrderInfo.setContractPid(c.getContractPid());
+        contractTradeOrderInfo.setRemark(c.getRemark());
+        contractTradeOrderInfo.setStatus(c.getStatus());
+        contractTradeOrderInfo.setCreateBy(c.getCreateBy());
+        contractTradeOrderInfo.setCreateTime(c.getCreateTime());
+        contractTradeOrderInfo.setUpdateBy(c.getUpdateBy());
+        contractTradeOrderInfo.setUpdateTime(c.getUpdateTime());
+        contractTradeOrderInfo.setDelFlag(c.getDelFlag());
+        contractTradeOrderInfo.setBusinessId(c.getBusinessId());
+        contractTradeOrderInfo.setSettlement(c.getSettlement());
+        contractTradeOrderInfo.setConsignment(c.getConsignment());
+        contractTradeOrderInfo.setUnloadWay(c.getUnloadWay());
+        contractTradeOrderInfo.setSalesmanId(c.getSalesmanId());
+        contractTradeOrderInfo.setSalesmanPhone(c.getSalesmanPhone());
+        return contractTradeOrderInfo;
+    }
+
 }

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

@@ -27,10 +27,10 @@ public class CapacityReq extends PageReq implements Serializable {
     @Schema(description = "车牌号")
     private String truckNo;
     /**
-     * 运单id
+     * 物流id
      */
-    @Schema(description = "运单id")
-    @NotBlank(message = "运单id不能为空")
+    @Schema(description = "物流id")
+    @NotBlank(message = "物流id不能为空")
     private String logOrderId;
     /**
      * 企业id

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

@@ -22,11 +22,13 @@ import java.util.Set;
  */
 @Repository
 public class KwtLogisticsOrderCirculateRepository extends ServiceImpl<KwtLogisticsOrderCirculateMapper, KwtLogisticsOrderCirculate> {
-    public IPage<KwtLogisticsOrderCirculate> queryByPage(int pageNum, int pageSize,String truckNo, Long entId) {
+    public IPage<KwtLogisticsOrderCirculate> queryByPage(int pageNum, int pageSize,String truckNo, Long entId,
+                                                         Long logistOrderId) {
         return page(new Page<>(pageNum, pageSize), Wrappers.<KwtLogisticsOrderCirculate>lambdaQuery()
-                .like(StringUtils.isNotBlank(truckNo),KwtLogisticsOrderCirculate::getTruckNo, truckNo)
                 .eq(KwtLogisticsOrderCirculate::getDelFlag,0)
                 .eq(KwtLogisticsOrderCirculate::getEntId, entId)
+                .eq(KwtLogisticsOrderCirculate::getLOrderId, logistOrderId)
+                .like(StringUtils.isNotBlank(truckNo),KwtLogisticsOrderCirculate::getTruckNo, truckNo)
                 .orderByDesc(KwtLogisticsOrderCirculate::getCreateTime)
                 .orderByDesc(KwtLogisticsOrderCirculate::getId));
     }

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

@@ -136,7 +136,7 @@ public class KwtWaybillOrderRepository extends ServiceImpl<KwtWaybillOrderMapper
                 .eq(KwtWaybillOrder::getDelFlag,0)
                 .eq(KwtWaybillOrder::getEntId,entId)
                 .in(KwtWaybillOrder::getId, billOrderIds)
-                .orderByDesc(KwtWaybillOrder::getCreateTime)
+                .orderByDesc(KwtWaybillOrder::getUpdateTime)
         );
     }
 

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

@@ -2683,7 +2683,7 @@ public class KwtLogisticsConsignmentService {
         Long logOrderId = Long.parseLong(req.getLogOrderId());
         Long entId = Long.parseLong(req.getEntId());
         IPage<KwtLogisticsOrderCirculate> page = logisticsOrderCirculateRepository.queryByPage(req.getPageNum(),
-                req.getPageSize(), req.getTruckNo(),Long.parseLong(req.getEntId()));
+                req.getPageSize(), req.getTruckNo(),entId, logOrderId);
         List<KwtLogisticsOrderCirculate> records = page.getRecords();
 
         if (org.apache.commons.collections4.CollectionUtils.isEmpty( records)){
@@ -2752,7 +2752,7 @@ public class KwtLogisticsConsignmentService {
             capacityVo.setLoadAmount(loadAmount.setScale(2,RoundingMode.HALF_UP).toPlainString());
             capacityVo.setUnloadAmount(unloadAmount.setScale(2,RoundingMode.HALF_UP).toPlainString());
             capacityVo.setStatus(String.valueOf(waybillOrders.get(0).getStatus()));
-            capacityVo.setStatusDesc(CarWaybillEnum.getName(waybillOrders.get(0).getStatus()));
+            capacityVo.setStatusDesc(CarWaybillV1Enum.geDesc(waybillOrders.get(0).getStatus()));
         }
 
         capacityVo.setDispatchStatus(String.valueOf(t.getStatus()));
@@ -2764,11 +2764,11 @@ public class KwtLogisticsConsignmentService {
     @Transactional(rollbackFor = Exception.class)
     public Boolean closeCapacity(@Valid DeleteCapacityReq req) {
         log.info("关闭启用已派运力请求参数：{}", JSON.toJSONString(req));
+        Long truckId =StringUtils.isNotBlank(req.getTruckId()) ?Long.parseLong(req.getTruckId()) : null;
         List<Long> logisticsOrderIds = req.getLogisticsOrderIds()
                 .stream().map(x -> Long.parseLong(x)).collect(Collectors.toList());
         List<KwtLogisticsOrderCirculate> logisticsOrderCirculate =
-                logisticsOrderCirculateRepository.findOneByLogOrderIdsAndTruckId(logisticsOrderIds,
-                        Long.parseLong(req.getTruckId()));
+                logisticsOrderCirculateRepository.findOneByLogOrderIdsAndTruckId(logisticsOrderIds, truckId);
         if (Objects.isNull(logisticsOrderCirculate)) {
             throw new BusinessException("未找到该运力信息");
         }
@@ -2785,6 +2785,7 @@ public class KwtLogisticsConsignmentService {
         return logisticsOrderCirculateRepository.updateCirculates(orderCirculates);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public DispatchCarResp dispatchCar(@Valid DispatchCarReq req) {
         log.info("派车请求参数：{}", JSON.toJSONString(req));
         //查询物流订单
@@ -2794,9 +2795,8 @@ public class KwtLogisticsConsignmentService {
         if (Objects.isNull(logisticsOrder)){
             throw new BusinessException("未找到该物流订单信息");
         }
-        List<Integer> statusList = Arrays.asList(LogisticsOrderV1Enum.WAIT_DELIVERY.getCode(),
-                LogisticsOrderV1Enum.WAIT_DELIVERY.getCode());
-        if (!statusList.contains(logisticsOrder.getStatus())){
+
+        if (!Objects.equals(logisticsOrder.getStatus(),LogisticsOrderV1Enum.WAIT_DELIVERY.getCode())){
             throw new BusinessException("该物流订单状态不能进行派车");
         }
         //车牌id去重
@@ -2855,6 +2855,7 @@ public class KwtLogisticsConsignmentService {
         logisticsOrderCirculate.setLOrderId(logOrderId);
         logisticsOrderCirculate.setTruckId(Long.valueOf(carInfo.getTruckId()));
         logisticsOrderCirculate.setTruckNo(carInfo.getTruckNo());
+        logisticsOrderCirculate.setDriverId(-9L);
         Date startDate = Objects.nonNull(logisticsOrder.getStartTime()) ?
                 Date.from(logisticsOrder.getStartTime().atZone(ZoneId.systemDefault()).toInstant()) : null;
         logisticsOrderCirculate.setStartTime(startDate);