增加查询运费清单对方企业列表的接口

sckw-common/sckw-common-core/src/main/java/com/sckw/core/common/enums/enums/DictEnum.java

@@ -93,8 +93,8 @@ public enum DictEnum {
     PREPAID_LIMIT_YES("prepaid_limit", "1","是"),
     CONSIGNMENT_WAY_1("consignment_way", "1", "采购方托运"),
     CONSIGNMENT_WAY_2("consignment_way", "2", "供应方托运"),
-    SETTLEMENT_WAY_1("settlement_way", "1", "线上结算"),
-    SETTLEMENT_WAY_2("settlement_way", "2", "线下结算"),
+    SETTLEMENT_WAY_1("settlement_way", "1", "普通结算"),
+    SETTLEMENT_WAY_2("settlement_way", "2", "预付制结算"),
     LOAD_UNLOAD_WAY_1("load_unload_way", "1", "按装货量"),
     LOAD_UNLOAD_WAY_2("load_unload_way", "2", "按卸货量"),
     MEASUREMENT_WAY_1("measurement_way", "1", "地磅自动计算"),

sckw-modules-api/sckw-contract-api/src/main/java/com/sckw/contract/api/feign/ContractFeignService.java

@@ -1,18 +0,0 @@
-package com.sckw.contract.api.feign;
-
-import com.sckw.contract.api.model.dto.req.TradeEntListQueryFeignDto;
-import com.sckw.contract.api.model.dto.res.TradeEntInfoResVo;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-@FeignClient(name = "sckw-ng-contract",contextId = "contractFeignService")
-public interface ContractFeignService {
-    /**
-     * 根据当前企业id查询采购合同对方企业id列表
-     */
-    @GetMapping("/kwcPurchase/queryTradeEntList")
-    List<TradeEntInfoResVo> queryTradeEntIds(@RequestBody TradeEntListQueryFeignDto queryFeignDto);
-}

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

@@ -1,5 +1,7 @@
 package com.sckw.contract.controller;
 
+import com.sckw.contract.model.dto.req.TradeEntListQueryFeignDto;
+import com.sckw.contract.model.dto.res.TradeEntInfoResVo;
 import com.sckw.contract.model.vo.req.ContractDetailReq;
 import com.sckw.contract.model.vo.req.LogisticListReq;
 import com.sckw.contract.model.vo.req.QueryLogisticListReq;
@@ -15,6 +17,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @author :chenXiaoFei
  * @version :1.0
@@ -40,6 +44,12 @@ public class KwcLogisticsContractController {
     public BaseResult<PageDataResult<QueryLogisticListResp>> queryListByPage(@RequestBody QueryLogisticListReq req) {
         return BaseResult.success(kwcContractLogisticsService.queryLogisticsContractListByPage(req));
     }
+
+    @PostMapping("queryTradeEntList")
+    public List<TradeEntInfoResVo> queryTradeEntList(@RequestBody TradeEntListQueryFeignDto queryFeignDto) {
+        return kwcContractLogisticsService.queryTradeEntList(queryFeignDto);
+    }
+
     /**
      * 新增物流合同
      */

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

@@ -1,9 +1,9 @@
 package com.sckw.contract.controller;
 
-import com.sckw.contract.api.model.dto.req.TradeEntListQueryFeignDto;
+import com.sckw.contract.model.dto.req.TradeEntListQueryFeignDto;
 import com.sckw.contract.model.vo.req.IdReqVo;
 import com.sckw.contract.model.vo.req.QueryListReqVo;
-import com.sckw.contract.api.model.dto.res.TradeEntInfoResVo;
+import com.sckw.contract.model.dto.res.TradeEntInfoResVo;
 import com.sckw.contract.service.operateService.KwcContractTradeService;
 import com.sckw.core.model.enums.EntTypeEnum;
 import com.sckw.core.web.response.HttpResult;

sckw-modules-api/sckw-contract-api/src/main/java/com/sckw/contract/api/model/dto/req/TradeEntListQueryFeignDto.java → sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/dto/req/TradeEntListQueryFeignDto.java

@@ -1,4 +1,4 @@
-package com.sckw.contract.api.model.dto.req;
+package com.sckw.contract.model.dto.req;
 
 import lombok.Data;
 
@@ -12,6 +12,6 @@ import lombok.Data;
 public class TradeEntListQueryFeignDto {
     //当前企业的 id
     private Long curEntId;
-    //需要查询的对方企业类型 1-供应 2-采购 3-物流
+    //需要查询的对方企业类型 1-供应 2-采购 3-托运 4-承运
     private Integer tradeEntType;
 }

sckw-modules-api/sckw-contract-api/src/main/java/com/sckw/contract/api/model/dto/res/TradeEntInfoResVo.java → sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/dto/res/TradeEntInfoResVo.java

@@ -1,4 +1,4 @@
-package com.sckw.contract.api.model.dto.res;
+package com.sckw.contract.model.dto.res;
 
 import lombok.Data;
 

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

@@ -3,9 +3,12 @@ package com.sckw.contract.service;
 import java.util.*;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.sckw.contract.dao.KwcContractLogisticsUnitMapper;
 import com.sckw.contract.model.entity.KwcContractLogisticsGoods;
 import com.sckw.contract.model.entity.KwcContractLogisticsUnit;
+import com.sckw.contract.model.entity.KwcContractTradeUnit;
 import com.sckw.contract.model.vo.req.LogisticsBaseInfoReqVo;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
@@ -149,6 +152,22 @@ public class KwcContractLogisticsUnitService {
         }
         return count;
     }
+
+    public List<KwcContractLogisticsUnit> queryByEntIds(Set<Long> entIds) {
+        LambdaQueryWrapper<KwcContractLogisticsUnit> queryWrapper = Wrappers.<KwcContractLogisticsUnit>lambdaQuery()
+                .eq(KwcContractLogisticsUnit::getDelFlag, 0)
+                .in(KwcContractLogisticsUnit::getEntId, entIds);
+        return kwcContractLogisticsUnitMapper.selectList(queryWrapper);
+    }
+
+    public List<KwcContractLogisticsUnit> queryByContractIdsAndEntType(Set<Long> tradeContractIds,Integer entType) {
+        QueryWrapper<KwcContractLogisticsUnit> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("DISTINCT ent_id,firm_name")
+                .eq("del_flag", 0)
+                .in("contract_id", tradeContractIds)
+                .eq("unit_type", entType);
+        return kwcContractLogisticsUnitMapper.selectList(queryWrapper);
+    }
 }
 
 

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

