提交合同查询接口

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

@@ -261,9 +261,9 @@ public class RemoteContractServiceImpl implements RemoteContractService {
         }
         //物流订单和类型组成唯一key
         Map<String, KwcContractLogisticsUnit> contractLogisticsMap =
-                contractLogistics.stream().peek(c -> c.setContractIdUnitTypeKey(c.getContractId() + "_" + c.getUnitType()))
-                .collect(Collectors.toMap(KwcContractLogisticsUnit::getContractIdUnitTypeKey, Function.identity(), (x,
-                                                                                                                    y) -> x));
+                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());

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/entity/KwcContractLogisticsUnit.java

@@ -90,7 +90,5 @@ public class KwcContractLogisticsUnit implements Serializable {
      */
     private Integer delFlag;
 
-    @TableField(exist = false)
-    private String contractIdUnitTypeKey;
 
 }

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

@@ -1092,9 +1092,8 @@ public class KwcContractLogisticsService {
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(kwcContractLogisticsUnits)){
             //合同id和单位类型组合成key映射物流企业信息
              contractUniTypeAndUnitMap = kwcContractLogisticsUnits.stream()
-                    .peek(k -> k.setContractIdUnitTypeKey(k.getContractId() + "-" + k.getUnitType()))
-                    .collect(Collectors.toMap(KwcContractLogisticsUnit::getContractIdUnitTypeKey, Function.identity(),
-                            (x, y) -> x));
+                    .collect(Collectors.toMap(k->k.getContractId() + "-" + k.getUnitType(),
+                            Function.identity(), (x, y) -> x));
         }
 
         Map<Long, UserCacheResDto> finalLongUserCacheResDtoMap = longUserCacheResDtoMap;
@@ -1331,8 +1330,7 @@ public class KwcContractLogisticsService {
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(kwcContractLogisticsUnits)){
             //合同id和单位类型组合成key映射物流企业信息
             contractUniTypeAndUnitMap = kwcContractLogisticsUnits.stream()
-                    .peek(k -> k.setContractIdUnitTypeKey(k.getContractId() + "-" + k.getUnitType()))
-                    .collect(Collectors.toMap(KwcContractLogisticsUnit::getContractIdUnitTypeKey, Function.identity(),
+                    .collect(Collectors.toMap(k->k.getContractId() + "-" + k.getUnitType(), Function.identity(),
                             (x, y) -> x));
         }
 

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

@@ -1377,33 +1377,6 @@ public class KwcContractTradeService {
             goodsIdAndGoodsMap = goodsInfoService.getGoodsByIds(goodsIds);
 
         }
-        //查询贸易订单
-        KwcContractTradeOrder kwcContractTradeOrder =
-                kwcContractTradeOrderRepository.queryByContractId(kwcContractTrade.getId());
-
-        //根据贸易订单号查询贸易订单信息
-        OrderDetailVo orderDetailVo = tradeOrderInfoService.queryByTradeOrderId(kwcContractTrade.getId());
-        //查询运单信息
-        List<RWaybillSubOrderVo> rWaybillSubOrderVos = transportRemoteService.queryWaybillOrderByTradeOrderIds(Set.of(kwcContractTrade.getId()));
-        Map<Long, RWaybillSubOrderVo> tradeOrderIdAndSubOrderVoMap = Maps.newHashMap();
-        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(rWaybillSubOrderVos)){
-           tradeOrderIdAndSubOrderVoMap =
-                    rWaybillSubOrderVos.stream().collect(Collectors.toMap(RWaybillSubOrderVo::getTradeId, Function.identity(), (k1, k2) -> k1));
-        }
-
-        //查询物流合同
-        List<KwcContractLogisticsUnit> kwcContractLogisticsUnits = kwcContractLogisticsUnitRepository.queryByContractId(kwcContractTrade.getId());
-        //合同id和单位类型组合成key映射物流对象
-        Map<String, KwcContractLogisticsUnit> contractIdUnitTypeKeyAndUnitMap = kwcContractLogisticsUnits.stream()
-                .peek(x -> x.setContractIdUnitTypeKey(x.getContractId() + "-" + x.getUnitType()))
-                .collect(Collectors.toMap(KwcContractLogisticsUnit::getContractIdUnitTypeKey, Function.identity(), (x, y) -> x));
-
-        //查询物流商品
-        List<KwcContractLogisticsGoods> kwcContractLogisticsGoods = kwcContractLogisticsGoodsRepository.queryByContractId(kwcContractTrade.getId());
-        //合同id和商品id组成唯一key映射物流信息
-        Map<String, KwcContractLogisticsGoods> contractIdGoodsIdKeyAndGoodsMap = kwcContractLogisticsGoods.stream()
-                .peek(x -> x.setContractIdGoodsIdKey(x.getContractId() + "-" + x.getGoodsId()))
-                .collect(Collectors.toMap(KwcContractLogisticsGoods::getContractIdGoodsIdKey, Function.identity(), (x, y) -> x));
 
         ContractDetailResp contractDetailResp = new ContractDetailResp();
         contractDetailResp.setId(kwcContractTrade.getId());
@@ -1422,98 +1395,13 @@ public class KwcContractTradeService {
                     .collect(Collectors.toList());
             contractDetailResp.setGoodsInfo(tradeGoodsInfos);
         }
-//        //获取关联贸易订单
-//        ContractDetailResp.AssociatedOrder associatedOrder = getAssociateOrder(kwcContractTradeOrder,orderDetailVo,
-//                ctTypeKeyAndUnitMap,
-//                kwcContractTrade, contractIdUnitTypeKeyAndUnitMap, goodsIdAndGoodsMap,
-//                contractIdGoodsIdKeyAndGoodsMap,tradeOrderIdAndSubOrderVoMap);
-//        contractDetailResp.setAssociatedOrder(associatedOrder);
+
 
         contractDetailResp.setRemark(kwcContractTrade.getRemark());
 
         return contractDetailResp;
     }
 
