提交贸易合同相关接口

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

@@ -1334,7 +1334,6 @@ public class KwcContractTradeService {
 
         //查询商品合同
         List<KwcContractTradeGoods> tradeGoods = kwcContractTradeGoodsRepository.queryByContractId(kwcContractTrade.getId());
-        Map<String, KwcContractTradeGoods> contractTradeKeyAndGoodsMap = Maps.newHashMap();
         List<Long> goodsIds = Lists.newArrayList();
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(tradeGoods)){
             //获取商品id
@@ -1343,12 +1342,6 @@ public class KwcContractTradeService {
                      .distinct()
                     .collect(Collectors.toList());
 
-            //过滤主合同查看的标信息 , 合同id商品id组成唯一key映射商品信息
-            contractTradeKeyAndGoodsMap =
-                    tradeGoods.stream()
-                            .peek(x -> x.setContractIdGoodsIdKey(x.getContractId() + "-" + x.getGoodsId()))
-                            .collect(Collectors.toMap(KwcContractTradeGoods::getContractIdGoodsIdKey, Function.identity(), (x, y) -> x));
-
         }
         //查询商品 商品id映射商品
         Map<Long, KwpGoods> goodsIdAndGoodsMap = Maps.newHashMap();
@@ -1391,7 +1384,16 @@ public class KwcContractTradeService {
                     .collect(Collectors.toList());
             contractDetailResp.setGoodsInfo(tradeGoodsInfos);
         }
+        //获取关联贸易订单
+        ContractDetailResp.AssociatedOrder associatedOrder = getAssociateOrder(kwcContractTradeOrder, ctTypeKeyAndUnitMap, kwcContractTrade, contractIdUnitTypeKeyAndUnitMap, goodsIdAndGoodsMap, contractIdGoodsIdKeyAndGoodsMap);
+        contractDetailResp.setAssociatedOrder(associatedOrder);
+
+        contractDetailResp.setRemark(kwcContractTrade.getRemark());
 
+        return contractDetailResp;
+    }
+
+    private static ContractDetailResp.AssociatedOrder getAssociateOrder(KwcContractTradeOrder kwcContractTradeOrder, Map<String, KwcContractTradeUnit> ctTypeKeyAndUnitMap, KwcContractTrade kwcContractTrade, Map<String, KwcContractLogisticsUnit> contractIdUnitTypeKeyAndUnitMap, Map<Long, KwpGoods> goodsIdAndGoodsMap, Map<String, KwcContractLogisticsGoods> contractIdGoodsIdKeyAndGoodsMap) {
         ContractDetailResp.AssociatedOrder associatedOrder = new ContractDetailResp.AssociatedOrder();
         if (Objects.nonNull(kwcContractTradeOrder)){
             associatedOrder.setOrderId(kwcContractTradeOrder.getOrderId());
@@ -1435,21 +1437,13 @@ public class KwcContractTradeService {
                     kwcContractTradeOrder.getLoadAmount().toPlainString() : null);
             associatedOrder.setUnloadAmount(Objects.nonNull(kwcContractTradeOrder.getUnloadAmount()) ?
                     kwcContractTradeOrder.getUnloadAmount().toPlainString() : null);
-            KwcContractTradeGoods contractTradeGoods = contractTradeKeyAndGoodsMap
-                    .getOrDefault(kwcContractTradeOrder.getContractId() + "-" + kwcContractTradeOrder.getGoodsId(), new KwcContractTradeGoods());
             KwcContractLogisticsGoods logisticsGoods =
                     contractIdGoodsIdKeyAndGoodsMap.getOrDefault(kwcContractTradeOrder.getContractId() + "-" + kwcContractTradeOrder.getGoodsId(), new KwcContractLogisticsGoods());
             associatedOrder.setTransportPrice(Objects.nonNull(logisticsGoods.getPrice()) ? logisticsGoods.getPrice().toPlainString() : null);
             associatedOrder.setLoadAddress(kwcContractTradeOrder.getLoadAddress());
             associatedOrder.setUnloadAddress(kwcContractTradeOrder.getUnloadAddress());
-            contractDetailResp.setAssociatedOrder(associatedOrder);
         }
-
-
-        contractDetailResp.setRemark(kwcContractTrade.getRemark());
-
-
-        return null;
+        return associatedOrder;
     }
 
     private static ContractDetailResp.TradeGoodsInfo getTradeGoodsInfo(KwcContractTradeGoods t, Map<Long,