@@ -12,7 +12,9 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.sckw.contract.dao.KwcContractLogisticsMapper;
 import com.sckw.contract.model.dto.req.QueryListReqDto;
+import com.sckw.contract.model.dto.req.TradeEntListQueryFeignDto;
 import com.sckw.contract.model.dto.res.QueryListResDto;
+import com.sckw.contract.model.dto.res.TradeEntInfoResVo;
 import com.sckw.contract.model.entity.*;
 import com.sckw.contract.model.report.LogisticsListExport;
 import com.sckw.contract.model.vo.req.*;
@@ -1719,4 +1721,31 @@ public class KwcContractLogisticsService {
         contractStatusCount.setOrderNum(String.valueOf(finalStatusAndLogOrdersMap1.getOrDefault(statusEnum.getCode(), new ArrayList<>()).size()));
         return contractStatusCount;
     }
+
+    public List<TradeEntInfoResVo> queryTradeEntList(TradeEntListQueryFeignDto queryFeignDto) {
+        List<TradeEntInfoResVo> resVos =  new ArrayList<>();
+        Long entId = queryFeignDto.getCurEntId();
+        Set<Long> entIds = Sets.newHashSet();
+        entIds.add(entId);
+        Set<Long> contractIds = null;
+        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(entIds)) {
+            List<KwcContractLogisticsUnit> units = kwcContractLogisticsUnitService.queryByEntIds(entIds);
+            if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(units)) {
+                contractIds = units.stream()
+                        .map(KwcContractLogisticsUnit::getContractId)
+                        .collect(Collectors.toSet());
+            }
+        }
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(contractIds)) {
+            return Collections.emptyList();
+        }
+        List<KwcContractLogisticsUnit> tradeUnits = kwcContractLogisticsUnitService.queryByContractIdsAndEntType(contractIds, queryFeignDto.getTradeEntType());
+        for (KwcContractLogisticsUnit tradeUnit : tradeUnits) {
+            TradeEntInfoResVo resVo = new TradeEntInfoResVo();
+            resVo.setEntId(tradeUnit.getEntId());
+            resVo.setEntName(tradeUnit.getFirmName());
+            resVos.add(resVo);
+        }
+        return resVos;
+    }
 }

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

@@ -9,7 +9,7 @@ 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.req.TradeEntListQueryFeignDto;
+import com.sckw.contract.model.dto.req.TradeEntListQueryFeignDto;
 import com.sckw.contract.api.model.dto.res.*;
 import com.sckw.contract.api.model.vo.LogisticsEntDtoVO;
 import com.sckw.contract.api.model.vo.LogisticsGoodsDto;
@@ -17,6 +17,7 @@ import com.sckw.contract.api.model.vo.TradeContractUnitDto;
 import com.sckw.contract.dao.KwcContractTradeMapper;
 import com.sckw.contract.model.dto.req.QueryListReqDto;
 import com.sckw.contract.model.dto.res.QueryListResDto;
+import com.sckw.contract.model.dto.res.TradeEntInfoResVo;
 import com.sckw.contract.model.entity.*;
 import com.sckw.contract.model.report.TradeListExport;
 import com.sckw.contract.model.vo.req.*;