-//    private static ContractDetailResp.AssociatedOrder getAssociateOrder(KwcContractTradeOrder kwcContractTradeOrder,OrderDetailVo orderDetailVo, Map<String,
-//            KwcContractTradeUnit> ctTypeKeyAndUnitMap, KwcContractTrade kwcContractTrade, Map<String, KwcContractLogisticsUnit> contractIdUnitTypeKeyAndUnitMap,
-//                                                                        Map<Long, KwpGoods> goodsIdAndGoodsMap, Map<String, KwcContractLogisticsGoods> contractIdGoodsIdKeyAndGoodsMap
-//    ,Map<Long, RWaybillSubOrderVo> tradeOrderIdAndSubOrderVoMap) {
-//        ContractDetailResp.AssociatedOrder associatedOrder = new ContractDetailResp.AssociatedOrder();
-//        if (Objects.nonNull(kwcContractTradeOrder)){
-//            associatedOrder.setOrderId(kwcContractTradeOrder.getOrderId());
-//            associatedOrder.setOrderStatus(kwcContractTradeOrder.getStatus());
-//            associatedOrder.setOrderCode(kwcContractTradeOrder.getOrderNo());
-//            KwcContractTradeUnit purchaseUnit =
-//                    ctTypeKeyAndUnitMap.getOrDefault(kwcContractTrade.getId() + "-" + CooperateTypeEnum.PURCHASER.getCode(), new KwcContractTradeUnit());
-//
-//
-//            KwcContractTradeUnit provideUnit =
-//                    ctTypeKeyAndUnitMap.getOrDefault(kwcContractTrade.getId() + "-" + CooperateTypeEnum.SUPPLIER.getCode(), new KwcContractTradeUnit());
-//
-//            associatedOrder.setPurchaseEntId(purchaseUnit.getEntId());
-//            associatedOrder.setPurchaseEntName(purchaseUnit.getFirmName());
-//            associatedOrder.setProvideEntId(provideUnit.getEntId());
-//            associatedOrder.setProvideEntName(provideUnit.getFirmName());
-//
-//            KwcContractLogisticsUnit logisticsUnit =
-//                    contractIdUnitTypeKeyAndUnitMap.get(kwcContractTrade.getId() + "-" + CooperateTypeEnum.CONSIGN.getCode());
-//            if (Objects.nonNull(logisticsUnit)){
-//                associatedOrder.setTransportEntId(logisticsUnit.getEntId());
-//                associatedOrder.setTransportEntName(logisticsUnit.getFirmName());
-//            }
-//            KwcContractLogisticsUnit logisticsCarrigeUnit =
-//                    contractIdUnitTypeKeyAndUnitMap.get(kwcContractTrade.getId() + "-" + CooperateTypeEnum.CARRIAGE.getCode());
-//            if (Objects.nonNull(logisticsCarrigeUnit)){
-//                associatedOrder.setTransportEntId(logisticsCarrigeUnit.getEntId());
-//                associatedOrder.setTransportEntName(logisticsCarrigeUnit.getFirmName());
-//            }
-//            OrderDetailVo.GoodsInfo goodsInfo = orderDetailVo.getGoodsInfo();
-//            if (Objects.nonNull(goodsInfo)){
-//                associatedOrder.setGoodsId(goodsInfo.getGoodsId());
-//                KwpGoods goods = goodsIdAndGoodsMap.getOrDefault(goodsInfo.getGoodsId(), new KwpGoods());
-//                associatedOrder.setGoodsName(goods.getName());
-//            }
-//
-//
-//            associatedOrder.setBillingWay(orderDetailVo.getChargeType());
-//            associatedOrder.setBillingWayDesc(DictEnum.getLabel(DictTypeEnum.CHARGING_TYPE.getType(),
-//                    String.valueOf(orderDetailVo.getChargeType())));
-//            associatedOrder.setAmount(Objects.nonNull(orderDetailVo.getAmount()) ?
-//                    orderDetailVo.getAmount().toPlainString() : null);
-//            RWaybillSubOrderVo rWaybillSubOrderVo = tradeOrderIdAndSubOrderVoMap.get(kwcContractTrade.getId());
-//            List<RWaybillSubOrderVo.BillSubOrder> subOrders = rWaybillSubOrderVo.getSubOrders();
-//
-//            if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(subOrders)){
-//                String loadAmount = subOrders.stream()
-//                        .map(RWaybillSubOrderVo.BillSubOrder::getLoadAmount)
-//                        .filter(Objects::nonNull)
-//                        .reduce(BigDecimal.ZERO, BigDecimal::add).toPlainString();
-//                associatedOrder.setLoadAmount(loadAmount);
-//                String unloadAmount = subOrders.stream()
-//                        .map(RWaybillSubOrderVo.BillSubOrder::getUnloadAmount)
-//                        .filter(Objects::nonNull)
-//                        .reduce(BigDecimal.ZERO, BigDecimal::add).toPlainString();
-//                associatedOrder.setUnloadAmount(unloadAmount);
-//            }
-//
-//
-//            List<OrderDetailVo.AddressInfo> addressInfos = orderDetailVo.getAddressInfo();
-//            Map<String, OrderDetailVo.AddressInfo> tradeOrderIdAndUnitTypeKeyAndUnitMap = Maps.newHashMap() ;
-//            if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(addressInfos)){
-//               tradeOrderIdAndUnitTypeKeyAndUnitMap =
-//                        addressInfos.stream().peek(x -> x.setTradeOrderIdTypeKey(x.getTOrderId() + "-" + x.getAddressType()))
-//                        .collect(Collectors.toMap(OrderDetailVo.AddressInfo::getTradeOrderIdTypeKey, Function.identity(), (x, y) -> x));
-//            }
-//
-//            associatedOrder.setTransportPrice(Objects.nonNull(orderDetailVo.getPrice()) ?
-//                    orderDetailVo.getPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : null);
-//            OrderDetailVo.AddressInfo loadAdd = tradeOrderIdAndUnitTypeKeyAndUnitMap.getOrDefault(kwcContractTradeOrder.getContractId() + "-" + AddressTypeEnum.SHIPMENT.getCode(), new OrderDetailVo.AddressInfo());
-//            associatedOrder.setLoadAddress(loadAdd.getDetailAddress());
-//            OrderDetailVo.AddressInfo unloadAdd = tradeOrderIdAndUnitTypeKeyAndUnitMap.getOrDefault(kwcContractTradeOrder.getContractId() + "-" + AddressTypeEnum.SHIPMENT.getCode(), new OrderDetailVo.AddressInfo());
-//            associatedOrder.setUnloadAddress(unloadAdd.getDetailAddress());
-//        }
-//        return associatedOrder;
-//    }
 
     private static ContractDetailResp.TradeGoodsInfo getTradeGoodsInfo(KwcContractTradeGoods t, Map<Long,
             KwpGoods> finalGoodsIdAndGoodsMap) {

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtLogisticsOrderUnit.java

@@ -92,6 +92,5 @@ public class KwtLogisticsOrderUnit implements Serializable {
     private Integer delFlag;
 
     private static final long serialVersionUID = 1L;
-    @TableField(exist = false)
-    private String logisticsOrderIdAndUnitTypeKey;
+
 }

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

@@ -2247,8 +2247,7 @@ public class KwtLogisticsConsignmentService {
         Map<String, KwtLogisticsOrderUnit> logOrderIdAndUnitTypeKeyAndUnitMap = Maps.newHashMap();
         if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(unitList)){
             logOrderIdAndUnitTypeKeyAndUnitMap = unitList.stream()
-                    .peek(x -> x.setLogisticsOrderIdAndUnitTypeKey(x.getLOrderId() + "-" + x.getUnitType()))
-                    .collect(Collectors.toMap(KwtLogisticsOrderUnit::getLogisticsOrderIdAndUnitTypeKey,
+                    .collect(Collectors.toMap(x -> x.getLOrderId() + "-" + x.getUnitType(),
                             Function.identity(), (x, y) -> x));
         }
         //查询商品信息
@@ -2280,8 +2279,8 @@ public class KwtLogisticsConsignmentService {
         Map<Long, KwtLogisticsOrderContract> finalLogOrderIdAndContractMap = logOrderIdAndContractMap;
 
         List<LogisticsOrderResp> resps = records.stream()
-                .map(x ->getLogisticsOrderResp(x,
-                finalLogOrderIdAndUnitTypeKeyAndUnitMap, finalLogIdAndGoodsMap, finalGoodsIdAndGoodsMap, finalLogisticsOrderIdAndUnitTypeKeyAndAddressMap, finalLogOrderIdAndContractMap))
+                .map(x ->getLogisticsOrderResp(x, finalLogOrderIdAndUnitTypeKeyAndUnitMap, finalLogIdAndGoodsMap
+                        , finalGoodsIdAndGoodsMap, finalLogisticsOrderIdAndUnitTypeKeyAndAddressMap, finalLogOrderIdAndContractMap))
                 .collect(Collectors.toList());
 
         return PageDataResult.of(page,resps);
@@ -2379,7 +2378,12 @@ public class KwtLogisticsConsignmentService {
     }
 
     @NotNull
-    private static LogisticsOrderResp getLogisticsOrderResp(KwtLogisticsOrder kwtLogisticsOrder, Map<String, KwtLogisticsOrderUnit> finalLogOrderIdAndUnitTypeKeyAndUnitMap, Map<Long, KwtLogisticsOrderGoods> finalLogIdAndGoodsMap, Map<Long, KwpGoods> finalGoodsIdAndGoodsMap, Map<String, KwtLogisticsOrderAddress> finalLogisticsOrderIdAndUnitTypeKeyAndAddressMap, Map<Long, KwtLogisticsOrderContract> finalLogOrderIdAndContractMap) {
+    private static LogisticsOrderResp getLogisticsOrderResp(KwtLogisticsOrder kwtLogisticsOrder,
+                                                            Map<String, KwtLogisticsOrderUnit> finalLogOrderIdAndUnitTypeKeyAndUnitMap,
+                                                            Map<Long, KwtLogisticsOrderGoods> finalLogIdAndGoodsMap,
+                                                            Map<Long, KwpGoods> finalGoodsIdAndGoodsMap,
+                                                            Map<String, KwtLogisticsOrderAddress> finalLogisticsOrderIdAndUnitTypeKeyAndAddressMap,
+                                                            Map<Long, KwtLogisticsOrderContract> finalLogOrderIdAndContractMap) {
         LogisticsOrderResp logisticsOrderResp = new LogisticsOrderResp();
         logisticsOrderResp.setLogisticsOrderId(String.valueOf(kwtLogisticsOrder.getId()));
         logisticsOrderResp.setLogisticsOrderNo(kwtLogisticsOrder.getLOrderNo());
@@ -2394,7 +2398,7 @@ public class KwtLogisticsConsignmentService {
         logisticsOrderResp.setCarriageCompanyName(carriageCompany.getFirmName());
 
         KwtLogisticsOrderGoods goods = finalLogIdAndGoodsMap.getOrDefault(kwtLogisticsOrder.getId(), new KwtLogisticsOrderGoods());
-        KwpGoods kwpGoods = finalGoodsIdAndGoodsMap.getOrDefault(goods.getId(), new KwpGoods());
+        KwpGoods kwpGoods = finalGoodsIdAndGoodsMap.getOrDefault(goods.getGoodsId(), new KwpGoods());
         logisticsOrderResp.setGoodsId(String.valueOf(goods.getId()));
         logisticsOrderResp.setGoodsName(kwpGoods.getName());
         logisticsOrderResp.setTransportPrice(Objects.nonNull(kwtLogisticsOrder.getPrice()) ? kwtLogisticsOrder.getPrice().setScale(2,
@@ -2450,8 +2454,7 @@ public class KwtLogisticsConsignmentService {
         Map<String, KwtLogisticsOrderUnit> logOrderIdUnitTypeKeyAndUnitMap = Maps.newHashMap();
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(unitList)){
             logOrderIdUnitTypeKeyAndUnitMap = unitList.stream()
-                    .peek(x -> x.setLogisticsOrderIdAndUnitTypeKey(x.getLOrderId() + "-" + x.getUnitType()))
-                    .collect(Collectors.toMap(KwtLogisticsOrderUnit::getLogisticsOrderIdAndUnitTypeKey, Function.identity(), (v1, v2) -> v1));
+                    .collect(Collectors.toMap(x -> x.getLOrderId() + "-" + x.getUnitType(), Function.identity(), (v1, v2) -> v1));
 
         }
 

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

@@ -3020,8 +3020,8 @@ public class KwtWaybillOrderV1Service {
         Map<String, KwtLogisticsOrderUnit> logOrderIdUnitTypeKeyAndUnitMap = Maps.newHashMap();
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(logisticsOrderUnits)){
             logOrderIdUnitTypeKeyAndUnitMap =
-                    logisticsOrderUnits.stream().peek(x -> x.setLogisticsOrderIdAndUnitTypeKey(x.getLOrderId() + "-" + x.getUnitType()))
-                    .collect(Collectors.toMap(KwtLogisticsOrderUnit::getLogisticsOrderIdAndUnitTypeKey,
+                    logisticsOrderUnits.stream()
+                    .collect(Collectors.toMap(x -> x.getLOrderId() + "-" + x.getUnitType(),
                             Function.identity(), (k1, k2) -> k1));
         }
         return logOrderIdUnitTypeKeyAndUnitMap;