订单合同新增接口

sckw-common/sckw-common-remote/src/main/java/com/sckw/remote/annotation/SckwRemoteApplication.java

@@ -11,6 +11,8 @@ import java.lang.annotation.*;
 @Inherited
 @EnableDubbo
 @EnableFeignClients({"com.sckw.*.api.feign"})
-@ComponentScan(basePackages = {"com.sckw.file.config","com.sckw.payment.config","com.sckw.fleet.config","com.sckw" + ".remote.filter","com.sckw.*.controller", "com.sckw.*.service","com.sckw.*.repository", "com.sckw.*.dubbo", "com.sckw.*.model","com.sckw.transport.*"})
+@ComponentScan(basePackages = {"com.sckw.file.config","com.sckw.payment.config","com.sckw.fleet.config","com.sckw" +
+        ".remote.filter","com.sckw.*.controller", "com.sckw.*.service","com.sckw.*.repository", "com.sckw.*.dubbo",
+        "com.sckw.*.model","com.sckw.transport.*","com.sckw.*.serivce"})
 public @interface SckwRemoteApplication {
 }

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

@@ -58,10 +58,11 @@ public class KwcContractSaleController {
      */
     @PostMapping("/queryTradeListByPage")
     @Operation(summary = "分页查询贸易合同")
-    public BaseResult<PageDataResult<QueryListResVo>> queryTradeByPage(@RequestBody QueryTradeReq req) {
+    public BaseResult<PageDataResult<QueryListResVo>> queryTradeListByPage(@RequestBody QueryTradeReq req) {
         //reqVo.setEntType(EntTypeEnum.SUPPLIER.getCode());
-        //return BaseResult.success(kwcContractTradeService.queryListByPage(reqVo));
-        return null;
+        return BaseResult.success(kwcContractTradeService.queryTradeListByPage(req));
+       // return PageDataResult.success(kwcContractTradeService.queryTradeByPage(req));
+        //return null;
     }
 
 

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/req/ContractDetailReq.java

@@ -22,11 +22,12 @@ public class ContractDetailReq implements Serializable {
      * 合同编号
      */
     @Schema(description = "合同编号")
-    @NotBlank(message = "合同编号不能为空")
+
     private String contractCode;
     /**
      * 物流合同id
      */
     @Schema(description = "物流合同id")
-    private Long contractId;
+    @NotBlank(message = "合同id不能为空")
+    private String contractId;
 }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/req/QueryTradeReq.java

@@ -1,5 +1,7 @@
 package com.sckw.contract.model.vo.req;
 
+import com.sckw.core.web.request.PageReq;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serial;
@@ -12,7 +14,37 @@ import java.io.Serializable;
  * @create :2025-11-10 11:14:00
  */
 @Data
-public class QueryTradeReq implements Serializable {
+public class QueryTradeReq extends PageReq implements Serializable {
     @Serial
     private static final long serialVersionUID = 2211511377945341272L;
+    /**
+     * 合同编号
+     */
+    @Schema(description = "合同编号")
+    private String contractCode;
+    /**
+     * 合同名称
+     */
+    @Schema(description = "合同名称")
+    private String contractName;
+    /**
+     * 补充合同编号
+     */
+    @Schema(description = "补充合同编号")
+    private String supplementCode;
+    /**
+     * 采购单位id
+     */
+    @Schema(description = "采购单位id")
+    private String purchaseEntId;
+    /**
+     * 供应单位id
+     */
+    @Schema(description = "供应单位id")
+    private String supplyEntId;
+    /**
+     * 合同状态  0已签约 1已完结 2已保存（草稿） 3签约中
+     */
+    @Schema(description = "合同状态")
+    private Integer status;
 }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/res/ContractDetailResp.java

@@ -56,8 +56,8 @@ public class ContractDetailResp implements Serializable {
     @Schema(description = "标的信息")
     private List<TradeGoodsInfo> goodsInfo;
 
-    @Schema(description = "关联贸易订单")
-    private AssociatedOrder associatedOrder;
+//    @Schema(description = "关联贸易订单")
+//    private AssociatedOrder associatedOrder;
 
     /**
      * 备注
@@ -229,103 +229,103 @@ public class ContractDetailResp implements Serializable {
         @Schema(description = "生效结束时间")
         private Date effectiveEntTime;
     }
-    @Data
-    public static class AssociatedOrder implements Serializable{
-        @Serial
-        private static final long serialVersionUID = 3157352506945080734L;
-        /**
-         * 订单id
-         */
-        @Schema(description = "订单id")
-        private Long orderId;
-        /**
-         * 订单状态
-         */
-        @Schema(description = "订单状态")
-        private Integer orderStatus;
-        /**
-         * 订单编号
-         */
-        @Schema(description = "订单编号")
-        private String orderCode;
-        /**
-         * 采购单位id
-         */
-        @Schema(description = "采购单位id")
-        private Long purchaseEntId;
-        /**
-         * 采购单位名称
-         */
-        @Schema(description = "采购单位名称")
-        private String purchaseEntName;
-        /**
-         * 供应单位id
-         */
-        @Schema(description = "供应单位id")
-        private Long provideEntId;
-        /**
-         * 供应单位名称
-         */
-        @Schema(description = "供应单位名称")
-        private String provideEntName;
-        /**
-         * 运输单位id
-         */
-        @Schema(description = "运输单位id")
-        private Long transportEntId;
-        /**
-         * 运输单位名称
-         */
-        @Schema(description = "运输单位名称")
-        private String transportEntName;
-        /**
-         * 商品id
-         */
-        @Schema(description = "商品id")
-        private Long goodsId;
-        /**
-         * 商品名称
-         */
-        @Schema(description = "商品名称")
-        private String goodsName;
-        /**
-         * 计费方式
-         */
-        @Schema(description = "计费方式")
-        private Integer billingWay;
-        /**
-         * 计费方式描述
-         */
-        @Schema(description = "计费方式描述")
-        private String billingWayDesc;
-        /**
-         * 下单量
-         */
-        @Schema(description = "下单量")
-        private String amount;
-        /**
-         * 累计装货量
-         */
-        @Schema(description = "累计装货量")
-        private String loadAmount;
-        /**
-         * 累计卸货量
-         */
-        @Schema(description = "累计卸货量")
-        private String unloadAmount;
-        /**
-         * 运输单价
-         */
-        private String transportPrice;
-        /**
-         * 装货地址
-         */
-        @Schema(description = "装货地址")
-        private String loadAddress;
-        /**
-         * 卸货地址
-         */
-        @Schema(description = "卸货地址")
-        private String unloadAddress;
-    }
+//    @Data
+//    public static class AssociatedOrder implements Serializable{
+//        @Serial
+//        private static final long serialVersionUID = 3157352506945080734L;
+//        /**
+//         * 订单id
+//         */
+//        @Schema(description = "订单id")
+//        private Long orderId;
+//        /**
+//         * 订单状态
+//         */
+//        @Schema(description = "订单状态")
+//        private Integer orderStatus;
+//        /**
+//         * 订单编号
+//         */
+//        @Schema(description = "订单编号")
+//        private String orderCode;
+//        /**
+//         * 采购单位id
+//         */
+//        @Schema(description = "采购单位id")
+//        private Long purchaseEntId;
+//        /**
+//         * 采购单位名称
+//         */
+//        @Schema(description = "采购单位名称")
+//        private String purchaseEntName;
+//        /**
+//         * 供应单位id
+//         */
+//        @Schema(description = "供应单位id")
+//        private Long provideEntId;
+//        /**
+//         * 供应单位名称
+//         */
+//        @Schema(description = "供应单位名称")
+//        private String provideEntName;
+//        /**
+//         * 运输单位id
+//         */
+//        @Schema(description = "运输单位id")
+//        private Long transportEntId;
+//        /**
+//         * 运输单位名称
+//         */
+//        @Schema(description = "运输单位名称")
+//        private String transportEntName;
+//        /**
+//         * 商品id
+//         */
+//        @Schema(description = "商品id")
+//        private Long goodsId;
+//        /**
+//         * 商品名称
+//         */
+//        @Schema(description = "商品名称")
+//        private String goodsName;
+//        /**
+//         * 计费方式
+//         */
+//        @Schema(description = "计费方式")
+//        private Integer billingWay;
+//        /**
+//         * 计费方式描述
+//         */
+//        @Schema(description = "计费方式描述")
+//        private String billingWayDesc;
+//        /**
+//         * 下单量
+//         */
+//        @Schema(description = "下单量")
+//        private String amount;
+//        /**
+//         * 累计装货量
+//         */
+//        @Schema(description = "累计装货量")
+//        private String loadAmount;
+//        /**
+//         * 累计卸货量
+//         */
+//        @Schema(description = "累计卸货量")
+//        private String unloadAmount;
+//        /**
+//         * 运输单价
+//         */
+//        private String transportPrice;
+//        /**
+//         * 装货地址
+//         */
+//        @Schema(description = "装货地址")
+//        private String loadAddress;
+//        /**
+//         * 卸货地址
+//         */
+//        @Schema(description = "卸货地址")
+//        private String unloadAddress;
+//    }
 }

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

@@ -27,7 +27,7 @@ public class KwcContractTradeRepository extends ServiceImpl<KwcContractTradeMapp
     public KwcContractTrade queryByContractId( Long contractId) {
         return getOne(Wrappers.<KwcContractTrade>lambdaQuery()
                 .eq(KwcContractTrade::getDelFlag, 0)
-                .eq(KwcContractTrade::getContractNo, contractId)
+                .eq(KwcContractTrade::getId, contractId)
                 .last("limit 1"));
     }
 

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

@@ -1315,7 +1315,7 @@ public class KwcContractLogisticsService {
         if (Objects.isNull(req.getContractId())){
             throw new BusinessException("物流合同id不能为空");
         }
-        KwcContractLogistics logistics = kwcContractLogisticsRepository.queryById(req.getContractId());
+        KwcContractLogistics logistics = kwcContractLogisticsRepository.queryById(Long.valueOf(req.getContractId()));
         if (Objects.isNull(logistics)){
             throw new BusinessException("物流合同不存在");
         }

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

@@ -106,7 +106,7 @@ public class KwcContractTradeService {
 
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private TradeOrderInfoService tradeOrderInfoService;
-    @DubboReference(version = "1.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 8000)
     private TransportRemoteService transportRemoteService;
 
     /**销售合同*/
@@ -1342,7 +1342,7 @@ public class KwcContractTradeService {
     public ContractDetailResp queryContractDetail(@Valid ContractDetailReq req) {
         log.info("查询合同详情，请求参数 :{}", JSON.toJSONString(req));
         //查询本地商品合同信息
-        KwcContractTrade kwcContractTrade = kwcContractTradeRepository.queryByContractNo(req.getContractCode());
+        KwcContractTrade kwcContractTrade = kwcContractTradeRepository.queryByContractId(Long.valueOf(req.getContractId()));
         if (Objects.isNull(kwcContractTrade)) {
             return new ContractDetailResp();
         }
@@ -1419,98 +1419,98 @@ 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.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.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) {
@@ -1559,4 +1559,10 @@ public class KwcContractTradeService {
         tradeBaseInfo.setSalesmanPhone(kwcContractTrade.getSalesmanPhone());
         return tradeBaseInfo;
     }
+
+    public PageDataResult<QueryListResVo> queryTradeListByPage(QueryTradeReq req) {
+        //分页查询合同信息
+       // PageDataResult<QueryListResVo> pageDataResult = kwcContractTradeRepository.queryTradeListByPage(req);
+        return null;
+    }
 }

sckw-modules/sckw-order/src/main/java/com/sckw/order/controller/TradeOrderManageController.java

@@ -11,6 +11,8 @@ import com.sckw.order.model.vo.req.*;
 import com.sckw.order.model.vo.res.QueryTradeOrderResp;
 import com.sckw.order.model.vo.res.TradeOrderDetailResp;
 import com.sckw.order.serivce.TradeOrderManageService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.AllArgsConstructor;
 import org.springframework.http.MediaType;
@@ -30,6 +32,7 @@ import java.util.List;
 @AllArgsConstructor
 @RestController
 @RequestMapping("/kwOrderManage")
+@Tag(name = "贸易订单管理")
 public class TradeOrderManageController {
 
     private final TradeOrderManageService tradeOrderManageService;
@@ -93,6 +96,7 @@ public class TradeOrderManageController {
      * 分页查询贸易订单
      */
     @PostMapping(value = "/pageQueryTradeOrder")
+    @Operation(summary = "分页查询贸易订单")
     public BaseResult<PageDataResult<QueryTradeOrderResp>> pageQueryTradeOrder(@RequestBody @Validated QueryTradeOrderReq req) {
         return BaseResult.success(tradeOrderManageService.pageQueryTradeOrder(req));
     }
@@ -101,6 +105,7 @@ public class TradeOrderManageController {
      * 获取贸易订单详情
      */
     @PostMapping(value = "/getTradeOrderDetail")
+    @Operation(summary = "获取贸易订单详情")
     public BaseResult<TradeOrderDetailResp> getTradeOrderDetail(@RequestBody @Validated TradeOrderDetailReq req) {
         return BaseResult.success(tradeOrderManageService.getTradeOrderDetail(req));
     }

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/QueryTradeOrderReq.java

@@ -19,6 +19,11 @@ import java.io.Serializable;
 public class QueryTradeOrderReq extends PageReq implements Serializable {
     @Serial
     private static final long serialVersionUID = -1255552097881890061L;
+    /**
+     * 贸易合同id
+     */
+    @Schema(description = "贸易合同id")
+    private String tradeOrderId;
     /**
      * 订单编号
      */

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/res/QueryTradeOrderResp.java

@@ -78,6 +78,7 @@ public class QueryTradeOrderResp  implements Serializable {
     /**
      * 计费方式描述
      */
+    @Schema(description = "计费方式描述")
     private String chargeTypeDesc;
 
     /**

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/TradeOrderManageService.java

@@ -211,6 +211,9 @@ public class TradeOrderManageService {
                     .map(KwoTradeOrderGoods::getTOrderId)
                     .toList();
         }
+        if (StringUtils.isNotBlank(req.getTradeOrderId())){
+            orderIds.add(Long.valueOf(req.getTradeOrderId()));
+        }
 
         //分页查询订单
         IPage<KwoTradeOrder> page = tradeOrderRepository.queryByPage(orderIds,req.getOrderNo(),req.getOrderStartTime(),