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

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/LogisticsTransportBizTypeEnum.java

@@ -1,39 +1,39 @@
-package com.sckw.core.model.enums;
-
-import lombok.Getter;
-
-/**
- * 物流合同业务类型（新增页「合同类型」）
- */
-@Getter
-public enum LogisticsTransportBizTypeEnum {
-
-    /** 贸易运输：沿用原系统逻辑 */
-    TRADE_TRANSPORT(1, "贸易运输"),
-    /** 原矿转运：不录入运价，使用允许误差做装卸货量比对 */
-    RAW_ORE_TRANSFER(2, "原矿转运");
-
-    private final int code;
-    private final String label;
-
-    LogisticsTransportBizTypeEnum(int code, String label) {
-        this.code = code;
-        this.label = label;
-    }
-
-    public static String getLabelByCode(Integer code) {
-        if (code == null) {
-            return null;
-        }
-        for (LogisticsTransportBizTypeEnum e : values()) {
-            if (e.code == code) {
-                return e.label;
-            }
-        }
-        return null;
-    }
-
-    public static boolean isRawOreTransfer(Integer code) {
-        return code != null && code == RAW_ORE_TRANSFER.code;
-    }
-}
+//package com.sckw.core.model.enums;
+//
+//import lombok.Getter;
+//
+///**
+// * 物流合同业务类型（新增页「合同类型」）
+// */
+//@Getter
+//public enum LogisticsTransportBizTypeEnum {
+//
+//    /** 贸易运输：沿用原系统逻辑 */
+//    TRADE_TRANSPORT(1, "贸易运输"),
+//    /** 原矿转运：不录入运价，使用允许误差做装卸货量比对 */
+//    RAW_ORE_TRANSFER(2, "原矿转运");
+//
+//    private final int code;
+//    private final String label;
+//
+//    LogisticsTransportBizTypeEnum(int code, String label) {
+//        this.code = code;
+//        this.label = label;
+//    }
+//
+//    public static String getLabelByCode(Integer code) {
+//        if (code == null) {
+//            return null;
+//        }
+//        for (LogisticsTransportBizTypeEnum e : values()) {
+//            if (e.code == code) {
+//                return e.label;
+//            }
+//        }
+//        return null;
+//    }
+//
+//    public static boolean isRawOreTransfer(Integer code) {
+//        return code != null && code == RAW_ORE_TRANSFER.code;
+//    }
+//}

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

@@ -19,6 +19,7 @@ import com.sckw.contract.model.entity.KwcContractLogistics;
 import com.sckw.contract.model.entity.KwcContractLogisticsGoods;
 import com.sckw.contract.model.entity.KwcContractLogisticsUnit;
 import com.sckw.contract.model.entity.KwcContractTrade;
+import com.sckw.contract.model.enums.LogisticsTransportBizTypeEnum;
 import com.sckw.contract.model.report.LogisticsListExport;
 import com.sckw.contract.model.vo.req.*;
 import com.sckw.contract.model.vo.res.*;

sckw-modules/sckw-payment/src/main/resources/bootstrap-cxf.yml

@@ -3,16 +3,16 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: @nacos.server@
+        server-addr: 118.116.4.155:8848
         # 命名空间
-        namespace: @nacos.namespace@
+        namespace: sckw-ng-service-platform-xf
         # 共享配置
         group: sckw-ng-service-platform
       config:
         # 配置中心地址
-        server-addr: @nacos.server@
+        server-addr: 118.116.4.155:8848
         # 命名空间
-        namespace: @nacos.namespace@
+        namespace: sckw-ng-service-platform-xf
         # 共享配置
         group: sckw-ng-service-platform
         # 配置文件格式

sckw-modules/sckw-product/src/main/resources/bootstrap-cxf.yml

@@ -3,16 +3,16 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: @nacos.server@
+        server-addr: 118.116.4.155:8848
         # 命名空间
-        namespace: @nacos.namespace@
+        namespace: sckw-ng-service-platform-xf
         # 共享配置
         group: sckw-ng-service-platform
       config:
         # 配置中心地址
-        server-addr: @nacos.server@
+        server-addr: 118.116.4.155:8848
         # 命名空间
-        namespace: @nacos.namespace@
+        namespace: sckw-ng-service-platform-xf
         # 共享配置
         group: sckw-ng-service-platform
         # 配置文件格式