提交贸易合同

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

@@ -2317,15 +2317,21 @@ public class KwcContractTradeService {
         List<KwcContractTradeUnit> tradeUnits = kwcContractTradeUnitRepository.queryByEntIdAndUnitType(contractTradeOrderDto.getEntId(),
                 contractTradeOrderDto.getEntType());
         if (org.apache.commons.collections4.CollectionUtils.isEmpty(tradeUnits)) {
+            log.info("查询贸易合同订单，未查询到企业关联合同，entId:{}，entType:{}，goodsId:{}",
+                    contractTradeOrderDto.getEntId(), contractTradeOrderDto.getEntType(), contractTradeOrderDto.getGoodsId());
             return List.of();
         }
         Set<Long> contractIds =
                 tradeUnits.stream().map(KwcContractTradeUnit::getContractId).collect(Collectors.toSet());
+        log.info("查询贸易合同订单，企业关联合同数量:{}，entId:{}，entType:{}，contractIds:{}",
+                tradeUnits.size(), contractTradeOrderDto.getEntId(), contractTradeOrderDto.getEntType(), JSON.toJSONString(contractIds));
 
         List<KwcContractTradeUnit> tradeUnits1 = kwcContractTradeUnitRepository.queryByContractIds(contractIds);
         if (org.apache.commons.collections4.CollectionUtils.isEmpty(tradeUnits1)) {
+            log.info("查询贸易合同订单，未查询到合同双方企业信息，contractIds:{}", JSON.toJSONString(contractIds));
             return List.of();
         }
+        log.info("查询贸易合同订单，合同企业信息数量:{}，contractIds:{}", tradeUnits1.size(), JSON.toJSONString(contractIds));
         Map<String, KwcContractTradeUnit> conTractTradeUnitMap =
                 tradeUnits1.stream().collect(Collectors.toMap(x -> x.getContractId() +
                                 "_" + x.getUnitType(), Function.identity(),
@@ -2335,12 +2341,22 @@ public class KwcContractTradeService {
                         2))
                 .map(KwcContractTradeUnit::getContractId)
                 .collect(Collectors.toSet());
+        if (CollectionUtils.isEmpty(contractIds)) {
+            log.info("该企业下没有贸易合同，企业id:{}", contractTradeOrderDto.getEntId());
+            return Collections.emptyList();
+
+        }
         //查询商品信息
+        log.info("查询贸易合同订单，登录企业过滤后合同数量:{}，loginEntId:{}，contractIds:{}",
+                contractIds.size(), LoginUserHolder.getEntId(), JSON.toJSONString(contractIds));
         List<KwcContractTradeGoods> kwcContractGoods = kwcContractTradeGoodsRepository.queryByContractIdsAndGoodsId(contractIds,
                 contractTradeOrderDto.getGoodsId());
         if (org.apache.commons.collections4.CollectionUtils.isEmpty(kwcContractGoods)) {
+            log.info("查询贸易合同订单，未查询到合同商品信息，goodsId:{}，contractIds:{}",
+                    contractTradeOrderDto.getGoodsId(), JSON.toJSONString(contractIds));
             return Collections.emptyList();
         }
+        log.info("查询贸易合同订单，合同商品数量:{}，goodsId:{}", kwcContractGoods.size(), contractTradeOrderDto.getGoodsId());
         Map<Long, KwcContractTradeGoods> contractGoodsMap = kwcContractGoods.stream()
                 .collect(Collectors.toMap(KwcContractTradeGoods::getContractId, Function.identity(), (x, y) -> x));
         //只查询已签约的
@@ -2349,16 +2365,27 @@ public class KwcContractTradeService {
                 .map(KwcContractTradeGoods::getContractId)
                 .collect(Collectors.toSet());
         //查询贸易合同
+        if (CollectionUtils.isEmpty(contractIdList)) {
+            log.info("该企业下没有已签约的贸易合同，企业id:{}", contractTradeOrderDto.getEntId());
+            return Collections.emptyList();
+        }
+        log.info("查询贸易合同订单，已签约商品关联合同数量:{}，contractIds:{}",
+                contractIdList.size(), JSON.toJSONString(contractIdList));
         List<KwcContractTrade> kwcContractTrades = kwcContractTradeRepository.findByContractIds(contractIdList);
         if (org.apache.commons.collections4.CollectionUtils.isEmpty(kwcContractTrades)) {
+            log.info("查询贸易合同订单，未查询到合同信息，contractIds:{}", JSON.toJSONString(contractIdList));
             return Collections.emptyList();
         }
         kwcContractTrades = kwcContractTrades.stream()
                 .filter(x -> Objects.equals(x.getStatus(), ContractStatusEnum.SIGNED.getCode()))
                 .collect(Collectors.toList());
-        return kwcContractTrades.stream()
+        log.info("查询贸易合同订单，合同状态过滤后数量:{}", kwcContractTrades.size());
+        List<ContractTradeOrderInfo> resultList = kwcContractTrades.stream()
                 .map(x -> getContractTradeOrderInfo(x, conTractTradeUnitMap, contractTradeOrderDto.getEntType(), contractGoodsMap))
                 .collect(Collectors.toList());
+        log.info("查询贸易合同订单完成，返回数量:{}，entId:{}，entType:{}，goodsId:{}",
+                resultList.size(), contractTradeOrderDto.getEntId(), contractTradeOrderDto.getEntType(), contractTradeOrderDto.getGoodsId());
+        return resultList;
     }
 
     private static void checkParam(Long contractTradeOrderDto, Long contractTradeOrderDto1, Integer contractTradeOrderDto2) {