提交物流订单新增字段

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/LogisticsOrderResp.java

@@ -27,6 +27,8 @@ public class LogisticsOrderResp implements Serializable {
      */
     @Schema(description = "物流订单编号")
     private String logisticsOrderNo;
+    @Schema(description = "贸易订单号")
+    private String tradeOrderNo;
     /**
      * 托运单位id
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/QueryLogisticsOrderReq.java

@@ -34,6 +34,9 @@ public class QueryLogisticsOrderReq extends PageReq implements Serializable {
      */
     @Schema(description = "订单编号")
     private String orderNo;
+
+    @Schema(description = "贸易订单号")
+    private String tradeOrderNo;
     /**
      * 商品名称
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtLogisticsOrderRepository.java

@@ -41,6 +41,7 @@ public class KwtLogisticsOrderRepository extends ServiceImpl<KwtLogisticsOrderMa
     }
 
         public IPage<KwtLogisticsOrder> queryByPage(Set<Long> logisticsOrderIds, Long  tradeOrderId, String orderNo,
+                                                    String tradeOrderNo,
                                                     String status,
                                                     Date startTime, Date endTime, int pageNum, int pageSize) {
         return page(new Page<>(pageNum, pageSize),
@@ -50,6 +51,7 @@ public class KwtLogisticsOrderRepository extends ServiceImpl<KwtLogisticsOrderMa
                         .eq(Objects.nonNull(tradeOrderId),KwtLogisticsOrder::getTOrderId, tradeOrderId)
                         .eq(StringUtils.isNotBlank(status),KwtLogisticsOrder::getStatus, status)
                         .like(StringUtils.isNotBlank(orderNo),KwtLogisticsOrder::getLOrderNo, orderNo)
+                        .like(StringUtils.isNotBlank(tradeOrderNo),KwtLogisticsOrder::getTOrderNo, tradeOrderNo)
                         .ge(Objects.nonNull(startTime),KwtLogisticsOrder::getCreateTime, startTime)
                         .le(Objects.nonNull(endTime),KwtLogisticsOrder::getCreateTime, endTime)
                         .orderByDesc(KwtLogisticsOrder::getUpdateTime)

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

@@ -2348,7 +2348,7 @@ public class KwtLogisticsConsignmentService {
             endDate = DateUtils.getEndDate(optimizedReq.getEndTime());
         }
         return logisticsOrderRepository.queryByPage(
-                logOrderIds, optimizedReq.getTradeOrderId(), optimizedReq.getOrderNo(),
+                logOrderIds, optimizedReq.getTradeOrderId(), optimizedReq.getOrderNo(),optimizedReq.getTradeOrderNo(),
                 optimizedReq.getOrderStatus(), startDate,
                 endDate, optimizedReq.getPageNum(), optimizedReq.getPageSize());
     }
@@ -2957,6 +2957,7 @@ public class KwtLogisticsConsignmentService {
                 new KwtLogisticsOrderUnit());
         logisticsOrderResp.setCarriageCompanyId(String.valueOf(carriageCompany.getId()));
         logisticsOrderResp.setCarriageCompanyName(carriageCompany.getFirmName());
+        logisticsOrderResp.setTradeOrderNo(kwtLogisticsOrder.getTOrderNo());
 
         KwtLogisticsOrderGoods goods = finalLogIdAndGoodsMap.getOrDefault(kwtLogisticsOrder.getId(), new KwtLogisticsOrderGoods());
         KwpGoods kwpGoods = finalGoodsIdAndGoodsMap.get(goods.getGoodsId());