提交630物流订单相关逻辑

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

@@ -260,4 +260,9 @@ public class AddLogisticOrderParam implements Serializable {
      */
     private String goodsUnit;
 
+    /**
+     * 是否代理属性：0-否，1-是
+     */
+    private Integer agentFlag;
+
 }

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

@@ -2957,6 +2957,7 @@ public class KwoTradeOrderService {
         addLogisticOrderParam.setEntId(LoginUserHolder.getEntId());
         addLogisticOrderParam.setUserId(LoginUserHolder.getUserId());
         addLogisticOrderParam.setMeasurementWay(tradeContractResDto.getMeasurementWay());
+        addLogisticOrderParam.setAgentFlag(kwoTradeOrder.getAgentFlag());
         log.info("创建物流订单：{}", JSONObject.toJSONString(addLogisticOrderParam));
         Integer result = transportRemoteService.addLogisticOrder(addLogisticOrderParam);
         //自动派单运力不足
@@ -3404,6 +3405,7 @@ public class KwoTradeOrderService {
         addLogisticOrderParam.setEntId(LoginUserHolder.getEntId());
         addLogisticOrderParam.setUserId(LoginUserHolder.getUserId());
         addLogisticOrderParam.setDispatchWay(DispatchWayEnums.MANUAL_DISPATCH.getCode());
+        addLogisticOrderParam.setAgentFlag(kwoTradeOrder.getAgentFlag());
         log.info("创建物流订单：{}", JSONObject.toJSONString(addLogisticOrderParam));
         transportRemoteService.addLogisticOrder(addLogisticOrderParam);
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dubbo/TransportServiceImpl.java

@@ -1331,6 +1331,7 @@ public class TransportServiceImpl implements TransportRemoteService {
         addLogisticOrderDTO.setActualDisPatch(param.getActualDisPatch());
         addLogisticOrderDTO.setGoodsUnit(param.getGoodsUnit());
         addLogisticOrderDTO.setMeasurementWay(param.getMeasurementWay());
+        addLogisticOrderDTO.setAgentFlag(param.getAgentFlag());
         return addLogisticOrderDTO;
     }
 

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

@@ -254,9 +254,15 @@ public class KwtLogisticsOrder implements Serializable {
     @TableField("measurement_way")
     private Integer measurementWay;
 
+    /**
+     * 是否代理属性：0-否，1-是
+     */
+    @TableField("agent_flag")
+    private Integer agentFlag;
+
     private static final long serialVersionUID = 1L;
 
     @TableField(exist = false)
     private String yearAndMonth;
 
-}
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/AddLogisticOrderDTO.java

@@ -256,4 +256,8 @@ public class AddLogisticOrderDTO implements Serializable {
      * 商品单位
      */
     private String goodsUnit;
+    /**
+     * 是否代理属性：0-否，1-是
+     */
+    private Integer agentFlag;
 }

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

@@ -199,4 +199,15 @@ public class LogisticsOrderResp implements Serializable {
     @Schema(description = "订单余量")
     private BigDecimal remainingAmount;
 
+    /**
+     * 是否代理属性：0-否，1-是
+     */
+    @Schema(description = "是否代理属性：0-否，1-是")
+    private Integer agentFlag;
+
+    /**
+     * 是否代理属性描述
+     */
+    @Schema(description = "是否代理属性描述")
+    private String agentFlagDesc;
 }

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

@@ -77,4 +77,9 @@ public class QueryLogisticsOrderReq extends PageReq implements Serializable {
      */
     @Schema(description = "订单状态")
     private String orderStatus;
+    /**
+     * 是否代理属性：0-否，1-是
+     */
+    @Schema(description = "是否代理属性：0-否，1-是")
+    private Integer agentFlag;
 }

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

@@ -43,6 +43,7 @@ public class KwtLogisticsOrderRepository extends ServiceImpl<KwtLogisticsOrderMa
         public IPage<KwtLogisticsOrder> queryByPage(Set<Long> logisticsOrderIds, Long  tradeOrderId, String orderNo,
                                                     String tradeOrderNo,
                                                     String status,
+                                                    Integer agentFlag,
                                                     Date startTime, Date endTime, int pageNum, int pageSize) {
         return page(new Page<>(pageNum, pageSize),
                 Wrappers.<KwtLogisticsOrder>lambdaQuery()
@@ -50,6 +51,7 @@ public class KwtLogisticsOrderRepository extends ServiceImpl<KwtLogisticsOrderMa
                         .in(CollectionUtils.isNotEmpty(logisticsOrderIds), KwtLogisticsOrder::getId, logisticsOrderIds)
                         .eq(Objects.nonNull(tradeOrderId),KwtLogisticsOrder::getTOrderId, tradeOrderId)
                         .eq(StringUtils.isNotBlank(status),KwtLogisticsOrder::getStatus, status)
+                        .eq(Objects.nonNull(agentFlag), KwtLogisticsOrder::getAgentFlag, agentFlag)
                         .like(StringUtils.isNotBlank(orderNo),KwtLogisticsOrder::getLOrderNo, orderNo)
                         .like(StringUtils.isNotBlank(tradeOrderNo),KwtLogisticsOrder::getTOrderNo, tradeOrderNo)
                         .ge(Objects.nonNull(startTime),KwtLogisticsOrder::getCreateTime, startTime)
@@ -108,12 +110,14 @@ public class KwtLogisticsOrderRepository extends ServiceImpl<KwtLogisticsOrderMa
                 .eq(KwtLogisticsOrder::getBillingMode, billingMethod));
     }
 
-    public List<KwtLogisticsOrder> queryList( Set<Long> logOrderIds, Long tradeOrderId, String orderNo, String orderStatus, String startTime, String endTime) {
+    public List<KwtLogisticsOrder> queryList( Set<Long> logOrderIds, Long tradeOrderId, String orderNo, String orderStatus,
+                                             Integer agentFlag, String startTime, String endTime) {
         return list(Wrappers.<KwtLogisticsOrder>lambdaQuery()
                 .eq(KwtLogisticsOrder::getDelFlag,0)
                 .in(CollectionUtils.isNotEmpty(logOrderIds), KwtLogisticsOrder::getId, logOrderIds)
                 .eq(Objects.nonNull(tradeOrderId),KwtLogisticsOrder::getTOrderId, tradeOrderId)
                 .eq(StringUtils.isNotBlank(orderStatus),KwtLogisticsOrder::getStatus, orderStatus)
+                .eq(Objects.nonNull(agentFlag), KwtLogisticsOrder::getAgentFlag, agentFlag)
                 .ge(StringUtils.isNotBlank(startTime),KwtLogisticsOrder::getLoadTime, startTime)
                 .le(StringUtils.isNotBlank(startTime),KwtLogisticsOrder::getUnloadTime, endTime)
                 .like(StringUtils.isNotBlank(orderNo),KwtLogisticsOrder::getLOrderNo, orderNo)

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

@@ -3706,6 +3706,7 @@ public class KwtAcceptCarriageOrderService {
         kwtLogisticsOrder.setDispatchWay(orderDTO.getDispatchWay());
         kwtLogisticsOrder.setDistance(distance);
         kwtLogisticsOrder.setMeasurementWay(orderDTO.getMeasurementWay());
+        kwtLogisticsOrder.setAgentFlag(orderDTO.getAgentFlag());
         saveLogisticsOrderList.add(kwtLogisticsOrder);
     }
 

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

@@ -2359,7 +2359,7 @@ public class KwtLogisticsConsignmentService {
         }
         return logisticsOrderRepository.queryByPage(
                 logOrderIds, optimizedReq.getTradeOrderId(), optimizedReq.getOrderNo(),optimizedReq.getTradeOrderNo(),
-                optimizedReq.getOrderStatus(), startDate,
+                optimizedReq.getOrderStatus(), optimizedReq.getAgentFlag(), startDate,
                 endDate, optimizedReq.getPageNum(), optimizedReq.getPageSize());
     }
 
@@ -3072,6 +3072,8 @@ public class KwtLogisticsConsignmentService {
         LogisticsOrderResp logisticsOrderResp = new LogisticsOrderResp();
         logisticsOrderResp.setLogisticsOrderId(String.valueOf(kwtLogisticsOrder.getId()));
         logisticsOrderResp.setLogisticsOrderNo(kwtLogisticsOrder.getLOrderNo());
+        logisticsOrderResp.setAgentFlag(kwtLogisticsOrder.getAgentFlag());
+        logisticsOrderResp.setAgentFlagDesc(Objects.equals(kwtLogisticsOrder.getAgentFlag(), NumberConstant.ONE) ? "是" : "否");
         KwtLogisticsOrderUnit consignCompany = finalLogOrderIdAndUnitTypeKeyAndUnitMap.getOrDefault(kwtLogisticsOrder.getId() + "-" + NumberConstant.ONE,
                 new KwtLogisticsOrderUnit());
         logisticsOrderResp.setConsignCompanyId(String.valueOf(consignCompany.getId()));
@@ -4059,6 +4061,7 @@ public class KwtLogisticsConsignmentService {
             return orderStatusStatisticsResp;
         }
         List<KwtLogisticsOrder> logisticsOrders = logisticsOrderRepository.queryList(logOrderIds, req.getTradeOrderId(), req.getOrderNo(), req.getOrderStatus(),
+                req.getAgentFlag(),
                 req.getStartTime(), req.getEndTime());
 
         if (Objects.isNull(logisticsOrders)) {

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderMapper.xml

@@ -42,6 +42,7 @@
         <result column="update_by" jdbcType="BIGINT" property="updateBy"/>
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
         <result column="del_flag" jdbcType="INTEGER" property="delFlag"/>
+        <result column="agent_flag" jdbcType="INTEGER" property="agentFlag"/>
     </resultMap>
     <sql id="Base_Column_List">
         id
@@ -84,6 +85,7 @@
         create_time,
         update_by,
         update_time,
+        agent_flag,
         del_flag
     </sql>
     <select id="selectOrderList" resultType="com.sckw.transport.model.dto.LogisticsOrderDto">

sql/2026/06/2026_06_02_add_logistics_order_agent_flag.sql

@@ -0,0 +1,2 @@
+ALTER TABLE kwt_logistics_order
+    ADD COLUMN agent_flag tinyint NOT NULL DEFAULT 0 COMMENT '是否代理属性：0-否，1-是';