Merge remote-tracking branch 'origin/dev_20260131_youshen430' into dev_20260131_youshen430

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

@@ -28,6 +28,7 @@ public class LogisticsEntDto {
     @NotBlank(message = "合同编号不能为空")
     @Schema(description = "合同编号")
     private String contractNo;
+    private String contractName;
 
     @NotNull(message = "承运单位不能为空")
     private Long entId;

sckw-modules/sckw-contract/src/main/resources/mapper/KwcContractLogisticsMapper.xml

@@ -236,15 +236,17 @@
     </select>
 
     <select id="queryContract" resultType="com.sckw.contract.model.vo.res.LogisticsEntDto">
-        SELECT a.id contractId,
-               a.contract_no
+        SELECT a.id   contractId,
+               a.contract_no,
+               a.ent_id,
+               a.name contractName
         FROM kwc_contract_logistics a
                  LEFT JOIN kwc_contract_logistics_unit b ON a.id = b.contract_id and b.del_flag = 0 and b.unit_type = 3
         <where>
             a.del_flag = 0
               and a.status = 0
-            and a.transport_biz_type = 2
-            and b.ent_id = #{entId}
+              and a.transport_biz_type = 2
+              and b.ent_id = #{entId}
             <if test="keyword != null and keyword != ''">
                 and (a.contract_no like concat('%', #{keyword}, '%')
                     or a.name like concat('%', #{keyword}, '%'))

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteSystemServiceImpl.java

@@ -462,7 +462,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
         for (Long entId : entIdList) {
             EntCacheResDto entCacheResDto = queryEntCacheById(entId);
             if (Objects.isNull(entCacheResDto)) {
-                return Collections.emptyMap();
+                continue;
             }
             remoteBaseService.fillRelate(entCacheResDto);
 

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

@@ -3311,6 +3311,9 @@ public class KwtAcceptCarriageOrderService {
 
     //冻结运费
     public void freezePayable(AddLogisticOrderDTO orderDTO, List<LogisticData> logisticInfos,Map<Long, ContractCommonInfoResDto> longContractCommonInfoResDtoMap){
+        if(Objects.equals(orderDTO.getOrderType(),1)){
+            return;
+        }
         for (LogisticData x : logisticInfos) {
             ContractCommonInfoResDto contractCommonInfoResDto = longContractCommonInfoResDtoMap.get(x.getContractId());
             if (contractCommonInfoResDto == null) {

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

@@ -2637,7 +2637,7 @@ public class KwtLogisticsConsignmentService {
         addLogisticOrderDTO.setEntId(LoginUserHolder.getEntId());
         addLogisticOrderDTO.setUserId(LoginUserHolder.getUserId());
         //todo 获取不到的参数
-        addLogisticOrderDTO.setTradeOrderId(null);
+        addLogisticOrderDTO.setTradeOrderId(0L);
         addLogisticOrderDTO.setTradeOrderNo("");
 
         Long contractId = logisticsContractList.get(0).getContractId();