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

pom.xml

@@ -336,7 +336,21 @@
         </dependencies>
     </dependencyManagement>
 
-
+    <profiles>
+        <profile>
+            <id>pdy</id>
+            <properties>
+                <!-- 环境标识，需要与配置文件的名称相对应 -->
+                <profiles.active>pdy</profiles.active>
+                <nacos.server>10.10.10.230:8848</nacos.server>
+                <nacos.namespace>sckw_pdy</nacos.namespace>
+            </properties>
+            <activation>
+                <!-- 默认环境 -->
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+    </profiles>
     <build>
         <pluginManagement>
             <plugins>
@@ -428,25 +442,5 @@
             </resource>
         </resources>
     </build>
-    <profiles>
-
-        <profile>
-            <id>dev</id>
-            <properties>
-                <profiles.active>dev</profiles.active>
-                <nacos.server>10.10.10.230:8848</nacos.server>
-                <nacos.namespace>sckw-service-platform-dev</nacos.namespace>
-            </properties>
-        </profile>
-        <!--测试环境-->
-        <profile>
-            <id>test</id>
-            <properties>
-                <profiles.active>test</profiles.active>
-                <nacos.server>10.10.10.224:8848</nacos.server>
-                <nacos.namespace>sckw-service-platform</nacos.namespace>
-            </properties>
-        </profile>
-    </profiles>
 
 </project>

sckw-auth/src/main/resources/bootstrap-xcq.yml

@@ -0,0 +1,28 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: @nacos.server@
+        # 命名空间
+        namespace: @nacos.namespace@
+        # 共享配置
+        group: sckw-service-platform
+      config:
+        # 配置中心地址
+        server-addr: @nacos.server@
+        # 命名空间
+        namespace: @nacos.namespace@
+        # 共享配置
+        group: sckw-service-platform
+        # 配置文件格式
+        file-extension: yaml
+        shared-configs:
+          - data-id: sckw-common.yml
+            group: sckw-common
+            refresh: true
+        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        extension-configs:
+          - dataId: sckw-common.yml
+            group: sckw-service-platform
+            refresh: true

sckw-auth/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
   application:
     name: sckw-auth
   profiles:
-    active: ${DEPLOY_MODE:dev}
+    active: @profiles.active@
   main:
     allow-bean-definition-overriding: true
 

sckw-auth/src/main/resources/logback-spring.xml

@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL，如果设置为WARN，则低于WARN的信息都不会输出 -->
-<!-- scan:当此属性设置为true时，配置文档如果发生改变，将会被重新加载，默认值为true -->
-<!-- scanPeriod:设置监测配置文档是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒。
-                 当scan为true时，此属性生效。默认的时间间隔为1分钟。 -->
-<!-- debug:当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->
-<configuration  scan="true" scanPeriod="10 seconds">
-    <contextName>logback</contextName>
-    <springProperty scope="context" name="applicationName" source="spring.application.name" defaultValue="service"/>
-
-    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
-    <property name="log.path" value="/logs/${applicationName}" />
-
-    <!--0. 日志格式和颜色渲染 -->
-    <!-- 彩色日志依赖的渲染类 -->
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
-    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
-    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
-    <!-- 彩色日志格式 -->
-    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-
-    <!--1. 输出到控制台-->
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>debug</level>
-        </filter>
-        <encoder>
-            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
-            <!-- 设置字符集 -->
-            <charset>UTF-8</charset>
-        </encoder>
-    </appender>
-
-    <!--2. 输出到文档-->
-    <!-- 2.1 level为 DEBUG 日志，时间滚动输出  -->
-    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/web_debug.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志归档 -->
-            <fileNamePattern>${log.path}/web-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录debug级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>debug</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 2.2 level为 INFO 日志，时间滚动输出  -->
-    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/web_info.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 每天日志归档路径以及格式 -->
-            <fileNamePattern>${log.path}/web-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录info级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>info</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 2.3 level为 WARN 日志，时间滚动输出  -->
-    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/web_warn.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/web-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录warn级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>warn</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 2.4 level为 ERROR 日志，时间滚动输出  -->
-    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/web_error.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/web-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!--
-        <logger>用来设置某一个包或者具体的某一个类的日志打印级别、
-        以及指定<appender>。<logger>仅有一个name属性，
-        一个可选的level和一个可选的addtivity属性。
-        name:用来指定受此logger约束的某一个包或者具体的某一个类。
-        level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
-              还有一个特俗值INHERITED或者同义词NULL，代表强制执行上级的级别。
-              如果未设置此属性，那么当前logger将会继承上级的级别。
-        addtivity:是否向上级logger传递打印信息。默认是true。
-        <logger name="org.springframework.web" level="info"/>
-        <logger name="org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor" level="INFO"/>
-    -->
-    <!-- hibernate logger -->
-    <logger name="com.atguigu" level="debug" />
-    <!-- Spring framework logger -->
-    <logger name="org.springframework" level="debug" additivity="false"></logger>
-
-
-    <!--
-        使用mybatis的时候，sql语句是debug下才会打印，而这里我们只配置了info，所以想要查看sql语句的话，有以下两种操作：
-        第一种把<root level="info">改成<root level="DEBUG">这样就会打印sql，不过这样日志那边会出现很多其他消息
-        第二种就是单独给dao下目录配置debug模式，代码如下，这样配置sql语句会打印，其他还是正常info级别：
-        【logging.level.org.mybatis=debug logging.level.dao=debug】
-     -->
-
-    <!--
-        root节点是必选节点，用来指定最基础的日志输出级别，只有一个level属性
-        level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
-        不能设置为INHERITED或者同义词NULL。默认是DEBUG
-        可以包含零个或多个元素，标识这个appender将会添加到这个logger。
-    -->
-
-    <!-- 4. 最终的策略 -->
-    <!-- 4.1 开发环境:打印控制台-->
-    <springProfile name="dev">
-        <logger name="com.sdcm.pmp" level="debug"/>
-    </springProfile>
-
-    <root level="info">
-        <appender-ref ref="CONSOLE" />
-        <appender-ref ref="DEBUG_FILE" />
-        <appender-ref ref="INFO_FILE" />
-        <appender-ref ref="WARN_FILE" />
-        <appender-ref ref="ERROR_FILE" />
-    </root>
-
-    <!-- 4.2 生产环境:输出到文档 -->
-    <springProfile name="pro">
-        <root level="info">
-            <appender-ref ref="CONSOLE" />
-            <appender-ref ref="DEBUG_FILE" />
-            <appender-ref ref="INFO_FILE" />
-            <appender-ref ref="ERROR_FILE" />
-            <appender-ref ref="WARN_FILE" />
-        </root>
-    </springProfile>
-
-</configuration>

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/base/IdsList.java

@@ -0,0 +1,25 @@
+package com.sckw.core.model.base;
+
+import com.sckw.core.utils.StringUtils;
+
+import java.util.List;
+
+/**
+ * ids处理接口类
+ *
+ * @author xucaiqin
+ * @date 2023-07-27 16:40:15
+ */
+public interface IdsList {
+    default String getIds() {
+        return "";
+    }
+
+    default List<Long> getIdList() {
+        return StringUtils.splitStrToList(getIds(), Long.class);
+    }
+
+    default List<String> getIdsList() {
+        return StringUtils.splitStrToList(getIds(), String.class);
+    }
+}

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/StringUtils.java

@@ -379,12 +379,23 @@ public class StringUtils {
         return StringUtils.isNotBlank(params) ? params.split(regex) : new String[]{};
     }
 
+    /**
+     * 字符串分割转list
+     *
+     * @param str 字符串
+     * @param cls 转换类型class
+     * @return
+     */
+    public static <T> List<T> splitStrToList(String str, Class<T> cls) {
+        return splitStrToList(str, ",", cls);
+    }
+
     /**
      * 字符串分割转list
      *
      * @param str   字符串
      * @param regex 截取字符
-     * @param cls 转换类型class
+     * @param cls   转换类型class
      * @return
      */
     public static <T> List<T> splitStrToList(String str, String regex, Class<T> cls) {

sckw-common/sckw-common-mongo/src/main/java/com/sckw/mongo/model/SckwLogisticsOrder.java

@@ -207,7 +207,7 @@ public class SckwLogisticsOrder {
     /**
      * 合同主键
      */
-    private Integer contractId;
+    private String contractId;
 
     /**
      * 合同编号

sckw-gateway/src/main/resources/bootstrap-xcq.yml

@@ -0,0 +1,24 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: @nacos.server@
+        # 命名空间
+        namespace: @nacos.namespace@
+        # 共享配置
+        group: sckw-service-platform
+      config:
+        # 配置中心地址
+        server-addr:  @nacos.server@
+        # 命名空间
+        namespace: @nacos.namespace@
+        # 共享配置
+        group: sckw-service-platform
+        # 配置文件格式
+        file-extension: yaml
+        shared-configs:
+          - data-id: sckw-common.yml
+            group: sckw-common
+            refresh: true
+

sckw-gateway/src/main/resources/bootstrap.yml

@@ -9,5 +9,5 @@ spring:
     name: sckw-gateway
   profiles:
     # 环境配置
-    active: ${DEPLOY_MODE:dev}
+    active: @profiles.active@
 

sckw-gateway/src/main/resources/logback-spring.xml

@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL，如果设置为WARN，则低于WARN的信息都不会输出 -->
-<!-- scan:当此属性设置为true时，配置文档如果发生改变，将会被重新加载，默认值为true -->
-<!-- scanPeriod:设置监测配置文档是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒。
-                 当scan为true时，此属性生效。默认的时间间隔为1分钟。 -->
-<!-- debug:当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->
-<configuration  scan="true" scanPeriod="10 seconds">
-    <contextName>logback</contextName>
-    <springProperty scope="context" name="applicationName" source="spring.application.name" defaultValue="service"/>
-
-    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
-    <property name="log.path" value="/logs/${applicationName}" />
-
-    <!--0. 日志格式和颜色渲染 -->
-    <!-- 彩色日志依赖的渲染类 -->
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
-    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
-    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
-    <!-- 彩色日志格式 -->
-    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-
-    <!--1. 输出到控制台-->
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>debug</level>
-        </filter>
-        <encoder>
-            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
-            <!-- 设置字符集 -->
-            <charset>UTF-8</charset>
-        </encoder>
-    </appender>
-
-    <!--2. 输出到文档-->
-    <!-- 2.1 level为 DEBUG 日志，时间滚动输出  -->
-    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/web_debug.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志归档 -->
-            <fileNamePattern>${log.path}/web-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录debug级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>debug</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 2.2 level为 INFO 日志，时间滚动输出  -->
-    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/web_info.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 每天日志归档路径以及格式 -->
-            <fileNamePattern>${log.path}/web-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录info级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>info</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 2.3 level为 WARN 日志，时间滚动输出  -->
-    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/web_warn.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/web-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录warn级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>warn</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 2.4 level为 ERROR 日志，时间滚动输出  -->
-    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/web_error.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/web-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!--
-        <logger>用来设置某一个包或者具体的某一个类的日志打印级别、
-        以及指定<appender>。<logger>仅有一个name属性，
-        一个可选的level和一个可选的addtivity属性。
-        name:用来指定受此logger约束的某一个包或者具体的某一个类。
-        level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
-              还有一个特俗值INHERITED或者同义词NULL，代表强制执行上级的级别。
-              如果未设置此属性，那么当前logger将会继承上级的级别。
-        addtivity:是否向上级logger传递打印信息。默认是true。
-        <logger name="org.springframework.web" level="info"/>
-        <logger name="org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor" level="INFO"/>
-    -->
-    <!-- hibernate logger -->
-    <logger name="com.atguigu" level="debug" />
-    <!-- Spring framework logger -->
-    <logger name="org.springframework" level="debug" additivity="false"></logger>
-
-
-    <!--
-        使用mybatis的时候，sql语句是debug下才会打印，而这里我们只配置了info，所以想要查看sql语句的话，有以下两种操作：
-        第一种把<root level="info">改成<root level="DEBUG">这样就会打印sql，不过这样日志那边会出现很多其他消息
-        第二种就是单独给dao下目录配置debug模式，代码如下，这样配置sql语句会打印，其他还是正常info级别：
-        【logging.level.org.mybatis=debug logging.level.dao=debug】
-     -->
-
-    <!--
-        root节点是必选节点，用来指定最基础的日志输出级别，只有一个level属性
-        level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
-        不能设置为INHERITED或者同义词NULL。默认是DEBUG
-        可以包含零个或多个元素，标识这个appender将会添加到这个logger。
-    -->
-
-    <!-- 4. 最终的策略 -->
-    <!-- 4.1 开发环境:打印控制台-->
-    <springProfile name="dev">
-        <logger name="com.sdcm.pmp" level="debug"/>
-    </springProfile>
-
-    <root level="info">
-        <appender-ref ref="CONSOLE" />
-        <appender-ref ref="DEBUG_FILE" />
-        <appender-ref ref="INFO_FILE" />
-        <appender-ref ref="WARN_FILE" />
-        <appender-ref ref="ERROR_FILE" />
-    </root>
-
-    <!-- 4.2 生产环境:输出到文档 -->
-    <springProfile name="pro">
-        <root level="info">
-            <appender-ref ref="CONSOLE" />
-            <appender-ref ref="DEBUG_FILE" />
-            <appender-ref ref="INFO_FILE" />
-            <appender-ref ref="ERROR_FILE" />
-            <appender-ref ref="WARN_FILE" />
-        </root>
-    </springProfile>
-
-</configuration>

sckw-modules/sckw-contract/src/main/resources/bootstrap-xcq.yml

@@ -0,0 +1,28 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: @nacos.server@
+        # 命名空间
+        namespace: @nacos.namespace@
+        # 共享配置
+        group: sckw-service-platform
+      config:
+        # 配置中心地址
+        server-addr: @nacos.server@
+        # 命名空间
+        namespace: @nacos.namespace@
+        # 共享配置
+        group: sckw-service-platform
+        # 配置文件格式
+        file-extension: yaml
+        shared-configs:
+          - data-id: sckw-common.yml
+            group: sckw-common
+            refresh: true
+        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        extension-configs:
+          - dataId: sckw-common.yml
+            group: sckw-service-platform
+            refresh: true

sckw-modules/sckw-contract/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
   application:
     name: sckw-contract
   profiles:
-    active: ${DEPLOY_MODE:dev}
+    active: @profiles.active@
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true

sckw-modules/sckw-example/src/main/resources/bootstrap-xcq.yml

@@ -0,0 +1,29 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: @nacos.server@
+        # 命名空间
+        namespace: @nacos.namespace@
+        # 共享配置
+        group: sckw-service-platform
+      config:
+        # 配置中心地址
+        server-addr: @nacos.server@
+        # 命名空间
+        namespace: @nacos.namespace@
+        # 共享配置
+        group: sckw-service-platform
+        # 配置文件格式
+        file-extension: yaml
+        shared-configs:
+          - data-id: sckw-common.yml
+            group: sckw-common
+            refresh: true
+
+        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        extension-configs:
+          - dataId: sckw-common.yml
+            group: sckw-service-platform
+            refresh: true

sckw-modules/sckw-example/src/main/resources/bootstrap.yml

@@ -5,7 +5,11 @@ spring:
   application:
     name: sckw-example
   profiles:
-    active: ${DEPLOY_MODE:dev}
+    active: @profiles.active@
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true
+logging:
+  level:
+    root: debug
+    com.sckw.example: debug

sckw-modules/sckw-example/src/main/resources/log4j2.xml

@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration status="info" monitorInterval="30">
+    <properties>
+        <!-- 格式化输出：%date表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度 %msg：日志消息，%n是换行符 -->
+        <!-- %logger{36} 表示 Logger 名字最长36个字符 -->
+        <property name="LOG_PATTERN"
+                  value="%clr{%d{yyyy-MM-dd HH:mm:ss.SSS}}{faint} %clr{%5p} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%t]}{faint} %clr{%c{1.}}{cyan} %clr{:}{faint} %m%n%xwEx"/>
+        <property name="LOG_WITHOUT_COLOR_PATTERN"
+                  value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${sys:PID}--- [%t] %c{1.} : %m%n%xwEx"/>
+        <property name="LOG_PATH" value="logs/sckw-example"/>
+    </properties>
+    <!--DEBUG<INFO<WARNING<ERROR<CRITICAL-->
+    <!-- 先定义所有的appender(附加器)-->
+    <appenders>
+        <!-- 输出控制台的配置 -->
+        <Console name="Console" target="SYSTEM_OUT">
+            <!-- 输出日志的格式 -->
+            <PatternLayout pattern="${LOG_PATTERN}"/>
+        </Console>
+
+        <!--all级别日志-->
+        <RollingFile name="allFileAppender"
+                     fileName="${LOG_PATH}/all.log"
+                     filePattern="${LOG_PATH}/$${date:yyyy-MM}/all-%d{yyyy-MM-dd}-%i.log.gz">
+            <PatternLayout pattern="${LOG_WITHOUT_COLOR_PATTERN}"/>
+
+            <Policies>
+                <!-- 设置日志文件切分参数 -->
+                <!--<OnStartupTriggeringPolicy/>-->
+                <!--设置日志基础文件大小，超过该大小就触发日志文件滚动更新-->
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+                <!--设置日志文件滚动更新的时间，依赖于文件命名filePattern的设置-->
+                <TimeBasedTriggeringPolicy/>
+            </Policies>
+            <!--设置日志的文件个数上限，不设置默认为7个，超过大小后会被覆盖；依赖于filePattern中的%i-->
+            <DefaultRolloverStrategy max="100"/>
+        </RollingFile>
+
+        <!--debug级别日志-->
+        <RollingFile name="debugFileAppender"
+                     fileName="${LOG_PATH}/debug.log"
+                     filePattern="${LOG_PATH}/$${date:yyyy-MM}/debug-%d{yyyy-MM-dd}-%i.log.gz">
+            <Filters>
+                <!--过滤掉info及更高级别日志-->
+                <ThresholdFilter level="info" onMatch="DENY" onMismatch="NEUTRAL"/>
+            </Filters>
+            <!--设置日志格式-->
+            <PatternLayout pattern="${LOG_WITHOUT_COLOR_PATTERN}"/>
+
+            <Policies>
+                <!-- 设置日志文件切分参数 -->
+                <!--<OnStartupTriggeringPolicy/>-->
+                <!--设置日志基础文件大小，超过该大小就触发日志文件滚动更新-->
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+                <!--设置日志文件滚动更新的时间，依赖于文件命名filePattern的设置-->
+                <TimeBasedTriggeringPolicy/>
+            </Policies>
+            <!--设置日志的文件个数上限，不设置默认为7个，超过大小后会被覆盖；依赖于filePattern中的%i-->
+            <DefaultRolloverStrategy max="100"/>
+        </RollingFile>
+
+        <!--info级别日志-->
+        <RollingFile name="infoFileAppender"
+                     fileName="${LOG_PATH}/info.log"
+                     filePattern="${LOG_PATH}/$${date:yyyy-MM}/info-%d{yyyy-MM-dd}-%i.log.gz">
+            <Filters>
+                <!--过滤掉warn及更高级别日志-->
+                <ThresholdFilter level="warn" onMatch="DENY" onMismatch="NEUTRAL"/>
+            </Filters>
+            <!--设置日志格式-->
+            <PatternLayout pattern="${LOG_WITHOUT_COLOR_PATTERN}"/>
+
+            <Policies>
+                <!-- 设置日志文件切分参数 -->
+                <!--<OnStartupTriggeringPolicy/>-->
+                <!--设置日志基础文件大小，超过该大小就触发日志文件滚动更新-->
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+                <!--设置日志文件滚动更新的时间，依赖于文件命名filePattern的设置-->
+                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
+            </Policies>
+            <!--设置日志的文件个数上限，不设置默认为7个，超过大小后会被覆盖；依赖于filePattern中的%i-->
+            <!--<DefaultRolloverStrategy max="100"/>-->
+        </RollingFile>
+
+        <!--warn级别日志-->
+        <RollingFile name="warnFileAppender"
+                     fileName="${LOG_PATH}/warn.log"
+                     filePattern="${LOG_PATH}/$${date:yyyy-MM}/warn-%d{yyyy-MM-dd}-%i.log.gz">
+            <Filters>
+                <!--过滤掉error及更高级别日志-->
+                <ThresholdFilter level="error" onMatch="DENY" onMismatch="NEUTRAL"/>
+            </Filters>
+            <!--设置日志格式-->
+            <PatternLayout pattern="${LOG_WITHOUT_COLOR_PATTERN}"/>
+
+            <Policies>
+                <!-- 设置日志文件切分参数 -->
+                <!--<OnStartupTriggeringPolicy/>-->
+                <!--设置日志基础文件大小，超过该大小就触发日志文件滚动更新-->
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+                <!--设置日志文件滚动更新的时间，依赖于文件命名filePattern的设置-->
+                <TimeBasedTriggeringPolicy/>
+            </Policies>
+            <!--设置日志的文件个数上限，不设置默认为7个，超过大小后会被覆盖；依赖于filePattern中的%i-->
+            <DefaultRolloverStrategy max="100"/>
+        </RollingFile>
+
+        <!--error及更高级别日志-->
+        <RollingFile name="errorFileAppender"
+                     fileName="${LOG_PATH}/error.log"
+                     filePattern="${LOG_PATH}/$${date:yyyy-MM}/error-%d{yyyy-MM-dd}-%i.log.gz">
+            <!--设置日志格式-->
+            <PatternLayout pattern="${LOG_WITHOUT_COLOR_PATTERN}"/>
+            <Policies>
+                <!-- 设置日志文件切分参数 -->
+                <!--<OnStartupTriggeringPolicy/>-->
+                <!--设置日志基础文件大小，超过该大小就触发日志文件滚动更新-->
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+                <!--设置日志文件滚动更新的时间，依赖于文件命名filePattern的设置-->
+                <TimeBasedTriggeringPolicy/>
+            </Policies>
+            <!--设置日志的文件个数上限，不设置默认为7个，超过大小后会被覆盖；依赖于filePattern中的%i-->
+            <DefaultRolloverStrategy max="100"/>
+        </RollingFile>
+
+        <!--json格式error级别日志-->
+        <RollingFile name="errorJsonAppender"
+                     fileName="${LOG_PATH}/error-json.log"
+                     filePattern="${LOG_PATH}/$${date:yyyy-MM}/error-json-%d{yyyy-MM-dd}-%i.log.gz">
+            <JSONLayout compact="true" eventEol="true" locationInfo="true"/>
+            <Policies>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
+            </Policies>
+        </RollingFile>
+
+    </appenders>
+
+    <loggers>
+        <root level="debug">
+            <AppenderRef ref="allFileAppender" level="all"/>
+            <AppenderRef ref="debugFileAppender" level="debug"/>
+            <AppenderRef ref="infoFileAppender" level="info"/>
+            <AppenderRef ref="warnFileAppender" level="warn"/>
+            <AppenderRef ref="errorFileAppender" level="error"/>
+            <AppenderRef ref="errorJsonAppender" level="error"/>
+            <appender-ref ref="Console" level="info"/>
+        </root>
+        <Logger name="org.springframework" level="info"/>
+        <Logger name="com.alibaba" level="info"/>
+        <Logger name="com.baomidou" level="info"/>
+    </loggers>
+
+</configuration>

sckw-modules/sckw-example/src/main/resources/logback-spring.xml

@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL，如果设置为WARN，则低于WARN的信息都不会输出 -->
-<!-- scan:当此属性设置为true时，配置文档如果发生改变，将会被重新加载，默认值为true -->
-<!-- scanPeriod:设置监测配置文档是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒。
-                 当scan为true时，此属性生效。默认的时间间隔为1分钟。 -->
-<!-- debug:当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->
-<configuration  scan="true" scanPeriod="10 seconds">
-    <contextName>logback</contextName>
-    <springProperty scope="context" name="applicationName" source="spring.application.name" defaultValue="service"/>
-
-    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
-    <property name="log.path" value="/logs/${applicationName}" />
-
-    <!--0. 日志格式和颜色渲染 -->
-    <!-- 彩色日志依赖的渲染类 -->
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
-    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
-    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
-    <!-- 彩色日志格式 -->
-    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-
-    <!--1. 输出到控制台-->
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>debug</level>
-        </filter>
-        <encoder>
-            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
-            <!-- 设置字符集 -->
-            <charset>UTF-8</charset>
-        </encoder>
-    </appender>
-
-    <!--2. 输出到文档-->
-    <!-- 2.1 level为 DEBUG 日志，时间滚动输出  -->
-    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/web_debug.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志归档 -->
-            <fileNamePattern>${log.path}/web-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录debug级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>debug</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 2.2 level为 INFO 日志，时间滚动输出  -->
-    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/web_info.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 每天日志归档路径以及格式 -->
-            <fileNamePattern>${log.path}/web-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录info级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>info</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 2.3 level为 WARN 日志，时间滚动输出  -->
-    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/web_warn.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/web-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录warn级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>warn</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 2.4 level为 ERROR 日志，时间滚动输出  -->
-    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/web_error.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/web-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!--
-        <logger>用来设置某一个包或者具体的某一个类的日志打印级别、
-        以及指定<appender>。<logger>仅有一个name属性，
-        一个可选的level和一个可选的addtivity属性。
-        name:用来指定受此logger约束的某一个包或者具体的某一个类。
-        level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
-              还有一个特俗值INHERITED或者同义词NULL，代表强制执行上级的级别。
-              如果未设置此属性，那么当前logger将会继承上级的级别。
-        addtivity:是否向上级logger传递打印信息。默认是true。
-        <logger name="org.springframework.web" level="info"/>
-        <logger name="org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor" level="INFO"/>
-    -->
-    <!-- hibernate logger -->
-    <logger name="com.atguigu" level="debug" />
-    <!-- Spring framework logger -->
-    <logger name="org.springframework" level="debug" additivity="false"></logger>
-
-
-    <!--
-        使用mybatis的时候，sql语句是debug下才会打印，而这里我们只配置了info，所以想要查看sql语句的话，有以下两种操作：
-        第一种把<root level="info">改成<root level="DEBUG">这样就会打印sql，不过这样日志那边会出现很多其他消息
-        第二种就是单独给dao下目录配置debug模式，代码如下，这样配置sql语句会打印，其他还是正常info级别：
-        【logging.level.org.mybatis=debug logging.level.dao=debug】
-     -->
-
-    <!--
-        root节点是必选节点，用来指定最基础的日志输出级别，只有一个level属性
-        level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
-        不能设置为INHERITED或者同义词NULL。默认是DEBUG
-        可以包含零个或多个元素，标识这个appender将会添加到这个logger。
-    -->
-
-    <!-- 4. 最终的策略 -->
-    <!-- 4.1 开发环境:打印控制台-->
-    <springProfile name="dev">
-        <logger name="com.sdcm.pmp" level="debug"/>
-    </springProfile>
-
-    <root level="info">
-        <appender-ref ref="CONSOLE" />
-        <appender-ref ref="DEBUG_FILE" />
-        <appender-ref ref="INFO_FILE" />
-        <appender-ref ref="WARN_FILE" />
-        <appender-ref ref="ERROR_FILE" />
-    </root>
-
-    <!-- 4.2 生产环境:输出到文档 -->
-    <springProfile name="pro">
-        <root level="info">
-            <appender-ref ref="CONSOLE" />
-            <appender-ref ref="DEBUG_FILE" />
-            <appender-ref ref="INFO_FILE" />
-            <appender-ref ref="ERROR_FILE" />
-            <appender-ref ref="WARN_FILE" />
-        </root>
-    </springProfile>
-
-</configuration>

sckw-modules/sckw-file/src/main/resources/bootstrap-xcq.yml

@@ -0,0 +1,29 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: @nacos.server@
+        # 命名空间
+        namespace: @nacos.namespace@
+        # 共享配置
+        group: sckw-service-platform
+      config:
+        # 配置中心地址
+        server-addr: @nacos.server@
+        # 命名空间
+        namespace: @nacos.namespace@
+        # 共享配置
+        group: sckw-service-platform
+        # 配置文件格式
+        file-extension: yaml
+        shared-configs:
+          - data-id: sckw-common.yml
+            group: sckw-common
+            refresh: true
+
+        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        extension-configs:
+          - dataId: sckw-common.yml
+            group: sckw-service-platform
+            refresh: true

sckw-modules/sckw-file/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
   application:
     name: sckw-file
   profiles:
-    active: ${DEPLOY_MODE:dev}
+    active: @profiles.active@
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true

sckw-modules/sckw-file/src/main/resources/log4j2.xml

@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration status="info" monitorInterval="30">
+    <properties>
+        <!-- 格式化输出：%date表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度 %msg：日志消息，%n是换行符 -->
+        <!-- %logger{36} 表示 Logger 名字最长36个字符 -->
+        <property name="LOG_PATTERN"
+                  value="%clr{%d{yyyy-MM-dd HH:mm:ss.SSS}}{faint} %clr{%5p} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%t]}{faint} %clr{%c{1.}}{cyan} %clr{:}{faint} %m%n%xwEx"/>
+        <property name="LOG_WITHOUT_COLOR_PATTERN"
+                  value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${sys:PID}--- [%t] %c{1.} : %m%n%xwEx"/>
+        <property name="LOG_PATH" value="logs/sckw-file"/>
+    </properties>
+    <!--DEBUG<INFO<WARNING<ERROR<CRITICAL-->
+    <!-- 先定义所有的appender(附加器)-->
+    <appenders>
+        <!-- 输出控制台的配置 -->
+        <Console name="Console" target="SYSTEM_OUT">
+            <!-- 输出日志的格式 -->
+            <PatternLayout pattern="${LOG_PATTERN}"/>
+        </Console>
+
+        <!--all级别日志-->
+        <RollingFile name="allFileAppender"
+                     fileName="${LOG_PATH}/all.log"
+                     filePattern="${LOG_PATH}/$${date:yyyy-MM}/all-%d{yyyy-MM-dd}-%i.log.gz">
+            <PatternLayout pattern="${LOG_WITHOUT_COLOR_PATTERN}"/>
+
+            <Policies>
+                <!-- 设置日志文件切分参数 -->
+                <!--<OnStartupTriggeringPolicy/>-->
+                <!--设置日志基础文件大小，超过该大小就触发日志文件滚动更新-->
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+                <!--设置日志文件滚动更新的时间，依赖于文件命名filePattern的设置-->
+                <TimeBasedTriggeringPolicy/>
+            </Policies>
+            <!--设置日志的文件个数上限，不设置默认为7个，超过大小后会被覆盖；依赖于filePattern中的%i-->
+            <DefaultRolloverStrategy max="100"/>
+        </RollingFile>
+
+        <!--debug级别日志-->
+        <RollingFile name="debugFileAppender"
+                     fileName="${LOG_PATH}/debug.log"
+                     filePattern="${LOG_PATH}/$${date:yyyy-MM}/debug-%d{yyyy-MM-dd}-%i.log.gz">
+            <Filters>
+                <!--过滤掉info及更高级别日志-->
+                <ThresholdFilter level="info" onMatch="DENY" onMismatch="NEUTRAL"/>
+            </Filters>
+            <!--设置日志格式-->
+            <PatternLayout pattern="${LOG_WITHOUT_COLOR_PATTERN}"/>
+
+            <Policies>
+                <!-- 设置日志文件切分参数 -->
+                <!--<OnStartupTriggeringPolicy/>-->
+                <!--设置日志基础文件大小，超过该大小就触发日志文件滚动更新-->
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+                <!--设置日志文件滚动更新的时间，依赖于文件命名filePattern的设置-->
+                <TimeBasedTriggeringPolicy/>
+            </Policies>
+            <!--设置日志的文件个数上限，不设置默认为7个，超过大小后会被覆盖；依赖于filePattern中的%i-->
+            <DefaultRolloverStrategy max="100"/>
+        </RollingFile>
+
+        <!--info级别日志-->
+        <RollingFile name="infoFileAppender"
+                     fileName="${LOG_PATH}/info.log"
+                     filePattern="${LOG_PATH}/$${date:yyyy-MM}/info-%d{yyyy-MM-dd}-%i.log.gz">
+            <Filters>
+                <!--过滤掉warn及更高级别日志-->
+                <ThresholdFilter level="warn" onMatch="DENY" onMismatch="NEUTRAL"/>
+            </Filters>
+            <!--设置日志格式-->
+            <PatternLayout pattern="${LOG_WITHOUT_COLOR_PATTERN}"/>
+
+            <Policies>
+                <!-- 设置日志文件切分参数 -->
+                <!--<OnStartupTriggeringPolicy/>-->
+                <!--设置日志基础文件大小，超过该大小就触发日志文件滚动更新-->
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+                <!--设置日志文件滚动更新的时间，依赖于文件命名filePattern的设置-->
+                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
+            </Policies>
+            <!--设置日志的文件个数上限，不设置默认为7个，超过大小后会被覆盖；依赖于filePattern中的%i-->
+            <!--<DefaultRolloverStrategy max="100"/>-->
+        </RollingFile>
+
+        <!--warn级别日志-->
+        <RollingFile name="warnFileAppender"
+                     fileName="${LOG_PATH}/warn.log"
+                     filePattern="${LOG_PATH}/$${date:yyyy-MM}/warn-%d{yyyy-MM-dd}-%i.log.gz">
+            <Filters>
+                <!--过滤掉error及更高级别日志-->
+                <ThresholdFilter level="error" onMatch="DENY" onMismatch="NEUTRAL"/>
+            </Filters>
+            <!--设置日志格式-->
+            <PatternLayout pattern="${LOG_WITHOUT_COLOR_PATTERN}"/>
+
+            <Policies>
+                <!-- 设置日志文件切分参数 -->
+                <!--<OnStartupTriggeringPolicy/>-->
+                <!--设置日志基础文件大小，超过该大小就触发日志文件滚动更新-->
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+                <!--设置日志文件滚动更新的时间，依赖于文件命名filePattern的设置-->
+                <TimeBasedTriggeringPolicy/>
+            </Policies>
+            <!--设置日志的文件个数上限，不设置默认为7个，超过大小后会被覆盖；依赖于filePattern中的%i-->
+            <DefaultRolloverStrategy max="100"/>
+        </RollingFile>
+
+        <!--error及更高级别日志-->
+        <RollingFile name="errorFileAppender"
+                     fileName="${LOG_PATH}/error.log"
+                     filePattern="${LOG_PATH}/$${date:yyyy-MM}/error-%d{yyyy-MM-dd}-%i.log.gz">
+            <!--设置日志格式-->
+            <PatternLayout pattern="${LOG_WITHOUT_COLOR_PATTERN}"/>
+            <Policies>
+                <!-- 设置日志文件切分参数 -->
+                <!--<OnStartupTriggeringPolicy/>-->
+                <!--设置日志基础文件大小，超过该大小就触发日志文件滚动更新-->
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+                <!--设置日志文件滚动更新的时间，依赖于文件命名filePattern的设置-->
+                <TimeBasedTriggeringPolicy/>
+            </Policies>
+            <!--设置日志的文件个数上限，不设置默认为7个，超过大小后会被覆盖；依赖于filePattern中的%i-->
+            <DefaultRolloverStrategy max="100"/>
+        </RollingFile>
+
+        <!--json格式error级别日志-->
+        <RollingFile name="errorJsonAppender"
+                     fileName="${LOG_PATH}/error-json.log"
+                     filePattern="${LOG_PATH}/$${date:yyyy-MM}/error-json-%d{yyyy-MM-dd}-%i.log.gz">
+            <JSONLayout compact="true" eventEol="true" locationInfo="true"/>
+            <Policies>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
+            </Policies>
+        </RollingFile>
+
+    </appenders>
+
+    <loggers>
+        <root level="debug">
+            <AppenderRef ref="allFileAppender" level="all"/>
+            <AppenderRef ref="debugFileAppender" level="debug"/>
+            <AppenderRef ref="infoFileAppender" level="info"/>
+            <AppenderRef ref="warnFileAppender" level="warn"/>
+            <AppenderRef ref="errorFileAppender" level="error"/>
+            <AppenderRef ref="errorJsonAppender" level="error"/>
+            <appender-ref ref="Console" level="info"/>
+        </root>
+        <Logger name="org.springframework" level="info"/>
+        <Logger name="com.alibaba" level="info"/>
+        <Logger name="com.baomidou" level="info"/>
+    </loggers>
+
+</configuration>

sckw-modules/sckw-fleet/src/main/resources/bootstrap-xcq.yml

@@ -0,0 +1,28 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: @nacos.server@
+        # 命名空间
+        namespace: @nacos.namespace@
+        # 共享配置
+        group: sckw-service-platform
+      config:
+        # 配置中心地址
+        server-addr: @nacos.server@
+        # 命名空间
+        namespace: @nacos.namespace@
+        # 共享配置
+        group: sckw-service-platform
+        # 配置文件格式
+        file-extension: yaml
+        shared-configs:
+          - data-id: sckw-common.yml
+            group: sckw-common
+            refresh: true
+        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        extension-configs:
+          - dataId: sckw-common.yml
+            group: sckw-service-platform
+            refresh: true

sckw-modules/sckw-fleet/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
   application:
     name: sckw-fleet
   profiles:
-    active: ${DEPLOY_MODE:dev}
+    active: @profiles.active@
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true

sckw-modules/sckw-fleet/src/main/resources/logback-spring.xml

@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL，如果设置为WARN，则低于WARN的信息都不会输出 -->
-<!-- scan:当此属性设置为true时，配置文档如果发生改变，将会被重新加载，默认值为true -->
-<!-- scanPeriod:设置监测配置文档是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒。
-                 当scan为true时，此属性生效。默认的时间间隔为1分钟。 -->
-<!-- debug:当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->
-<configuration  scan="true" scanPeriod="10 seconds">
-    <contextName>logback</contextName>
-    <springProperty scope="context" name="applicationName" source="spring.application.name" defaultValue="service"/>
-
-    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
-    <property name="log.path" value="/logs/${applicationName}" />
-
-    <!--0. 日志格式和颜色渲染 -->
-    <!-- 彩色日志依赖的渲染类 -->
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
-    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
-    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
-    <!-- 彩色日志格式 -->
-    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-
-    <!--1. 输出到控制台-->
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>debug</level>
-        </filter>
-        <encoder>
-            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
-            <!-- 设置字符集 -->
-            <charset>UTF-8</charset>
-        </encoder>
-    </appender>
-
-    <!--2. 输出到文档-->
-    <!-- 2.1 level为 DEBUG 日志，时间滚动输出  -->
-    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/web_debug.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志归档 -->
-            <fileNamePattern>${log.path}/web-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录debug级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>debug</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 2.2 level为 INFO 日志，时间滚动输出  -->
-    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/web_info.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 每天日志归档路径以及格式 -->
-            <fileNamePattern>${log.path}/web-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录info级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>info</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 2.3 level为 WARN 日志，时间滚动输出  -->
-    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/web_warn.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/web-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录warn级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>warn</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 2.4 level为 ERROR 日志，时间滚动输出  -->
-    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/web_error.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/web-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!--
-        <logger>用来设置某一个包或者具体的某一个类的日志打印级别、
-        以及指定<appender>。<logger>仅有一个name属性，
-        一个可选的level和一个可选的addtivity属性。
-        name:用来指定受此logger约束的某一个包或者具体的某一个类。
-        level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
-              还有一个特俗值INHERITED或者同义词NULL，代表强制执行上级的级别。
-              如果未设置此属性，那么当前logger将会继承上级的级别。
-        addtivity:是否向上级logger传递打印信息。默认是true。
-        <logger name="org.springframework.web" level="info"/>
-        <logger name="org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor" level="INFO"/>
-    -->
-    <!-- hibernate logger -->
-    <logger name="com.atguigu" level="debug" />
-    <!-- Spring framework logger -->
-    <logger name="org.springframework" level="debug" additivity="false"></logger>
-
-
-    <!--
-        使用mybatis的时候，sql语句是debug下才会打印，而这里我们只配置了info，所以想要查看sql语句的话，有以下两种操作：
-        第一种把<root level="info">改成<root level="DEBUG">这样就会打印sql，不过这样日志那边会出现很多其他消息
-        第二种就是单独给dao下目录配置debug模式，代码如下，这样配置sql语句会打印，其他还是正常info级别：
-        【logging.level.org.mybatis=debug logging.level.dao=debug】
-     -->
-
-    <!--
-        root节点是必选节点，用来指定最基础的日志输出级别，只有一个level属性
-        level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
-        不能设置为INHERITED或者同义词NULL。默认是DEBUG
-        可以包含零个或多个元素，标识这个appender将会添加到这个logger。
-    -->
-
-    <!-- 4. 最终的策略 -->
-    <!-- 4.1 开发环境:打印控制台-->
-    <springProfile name="dev">
-        <logger name="com.sdcm.pmp" level="debug"/>
-    </springProfile>
-
-    <root level="info">
-        <appender-ref ref="CONSOLE" />
-        <appender-ref ref="DEBUG_FILE" />
-        <appender-ref ref="INFO_FILE" />
-        <appender-ref ref="WARN_FILE" />
-        <appender-ref ref="ERROR_FILE" />
-    </root>
-
-    <!-- 4.2 生产环境:输出到文档-->
-    <springProfile name="pro">
-        <root level="info">
-            <appender-ref ref="CONSOLE" />
-            <appender-ref ref="DEBUG_FILE" />
-            <appender-ref ref="INFO_FILE" />
-            <appender-ref ref="ERROR_FILE" />
-            <appender-ref ref="WARN_FILE" />
-        </root>
-    </springProfile>
-
-</configuration>

sckw-modules/sckw-manage/src/main/resources/bootstrap-xcq.yml

@@ -0,0 +1,28 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: @nacos.server@
+        # 命名空间
+        namespace: @nacos.namespace@
+        # 共享配置
+        group: sckw-service-platform
+      config:
+        # 配置中心地址
+        server-addr: @nacos.server@
+        # 命名空间
+        namespace: @nacos.namespace@
+        # 共享配置
+        group: sckw-service-platform
+        # 配置文件格式
+        file-extension: yaml
+        shared-configs:
+          - data-id: sckw-common.yml
+            group: sckw-common
+            refresh: true
+        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        extension-configs:
+          - dataId: sckw-common.yml
+            group: sckw-service-platform
+            refresh: true

sckw-modules/sckw-manage/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
   application:
     name: sckw-system
   profiles:
-    active: ${DEPLOY_MODE:dev}
+    active: @profiles.active@
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true

sckw-modules/sckw-manage/src/main/resources/logback-spring.xml

@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL，如果设置为WARN，则低于WARN的信息都不会输出 -->
-<!-- scan:当此属性设置为true时，配置文档如果发生改变，将会被重新加载，默认值为true -->
-<!-- scanPeriod:设置监测配置文档是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒。
-                 当scan为true时，此属性生效。默认的时间间隔为1分钟。 -->
-<!-- debug:当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->
-<configuration  scan="true" scanPeriod="10 seconds">
-    <contextName>logback</contextName>
-    <springProperty scope="context" name="applicationName" source="spring.application.name" defaultValue="service"/>
-
-    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
-    <property name="log.path" value="/logs/${applicationName}" />
-
-    <!--0. 日志格式和颜色渲染 -->
-    <!-- 彩色日志依赖的渲染类 -->
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
-    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
-    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
-    <!-- 彩色日志格式 -->
-    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-
-    <!--1. 输出到控制台-->
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>debug</level>
-        </filter>
-        <encoder>
-            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
-            <!-- 设置字符集 -->
-            <charset>UTF-8</charset>
-        </encoder>
-    </appender>
-
-    <!--2. 输出到文档-->
-    <!-- 2.1 level为 DEBUG 日志，时间滚动输出  -->
-    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/web_debug.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志归档 -->
-            <fileNamePattern>${log.path}/web-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录debug级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>debug</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 2.2 level为 INFO 日志，时间滚动输出  -->
-    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/web_info.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 每天日志归档路径以及格式 -->
-            <fileNamePattern>${log.path}/web-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录info级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>info</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 2.3 level为 WARN 日志，时间滚动输出  -->
-    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/web_warn.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/web-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录warn级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>warn</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 2.4 level为 ERROR 日志，时间滚动输出  -->
-    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/web_error.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/web-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!--
-        <logger>用来设置某一个包或者具体的某一个类的日志打印级别、
-        以及指定<appender>。<logger>仅有一个name属性，
-        一个可选的level和一个可选的addtivity属性。
-        name:用来指定受此logger约束的某一个包或者具体的某一个类。
-        level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
-              还有一个特俗值INHERITED或者同义词NULL，代表强制执行上级的级别。
-              如果未设置此属性，那么当前logger将会继承上级的级别。
-        addtivity:是否向上级logger传递打印信息。默认是true。
-        <logger name="org.springframework.web" level="info"/>
-        <logger name="org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor" level="INFO"/>
-    -->
-    <!-- hibernate logger -->
-    <logger name="com.atguigu" level="debug" />
-    <!-- Spring framework logger -->
-    <logger name="org.springframework" level="debug" additivity="false"></logger>
-
-
-    <!--
-        使用mybatis的时候，sql语句是debug下才会打印，而这里我们只配置了info，所以想要查看sql语句的话，有以下两种操作：
-        第一种把<root level="info">改成<root level="DEBUG">这样就会打印sql，不过这样日志那边会出现很多其他消息
-        第二种就是单独给dao下目录配置debug模式，代码如下，这样配置sql语句会打印，其他还是正常info级别：
-        【logging.level.org.mybatis=debug logging.level.dao=debug】
-     -->
-
-    <!--
-        root节点是必选节点，用来指定最基础的日志输出级别，只有一个level属性
-        level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
-        不能设置为INHERITED或者同义词NULL。默认是DEBUG
-        可以包含零个或多个元素，标识这个appender将会添加到这个logger。
-    -->
-
-    <!-- 4. 最终的策略 -->
-    <!-- 4.1 开发环境:打印控制台-->
-    <springProfile name="dev">
-        <logger name="com.sdcm.pmp" level="debug"/>
-    </springProfile>
-
-    <root level="info">
-        <appender-ref ref="CONSOLE" />
-        <appender-ref ref="DEBUG_FILE" />
-        <appender-ref ref="INFO_FILE" />
-        <appender-ref ref="WARN_FILE" />
-        <appender-ref ref="ERROR_FILE" />
-    </root>
-
-    <!-- 4.2 生产环境:输出到文档-->
-    <springProfile name="pro">
-        <root level="info">
-            <appender-ref ref="CONSOLE" />
-            <appender-ref ref="DEBUG_FILE" />
-            <appender-ref ref="INFO_FILE" />
-            <appender-ref ref="ERROR_FILE" />
-            <appender-ref ref="WARN_FILE" />
-        </root>
-    </springProfile>
-
-</configuration>

sckw-modules/sckw-message/src/main/resources/bootstrap-xcq.yml

@@ -0,0 +1,29 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: @nacos.server@
+        # 命名空间
+        namespace: @nacos.namespace@
+        # 共享配置
+        group: sckw-service-platform
+      config:
+        # 配置中心地址
+        server-addr: @nacos.server@
+        # 命名空间
+        namespace: @nacos.namespace@
+        # 共享配置
+        group: sckw-service-platform
+        # 配置文件格式
+        file-extension: yaml
+        shared-configs:
+          - data-id: sckw-common.yml
+            group: sckw-common
+            refresh: true
+
+        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        extension-configs:
+          - dataId: sckw-common.yml
+            group: sckw-service-platform
+            refresh: true

sckw-modules/sckw-message/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
   application:
     name: sckw-message
   profiles:
-    active: ${DEPLOY_MODE:dev}
+    active: @profiles.active@
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true

sckw-modules/sckw-operation/src/main/resources/bootstrap-xcq.yml

@@ -0,0 +1,28 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: @nacos.server@
+        # 命名空间
+        namespace: @nacos.namespace@
+        # 共享配置
+        group: sckw-service-platform
+      config:
+        # 配置中心地址
+        server-addr: @nacos.server@
+        # 命名空间
+        namespace: @nacos.namespace@
+        # 共享配置
+        group: sckw-service-platform
+        # 配置文件格式
+        file-extension: yaml
+        shared-configs:
+          - data-id: sckw-common.yml
+            group: sckw-common
+            refresh: true
+        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        extension-configs:
+          - dataId: sckw-common.yml
+            group: sckw-service-platform
+            refresh: true

sckw-modules/sckw-operation/src/main/resources/logback-spring.xml

@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL，如果设置为WARN，则低于WARN的信息都不会输出 -->
-<!-- scan:当此属性设置为true时，配置文档如果发生改变，将会被重新加载，默认值为true -->
-<!-- scanPeriod:设置监测配置文档是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒。
-                 当scan为true时，此属性生效。默认的时间间隔为1分钟。 -->
-<!-- debug:当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->
-<configuration  scan="true" scanPeriod="10 seconds">
-    <contextName>logback</contextName>
-    <springProperty scope="context" name="applicationName" source="spring.application.name" defaultValue="service"/>
-
-    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
-    <property name="log.path" value="/logs/${applicationName}" />
-
-    <!--0. 日志格式和颜色渲染 -->
-    <!-- 彩色日志依赖的渲染类 -->
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
-    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
-    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
-    <!-- 彩色日志格式 -->
-    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-
-    <!--1. 输出到控制台-->
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>debug</level>
-        </filter>
-        <encoder>
-            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
-            <!-- 设置字符集 -->
-            <charset>UTF-8</charset>
-        </encoder>
-    </appender>
-
-    <!--2. 输出到文档-->
-    <!-- 2.1 level为 DEBUG 日志，时间滚动输出  -->
-    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/web_debug.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志归档 -->
-            <fileNamePattern>${log.path}/web-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录debug级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>debug</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 2.2 level为 INFO 日志，时间滚动输出  -->
-    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/web_info.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 每天日志归档路径以及格式 -->
-            <fileNamePattern>${log.path}/web-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录info级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>info</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 2.3 level为 WARN 日志，时间滚动输出  -->
-    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/web_warn.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/web-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录warn级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>warn</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 2.4 level为 ERROR 日志，时间滚动输出  -->
-    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/web_error.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/web-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!--
-        <logger>用来设置某一个包或者具体的某一个类的日志打印级别、
-        以及指定<appender>。<logger>仅有一个name属性，
-        一个可选的level和一个可选的addtivity属性。
-        name:用来指定受此logger约束的某一个包或者具体的某一个类。
-        level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
-              还有一个特俗值INHERITED或者同义词NULL，代表强制执行上级的级别。
-              如果未设置此属性，那么当前logger将会继承上级的级别。
-        addtivity:是否向上级logger传递打印信息。默认是true。
-        <logger name="org.springframework.web" level="info"/>
-        <logger name="org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor" level="INFO"/>
-    -->
-    <!-- hibernate logger -->
-    <logger name="com.atguigu" level="debug" />
-    <!-- Spring framework logger -->
-    <logger name="org.springframework" level="debug" additivity="false"></logger>
-
-
-    <!--
-        使用mybatis的时候，sql语句是debug下才会打印，而这里我们只配置了info，所以想要查看sql语句的话，有以下两种操作：
-        第一种把<root level="info">改成<root level="DEBUG">这样就会打印sql，不过这样日志那边会出现很多其他消息
-        第二种就是单独给dao下目录配置debug模式，代码如下，这样配置sql语句会打印，其他还是正常info级别：
-        【logging.level.org.mybatis=debug logging.level.dao=debug】
-     -->
-
-    <!--
-        root节点是必选节点，用来指定最基础的日志输出级别，只有一个level属性
-        level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
-        不能设置为INHERITED或者同义词NULL。默认是DEBUG
-        可以包含零个或多个元素，标识这个appender将会添加到这个logger。
-    -->
-
-    <!-- 4. 最终的策略 -->
-    <!-- 4.1 开发环境:打印控制台-->
-    <springProfile name="dev">
-        <logger name="com.sdcm.pmp" level="debug"/>
-    </springProfile>
-
-    <root level="info">
-        <appender-ref ref="CONSOLE" />
-        <appender-ref ref="DEBUG_FILE" />
-        <appender-ref ref="INFO_FILE" />
-        <appender-ref ref="WARN_FILE" />
-        <appender-ref ref="ERROR_FILE" />
-    </root>
-
-    <!-- 4.2 生产环境:输出到文档-->
-    <springProfile name="pro">
-        <root level="info">
-            <appender-ref ref="CONSOLE" />
-            <appender-ref ref="DEBUG_FILE" />
-            <appender-ref ref="INFO_FILE" />
-            <appender-ref ref="ERROR_FILE" />
-            <appender-ref ref="WARN_FILE" />
-        </root>
-    </springProfile>
-
-</configuration>

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

@@ -163,6 +163,13 @@ public class KwoTransportDemandController {
         return HttpResult.ok("批量删除成功");
     }
 
+    /**
+     * @desc: 运需广场列表
+     * @author: yzc
+     * @date: 2023-07-27 15:46
+     * @Param param:
+     * @return: com.sckw.core.web.response.HttpResult
+     */
     @PostMapping(value = "/demandSquaresList", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult demandSquaresList(@RequestBody @Validated TransportDemandSquaresParam param) {
         return HttpResult.ok(kwoTransportDemandService.demandSquaresList(param));

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

@@ -5,8 +5,6 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
-import java.util.List;
-
 /**
  * @desc: 运需广场列表请求参数
  * @author: yzc
@@ -23,9 +21,14 @@ public class TransportDemandSquaresParam extends PageRequest {
     private String keywords;
 
     /**
-     * 商品类型集合
+     * 商品类型type
+     */
+    private String goodsType;
+
+    /**
+     * 商品类型type值
      */
-    private List<String> goodsTypes;
+    private String goodsTypeValue;
 
     /**
      * 装货地区code

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

@@ -6,6 +6,7 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.Range;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -28,8 +29,7 @@ public class UpdateOrderParam {
      * 操作类型0保存、1提交
      */
     @NotNull(message = "操作类型不能为空")
-    @Min(value = 0,message = "非法操作状态")
-    @Max(value = 1,message = "非法操作状态")
+    @Range(min = 1, max = 2, message = "非法订单类型")
     private Integer operateType;
 
     /**

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

@@ -27,6 +27,7 @@ import com.sckw.order.model.vo.res.TransportDemandListRes;
 import com.sckw.order.model.vo.res.TransportDemandSquaresListRes;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
+import com.sckw.system.api.model.dto.res.SysDictResDto;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -374,8 +375,14 @@ public class KwoTransportDemandService {
     public PageResult demandSquaresList(TransportDemandSquaresParam param) {
         Page<KwoTransportDemand> page = new Page<>(param.getPage(), param.getPageSize());
         LambdaQueryWrapper<KwoTransportDemand> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(CollectionUtils.isNotEmpty(param.getGoodsTypes()), KwoTransportDemand::getGoodsType, param.getGoodsTypes())
-                .eq(KwoTransportDemand::getStatus, Integer.valueOf(DictEnum.TRANSPORT_DEMAND_STATUS_1.getValue()))
+        if (StringUtils.isNotBlank(param.getGoodsType()) && StringUtils.isNotBlank(param.getGoodsTypeValue())) {
+            List<SysDictResDto> goodsTypeList = remoteSystemService.queryDictBottom(param.getGoodsType(), param.getGoodsTypeValue());
+            if (CollectionUtils.isNotEmpty(goodsTypeList)) {
+                List<String> goodsTypes = goodsTypeList.stream().map(SysDictResDto::getValue).toList();
+                wrapper.in(KwoTransportDemand::getGoodsType, goodsTypes);
+            }
+        }
+        wrapper.eq(KwoTransportDemand::getStatus, Integer.valueOf(DictEnum.TRANSPORT_DEMAND_STATUS_1.getValue()))
                 .eq(KwoTransportDemand::getDelFlag, Global.NO);
         Integer loadCode = param.getLoadAreaCode();
         if (Objects.nonNull(loadCode) && Objects.nonNull(param.getLoadAreaLevel())) {

sckw-modules/sckw-order/src/main/resources/bootstrap-xcq.yml

@@ -0,0 +1,29 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: @nacos.server@
+        # 命名空间
+        namespace: @nacos.namespace@
+        # 共享配置
+        group: sckw-service-platform
+      config:
+        # 配置中心地址
+        server-addr: @nacos.server@
+        # 命名空间
+        namespace: @nacos.namespace@
+        # 共享配置
+        group: sckw-service-platform
+        # 配置文件格式
+        file-extension: yaml
+        shared-configs:
+          - data-id: sckw-common.yml
+            group: sckw-common
+            refresh: true
+
+        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        extension-configs:
+          - dataId: sckw-common.yml
+            group: sckw-service-platform
+            refresh: true

sckw-modules/sckw-order/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
   application:
     name: sckw-order
   profiles:
-    active: ${DEPLOY_MODE:dev}
+    active: @profiles.active@
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpLedgerLogisticsController.java

@@ -1,6 +1,8 @@
 package com.sckw.payment.controller;
 
+import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.page.PageRes;
+import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.payment.model.dto.ILedger;
@@ -28,6 +30,15 @@ public class KwpLedgerLogisticsController {
     @Resource
     private KwpLedgerLogisticsService kwpLedgerLogisticsService;
 
+    private void fill(LogisticsSendReq logisticsSendReq) {
+        String ids = logisticsSendReq.getIds();
+        List<Long> longs = StringUtils.splitStrToList(ids, Long.class);
+        if (CollectionUtils.isEmpty(longs)) {
+            throw new BusinessException("物流订单不能为空");
+        }
+        logisticsSendReq.setOrders(longs);
+    }
+
     /**
      * 物流对账单-发起对账(保存草稿)
      *
@@ -36,6 +47,7 @@ public class KwpLedgerLogisticsController {
      */
     @PostMapping("sendDraft")
     public HttpResult sendDraft(@RequestBody @Valid LogisticsSendReq logisticsReq) {
+        fill(logisticsReq);
         return HttpResult.ok(kwpLedgerLogisticsService.sendLedgerDraft(logisticsReq));
     }
 
@@ -47,6 +59,7 @@ public class KwpLedgerLogisticsController {
      */
     @PostMapping("send")
     public HttpResult send(@RequestBody @Valid LogisticsSendReq logisticsReq) {
+        fill(logisticsReq);
         return HttpResult.ok(kwpLedgerLogisticsService.sendLedger(logisticsReq));
     }
 
@@ -73,14 +86,25 @@ public class KwpLedgerLogisticsController {
     }
 
     /**
-     * 查询物流对账单详情（修改物流对账单接口使用）
+     * 查询物流对账单详情
      *
      * @param id
      * @return
      */
     @GetMapping("queryDetail")
-    public HttpResult queryDetail(@RequestParam("id") Long id) {
-        return HttpResult.ok(kwpLedgerLogisticsService.queryDetail(id));
+    public HttpResult queryDetail(@RequestParam("id") String id) {
+        return HttpResult.ok(kwpLedgerLogisticsService.queryDetail(Long.valueOf(id)));
+    }
+
+    /**
+     * 修改物流对账单详情（修改物流对账单接口使用）
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("queryUpdate")
+    public HttpResult queryUpdate(@RequestParam("id") String id) {
+        return HttpResult.ok(kwpLedgerLogisticsService.queryUpdate(Long.valueOf(id)));
     }
 
     /**
@@ -105,13 +129,14 @@ public class KwpLedgerLogisticsController {
 
     /**
      * 删除对账单
+     * 释放关联的订单（只有删除操作才释放订单）
      *
      * @param id
      * @return
      */
     @DeleteMapping("delete")
-    public HttpResult delete(@RequestParam("id") Long id) {
-        return HttpResult.ok(kwpLedgerLogisticsService.remove(id));
+    public HttpResult delete(@RequestParam("id") String id) {
+        return HttpResult.ok(kwpLedgerLogisticsService.remove(Long.valueOf(id)));
     }
 
     /**
@@ -121,8 +146,8 @@ public class KwpLedgerLogisticsController {
      * @return
      */
     @PostMapping("back")
-    public HttpResult back(@RequestParam("id") Long id) {
-        return HttpResult.ok(kwpLedgerLogisticsService.backOrder(id));
+    public HttpResult back(@RequestParam("id") String id) {
+        return HttpResult.ok(kwpLedgerLogisticsService.backOrder(Long.valueOf(id)));
     }
 
     /**
@@ -143,8 +168,8 @@ public class KwpLedgerLogisticsController {
      * @return
      */
     @GetMapping("queryBack")
-    public HttpResult queryBack(@RequestParam("id") Long id) {
-        return HttpResult.ok(kwpLedgerLogisticsService.queryBack(id));
+    public HttpResult queryBack(@RequestParam("id") String id) {
+        return HttpResult.ok(kwpLedgerLogisticsService.queryBack(Long.valueOf(id)));
     }
 
     /**
@@ -181,13 +206,14 @@ public class KwpLedgerLogisticsController {
      */
     @PostMapping("exportShipper")
     public HttpResult exportShipper(HttpServletResponse response, @RequestBody LogisticsReq logisticsReq) {
-        List<Long> ids = logisticsReq.getIds();
+        String ids = logisticsReq.getIds();
+        List<Long> longs = StringUtils.splitStrToList(ids, Long.class);
         List<ILedger> list;
-        if (CollectionUtils.isEmpty(ids)) {
+        if (CollectionUtils.isEmpty(longs)) {
             PageRes<ILedger> pageResult = kwpLedgerLogisticsService.shipperList(logisticsReq);
             list = pageResult.getList();
         } else {
-            list = kwpLedgerLogisticsService.selectShipperList(ids);
+            list = kwpLedgerLogisticsService.selectShipperList(longs);
         }
         if (CollectionUtils.isEmpty(list)) {
             return HttpResult.error("没有可导出的数据");
@@ -211,14 +237,15 @@ public class KwpLedgerLogisticsController {
      */
     @PostMapping("exportCarrier")
     public HttpResult exportCarrier(HttpServletResponse response, @RequestBody LogisticsReq logisticsReq) {
-        List<Long> ids = logisticsReq.getIds();
+        String ids = logisticsReq.getIds();
+        List<Long> longs = StringUtils.splitStrToList(ids, Long.class);
         List<ILedger> list;
-        if (CollectionUtils.isEmpty(ids)) {
+        if (CollectionUtils.isEmpty(longs)) {
             PageRes<ILedger> pageResult = kwpLedgerLogisticsService.carrierList(logisticsReq);
             list = pageResult.getList();
 
         } else {
-            list = kwpLedgerLogisticsService.selectCarrierList(ids);
+            list = kwpLedgerLogisticsService.selectCarrierList(longs);
         }
         if (CollectionUtils.isEmpty(list)) {
             return HttpResult.error("没有可导出的数据");

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpLedgerTradeController.java

@@ -1,6 +1,8 @@
 package com.sckw.payment.controller;
 
+import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.page.PageRes;
+import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.payment.model.dto.ILedger;
@@ -10,8 +12,10 @@ import com.sckw.payment.service.KwpLedgerTradeService;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -24,10 +28,20 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/kwpLedgerTrade")
+@Validated
 public class KwpLedgerTradeController {
     @Resource
     private KwpLedgerTradeService kwpLedgerTradeService;
 
+    private void fill(TradeSendReq tradeSendReq) {
+        String ids = tradeSendReq.getIds();
+        List<Long> longs = StringUtils.splitStrToList(ids, Long.class);
+        if (CollectionUtils.isEmpty(longs)) {
+            throw new BusinessException("销售订单不能为空");
+        }
+        tradeSendReq.setOrders(longs);
+    }
+
     /**
      * 贸易对账单-发起对账(保存草稿)
      *
@@ -36,6 +50,7 @@ public class KwpLedgerTradeController {
      */
     @PostMapping("sendDraft")
     public HttpResult sendDraft(@RequestBody @Valid TradeSendReq tradeSendReq) {
+        fill(tradeSendReq);
         return HttpResult.ok(kwpLedgerTradeService.sendLedgerDraft(tradeSendReq));
     }
 
@@ -47,6 +62,7 @@ public class KwpLedgerTradeController {
      */
     @PostMapping("send")
     public HttpResult send(@RequestBody @Valid TradeSendReq tradeSendReq) {
+        fill(tradeSendReq);
         return HttpResult.ok(kwpLedgerTradeService.sendLedger(tradeSendReq));
     }
 
@@ -73,14 +89,25 @@ public class KwpLedgerTradeController {
     }
 
     /**
-     * 查询物流对账单详情（修改物流对账单接口使用）
+     * 查询贸易对账单详情
      *
      * @param id
      * @return
      */
     @GetMapping("queryDetail")
-    public HttpResult queryDetail(@RequestParam("id") Long id) {
-        return HttpResult.ok(kwpLedgerTradeService.queryDetail(id));
+    public HttpResult queryDetail(@RequestParam("id") String id) {
+        return HttpResult.ok(kwpLedgerTradeService.queryDetail(Long.valueOf(id)));
+    }
+
+    /**
+     * 修改贸易对账单详情（修改物流对账单接口使用）
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("queryUpdate")
+    public HttpResult queryUpdate(@RequestParam("id") String id) {
+        return HttpResult.ok(kwpLedgerTradeService.queryUpdate(Long.valueOf(id)));
     }
 
     /**
@@ -110,8 +137,8 @@ public class KwpLedgerTradeController {
      * @return
      */
     @DeleteMapping("delete")
-    public HttpResult delete(@RequestParam("id") Long id) {
-        return HttpResult.ok(kwpLedgerTradeService.remove(id));
+    public HttpResult delete(@NotBlank(message = "id不能为空")String id) {
+        return HttpResult.ok(kwpLedgerTradeService.remove(Long.valueOf(id)));
     }
 
     /**
@@ -121,8 +148,8 @@ public class KwpLedgerTradeController {
      * @return
      */
     @PostMapping("back")
-    public HttpResult back(@RequestParam("id") Long id) {
-        return HttpResult.ok(kwpLedgerTradeService.backOrder(id));
+    public HttpResult back(@NotBlank(message = "id不能为空")@RequestParam("id") String id) {
+        return HttpResult.ok(kwpLedgerTradeService.backOrder(Long.valueOf(id)));
     }
 
     /**
@@ -143,8 +170,8 @@ public class KwpLedgerTradeController {
      * @return
      */
     @GetMapping("queryBack")
-    public HttpResult queryBack(@RequestParam("id") Long id) {
-        return HttpResult.ok(kwpLedgerTradeService.queryBack(id));
+    public HttpResult queryBack(@NotBlank(message = "id不能为空")@RequestParam("id") String id) {
+        return HttpResult.ok(kwpLedgerTradeService.queryBack(Long.valueOf(id)));
     }
 
     /**
@@ -182,11 +209,14 @@ public class KwpLedgerTradeController {
     @PostMapping("sellExport")
     public HttpResult sellExport(HttpServletResponse response, @RequestBody @Valid TradeReq tradeReq) {
         List<ILedger> list;
-        if (CollectionUtils.isEmpty(tradeReq.getIds())) {
+        String ids = tradeReq.getIds();
+        List<Long> longs = StringUtils.splitStrToList(ids, Long.class);
+
+        if (CollectionUtils.isEmpty(longs)) {
             PageRes<ILedger> pageResult = kwpLedgerTradeService.sellList(tradeReq);
             list = pageResult.getList();
         } else {
-            list = kwpLedgerTradeService.selectSellList(tradeReq.getIds());
+            list = kwpLedgerTradeService.selectSellList(longs);
         }
 
         if (CollectionUtils.isEmpty(list)) {
@@ -211,11 +241,14 @@ public class KwpLedgerTradeController {
     @PostMapping("purchaseExport")
     public HttpResult purchaseExport(HttpServletResponse response, @RequestBody @Valid TradeReq tradeReq) {
         List<ILedger> list;
-        if (CollectionUtils.isEmpty(tradeReq.getIds())) {
+        String ids = tradeReq.getIds();
+        List<Long> longs = StringUtils.splitStrToList(ids, Long.class);
+
+        if (CollectionUtils.isEmpty(longs)) {
             PageRes<ILedger> pageResult = kwpLedgerTradeService.purchaseList(tradeReq);
             list = pageResult.getList();
         } else {
-            list = kwpLedgerTradeService.selectPurchaseList(tradeReq.getIds());
+            list = kwpLedgerTradeService.selectPurchaseList(longs);
         }
 
         if (CollectionUtils.isEmpty(list)) {

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpSettlementLogisticsController.java

@@ -1,13 +1,130 @@
 package com.sckw.payment.controller;
+
+import com.sckw.core.exception.BusinessException;
+import com.sckw.core.model.page.PageRes;
+import com.sckw.core.web.response.HttpResult;
+import com.sckw.excel.utils.ExcelUtil;
+import com.sckw.payment.model.constant.LogisticsUnitType;
+import com.sckw.payment.model.dto.SettlementLogisticsDto;
+import com.sckw.payment.model.vo.req.SettlementReq;
+import com.sckw.payment.model.vo.req.SettlementWalletReq;
+import com.sckw.payment.model.vo.res.SettlementLogisticsVo;
+import com.sckw.payment.service.KwpSettlementLogisticsService;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
-* 结算-物流订单
-*
-* @author xucaiqin
-*/
+ * 结算-物流订单
+ *
+ * @author Aick Spt
+ * @date 2023-07-18 16:34
+ */
 @RestController
-@RequestMapping("/kwp_settlement_logistics")
+@Slf4j
+@RequestMapping(name = "结算-物流运费订单", path = "/kwpSettlementLogistics")
 public class KwpSettlementLogisticsController {
-    
+
+    @Resource
+    private KwpSettlementLogisticsService kwpSettlementLogisticsService;
+
+    //   ========= 运费收款 承运方 =========
+    @PostMapping(name = "运费收款-物流订单列表", path = "pageListCollection")
+    public HttpResult pageSelectCollection(@RequestBody @Valid SettlementReq settlementReq) {
+        return HttpResult.ok(kwpSettlementLogisticsService.pageSelectCollection(settlementReq));
+    }
+
+//    @PostMapping(name = "物流-电子钱 -列表", path = "testpageSelectCollection")
+//    public HttpResult testpageSelectCollection(@RequestBody @Valid SettlementReq settlementReq) {
+//       System.out.println(settlementReq.getIds());
+//        return HttpResult.ok(settlementReq);
+//    }
+    @PostMapping(name = "运费收款-物流订单各状态列表总数", path = "getCountListCollection")
+    public HttpResult getCountListCollection(@RequestBody @Valid SettlementReq settlementReq) {
+        return HttpResult.ok(kwpSettlementLogisticsService.getCountListCollection(settlementReq));
+    }
+
+    @PostMapping(name = "运费收款-根据条件导出物流订单表数据", path = "exportCollection")
+    public HttpResult exportCollection(HttpServletResponse response, @RequestBody @Valid SettlementReq settlementReq) {
+        List<SettlementLogisticsDto> list;
+        if (CollectionUtils.isEmpty(settlementReq.getIds()) && settlementReq.getPage() != 0 && settlementReq.getPageSize() != 0) {
+            //有page、pageSize，无ids
+            PageRes<SettlementLogisticsDto> pageResult = kwpSettlementLogisticsService.pageSelectCollection(settlementReq);
+            list = pageResult.getList();
+        } else if (CollectionUtils.isEmpty(settlementReq.getIds())) {
+            //无page、pageSize，无ids
+            list = kwpSettlementLogisticsService.selectList(LogisticsUnitType.CARRIER);
+        } else {
+            //有ids
+            list = kwpSettlementLogisticsService.selectList(settlementReq.getIds());
+        }
+        return this.export(response, list);
+    }
+
+    @GetMapping(name = "运费收款-物流订单详情", path = "detailCollection")
+    public HttpResult detailCollection(@RequestParam("id") Long id) {
+        return HttpResult.ok(kwpSettlementLogisticsService.detailCollection(id));
+    }
+
+
+    //   ========= 运费付款 托运方 =========
+    @PostMapping(name = "运费付款-物流订单列表", path = "pageListPayment")
+    public HttpResult pageSelectPayment(@RequestBody @Valid SettlementReq settlementReq) {
+        return HttpResult.ok(kwpSettlementLogisticsService.pageSelectPayment(settlementReq));
+    }
+
+    @PostMapping(name = "运费付款-物流订单各状态列表总数", path = "getCountListPayment")
+    public HttpResult getCountListPayment(@RequestBody @Valid SettlementReq settlementReq) {
+        return HttpResult.ok(kwpSettlementLogisticsService.getCountListPayment(settlementReq));
+    }
+
+    @PostMapping(name = "运费付款-根据条件导出物流订单表数据", path = "exportPayment")
+    public HttpResult exportPayment(HttpServletResponse response, @RequestBody @Valid SettlementReq settlementReq) {
+        List<SettlementLogisticsDto> list;
+        if (CollectionUtils.isEmpty(settlementReq.getIds()) && settlementReq.getPage() != 0 && settlementReq.getPageSize() != 0) {
+            //有page、pageSize，无ids
+            PageRes<SettlementLogisticsDto> pageResult = kwpSettlementLogisticsService.pageSelectPayment(settlementReq);
+            list = pageResult.getList();
+        } else if (CollectionUtils.isEmpty(settlementReq.getIds())) {
+            //无page、pageSize，无ids
+            list = kwpSettlementLogisticsService.selectList(LogisticsUnitType.SHIPPER);
+        } else {
+            //有ids
+            list = kwpSettlementLogisticsService.selectList(settlementReq.getIds());
+        }
+        return this.export(response, list);
+    }
+
+    @GetMapping(name = "物流订单详情", path = "detailPayment")
+    public HttpResult detailPayment(@RequestParam("id") Long id) {
+        return HttpResult.ok(kwpSettlementLogisticsService.detailPayment(id));
+    }
+
+    /**
+     * 导出
+     *
+     * @author Aick Spt
+     * @date 2023-07-24 15:49
+     */
+    private HttpResult export(HttpServletResponse response, List<SettlementLogisticsDto> list) {
+        if (CollectionUtils.isEmpty(list)) {
+            return HttpResult.error("没有可导出的数据");
+        }
+        List<SettlementLogisticsVo> collect = list.stream().map(a -> {
+            SettlementLogisticsVo settlementLogisticsVo = new SettlementLogisticsVo();
+            BeanUtils.copyProperties(a, settlementLogisticsVo);
+            return settlementLogisticsVo;
+        }).collect(Collectors.toList());
+        ExcelUtil.downData(response, SettlementLogisticsVo.class, collect);
+        return null;
+    }
+
+
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpSettlementOfflineController.java

@@ -1,13 +1,54 @@
 package com.sckw.payment.controller;
+
+import com.sckw.core.web.response.HttpResult;
+import com.sckw.payment.model.vo.req.SettlementOfflineReq;
+import com.sckw.payment.model.vo.req.SettlementReq;
+import com.sckw.payment.service.KwpSettlementOfflineService;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.*;
 
 /**
-* 下线结算记录（交易订单结算/物流订单结算）
-*
-* @author xucaiqin
-*/
+ * 结算-线下记录（交易订单结算/物流订单结算）
+ *
+ * @author Aick Spt
+ * @date 2023-07-20 11:42
+ */
 @RestController
-@RequestMapping("/kwp_settlement_offline")
+@RequestMapping(name = "结算-线下记录", path = "/kwpSettlementOffline")
 public class KwpSettlementOfflineController {
-    
+
+    @Resource
+    private KwpSettlementOfflineService kwpSettlementOfflineService;
+
+    //  =========  运费收款  =========
+
+    @PostMapping(name = "物流-线下付款(运费收款)记录-列表", path = "pageListLogisticsCollection")
+    public HttpResult pageListLogisticsCollection(@RequestBody @Valid SettlementOfflineReq settlementOfflineReq) {
+        return HttpResult.ok(kwpSettlementOfflineService.pageListLogisticsCollection(settlementOfflineReq));
+    }
+
+    @GetMapping(name = "物流-线下付款(运费收款)记录-详情", path = "detailLogisticsCollection")
+    public HttpResult detailLogisticsCollection(@RequestParam("id") Long id) {
+        return HttpResult.ok(kwpSettlementOfflineService.detailLogisticsCollection(id));
+    }
+
+    @GetMapping(name = "物流-线下付款(运费收款)记录-新增", path = "confirmLogisticsCollection")
+    public HttpResult confirmLogisticsCollection(@RequestParam("id") Long id, @RequestParam("price") Float price) {
+        return HttpResult.ok(kwpSettlementOfflineService.confirmLogisticsCollection(id, price));
+    }
+
+
+    //  =========  销售收款  =========
+
+    @PostMapping(name = "交易-线下付款(销售收款)记录-列表", path = "pageListTradeCollection")
+    public HttpResult pageListTradeCollection(@RequestBody @Valid SettlementOfflineReq settlementOfflineReq) {
+        return HttpResult.ok(kwpSettlementOfflineService.pageListTradeCollection(settlementOfflineReq));
+    }
+
+    @GetMapping(name = "交易-线下付款(销售收款)记录-新增",path = "confirmTradeCollection")
+    public HttpResult confirmTradeCollection(@RequestParam("id") Long id,@RequestParam("price") Float price){
+        return HttpResult.ok(kwpSettlementOfflineService.confirmTradeCollection(id,price));
+    }
+
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpSettlementTradeController.java

@@ -1,13 +1,109 @@
 package com.sckw.payment.controller;
+
+import com.sckw.core.model.page.PageRes;
+import com.sckw.core.web.response.HttpResult;
+import com.sckw.excel.utils.ExcelUtil;
+import com.sckw.payment.model.dto.SettlementTradeDto;
+import com.sckw.payment.model.vo.req.SettlementReq;
+import com.sckw.payment.model.vo.res.SettlementLogisticsVo;
+import com.sckw.payment.service.KwpSettlementTradeService;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.beans.BeanUtils;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
-* 结算-交易订单
-*
-* @author xucaiqin
-*/
+ * 结算-交易订单
+ *
+ * @author xucaiqin
+ */
 @RestController
-@RequestMapping("/kwp_settlement_trade")
+@RequestMapping(name = "结算-销售采购订单", path = "/kwpSettlementTrade")
 public class KwpSettlementTradeController {
-    
+
+    @Resource
+    private KwpSettlementTradeService kwpSettlementTradeService;
+
+    //   ========= 收款 销售 =========
+    @PostMapping(name = "收款-销售结算单列表", path = "pageListCollection")
+    public HttpResult pageListCollection(@RequestBody @Valid SettlementReq settlementReq) {
+        return HttpResult.ok(kwpSettlementTradeService.pageListCollection(settlementReq));
+    }
+
+    @GetMapping(name = "收款-销售结算单列表头部汇总数量", path = "getCountListCollection")
+    public HttpResult getCountListCollection(@RequestBody @Valid SettlementReq settlementReq) {
+        return HttpResult.ok(kwpSettlementTradeService.getCountListCollection(settlementReq));
+    }
+
+    @PostMapping(name = "收款-根据ids导出销售结算单列表", path = "exportCollection")
+    public HttpResult exportCollection(HttpServletResponse response, @RequestBody @Valid SettlementReq settlementReq) {
+        List<SettlementTradeDto> list;
+        if (CollectionUtils.isEmpty(settlementReq.getIds())) {
+            PageRes<SettlementTradeDto> pageResult = kwpSettlementTradeService.pageListCollection(settlementReq);
+            list = pageResult.getList();
+        } else {
+            list = kwpSettlementTradeService.selectList(settlementReq.getIds());
+        }
+        return this.export(response, list);
+    }
+
+    @GetMapping(name = "收款-销售结算订单详情", path = "detailCollection")
+    public HttpResult detailCollection(@RequestParam("id") Long id) {
+        return HttpResult.ok(kwpSettlementTradeService.detailCollection(id));
+    }
+
+
+    //   ========= 付款 采购 =========
+    @PostMapping(name = "付款-采购结算单列表", path = "pageListPayment")
+    public HttpResult pageListPayment(@RequestBody @Valid SettlementReq settlementReq) {
+        return HttpResult.ok(kwpSettlementTradeService.pageListPayment(settlementReq));
+    }
+
+    @GetMapping(name = "收款-物流结算订单列表头部汇总数量", path = "getCountListPayment")
+    public HttpResult getCountListPayment(@RequestBody @Valid SettlementReq settlementReq) {
+        return HttpResult.ok(kwpSettlementTradeService.getCountListPayment(settlementReq));
+    }
+
+    @PostMapping(name = "付款-根据ids导出采购结算单列表", path = "exportPayment")
+    public HttpResult exportPayment(HttpServletResponse response, @RequestBody @Valid SettlementReq settlementReq) {
+        List<SettlementTradeDto> list;
+        if (CollectionUtils.isEmpty(settlementReq.getIds())) {
+            PageRes<SettlementTradeDto> pageResult = kwpSettlementTradeService.pageListPayment(settlementReq);
+            list = pageResult.getList();
+        } else {
+            list = kwpSettlementTradeService.selectList(settlementReq.getIds());
+        }
+        return this.export(response, list);
+    }
+
+    @GetMapping(name = "付款-采购结算订单详情", path = "detailPayment")
+    public HttpResult detailPayment(@RequestParam("id") Long id) {
+        return HttpResult.ok(kwpSettlementTradeService.detailPayment(id));
+    }
+
+    /**
+     * 导出
+     *
+     * @author Aick Spt
+     * @date 2023-07-24 15:49
+     */
+    private HttpResult export(HttpServletResponse response, List<SettlementTradeDto> list) {
+        if (CollectionUtils.isEmpty(list)) {
+            return HttpResult.error("没有可导出的数据");
+        }
+        List<SettlementLogisticsVo> collect = list.stream().map(a -> {
+            SettlementLogisticsVo settlementLogisticsVo = new SettlementLogisticsVo();
+            BeanUtils.copyProperties(a, settlementLogisticsVo);
+            return settlementLogisticsVo;
+        }).collect(Collectors.toList());
+        ExcelUtil.downData(response, SettlementLogisticsVo.class, collect);
+        return null;
+    }
+
+
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpSettlementWalletController.java

@@ -1,13 +1,83 @@
 package com.sckw.payment.controller;
+
+import com.sckw.core.web.response.HttpResult;
+import com.sckw.payment.model.vo.req.SettlementWalletReq;
+import com.sckw.payment.service.KwpSettlementWalletService;
+import jakarta.annotation.Resource;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
+
 /**
-* 电子钱包结算记录（交易订单结算/物流订单结算）
-*
-* @author xucaiqin
-*/
+ * 结算-电子钱包结算记录（交易订单结算/物流订单结算）
+ *
+ * @author Aick Spt
+ * @date 2023-07-20 14:42
+ */
 @RestController
-@RequestMapping("/kwp_settlement_wallet")
+@RequestMapping(name = "结算-电子钱包结算记录", path = "/kwpSettlementWallet")
 public class KwpSettlementWalletController {
-    
+
+    //  =========  物流付款  =========
+
+    @Resource
+    private KwpSettlementWalletService kwpSettlementWalletService;
+
+    @PostMapping(name = "物流-电子钱包付款（货到付款）结算记录-列表", path = "pageListLogisticsPayment")
+    public HttpResult pageListLogisticsPayment(SettlementWalletReq settlementWalletReq) {
+        return HttpResult.ok(kwpSettlementWalletService.pageListLogisticsPayment(settlementWalletReq));
+    }
+
+    @GetMapping(name = "物流-电子钱包付款（货到付款）结算记录-详情", path = "detailLogisticsPayment")
+    public HttpResult detailLogisticsPayment(@RequestParam("id") Long id) {
+        return HttpResult.ok(kwpSettlementWalletService.detailLogisticsPayment(id));
+    }
+
+    /**
+     * @param id    结算单id
+     * @param price 本次付款金额
+     * @author Aick Spt
+     * @date 2023-07-25 09:55
+     */
+    @GetMapping(name = "物流-电子钱包付款（货到付款）结算记录-新增", path = "confirmLogisticsPayment")
+    public HttpResult confirmLogisticsPayment(@RequestParam("id") Long id, @RequestParam("price") BigDecimal price) {
+        return HttpResult.ok(kwpSettlementWalletService.confirmLogisticsPayment(id, price));
+    }
+
+
+
+    //  =========  销售收付款  =========
+    @PostMapping(name = "销售-付款记录列表（采购电子钱包结算记录）", path = "pageListTradePayment")
+    public HttpResult pageListTradePayment(SettlementWalletReq settlementWalletReq) {
+        return HttpResult.ok(kwpSettlementWalletService.pageListTradePayment(settlementWalletReq));
+    }
+
+    /**
+     * @param id    结算单id
+     * @param price 本次付款金额
+     * @author Aick Spt
+     * @date 2023-07-25 09:55
+     */
+    @GetMapping(name = "销售-付款确认-(新增电子钱包记录-采购货到付款)", path = "confirmTradePayment")
+    public HttpResult confirmTradePayment(@RequestParam("id") Long id, @RequestParam("price") BigDecimal price) {
+        return HttpResult.ok(kwpSettlementWalletService.confirmTradePayment(id, price));
+    }
+
+    @PostMapping(name = "销售-收款记录列表-预付款(电子钱包)", path = "pageListTradeCollection")
+    public HttpResult pageListTradeCollection(SettlementWalletReq settlementWalletReq) {
+        return HttpResult.ok(kwpSettlementWalletService.pageListTradeCollection(settlementWalletReq));
+    }
+
+    /**
+     * @param id    结算单id
+     * @param price 本次付款金额
+     * @author Aick Spt
+     * @date 2023-07-25 09:55
+     */
+    @GetMapping(name = "销售-收款确认-预付款(电子钱包)", path = "confirmTradeCollection")
+    public HttpResult confirmTradeCollection(@RequestParam("id") Long id, @RequestParam("price") Float price) {
+        return HttpResult.ok(kwpSettlementWalletService.confirmTradeCollection(id, price));
+    }
+
+
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpSettlementLogisticsMapper.java

@@ -2,13 +2,80 @@ package com.sckw.payment.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.payment.model.KwpSettlementLogistics;
+import com.sckw.payment.model.dto.SettlementLogisticsDto;
+import com.sckw.payment.model.vo.req.SettlementReq;
+import com.sckw.payment.model.vo.res.SettlementLogisticsSumVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
- * @author xucaiqin
- * @date 2023-07-10 16:42:20
+ * @author Aick Spt
+ * @date 2023-07-24 14:55
  */
-
 @Mapper
 public interface KwpSettlementLogisticsMapper extends BaseMapper<KwpSettlementLogistics> {
+
+    /**
+     * 运费收款-物流订单列表
+     *
+     * @author Aick Spt
+     * @date 2023-07-24 16:21
+     */
+    List<SettlementLogisticsDto> pageSelectCollection(@Param("settlementReq") SettlementReq settlementReq);
+
+
+    SettlementLogisticsSumVo selectCollectionSum(@Param("settlementReq") SettlementReq settlementReq);
+
+
+    /**
+     * 运费收款-物流订单各状态列表总数
+     *
+     * @author Aick Spt
+     * @date 2023-07-24 16:21
+     */
+    Long getCountListCollection(@Param("settlementReq") SettlementReq settlementReq);
+
+    /**
+     * 运费收款-物流订单详情
+     *
+     * @author Aick Spt
+     * @date 2023-07-24 16:22
+     */
+    SettlementLogisticsDto detailCollection(@Param("id") Long id);
+
+
+    /**
+     * 运费付款-物流订单列表
+     *
+     * @author Aick Spt
+     * @date 2023-07-24 16:23
+     */
+    List<SettlementLogisticsDto> pageSelectPayment(@Param("settlementReq") SettlementReq settlementReq);
+
+    /**
+     * 运费付款-物流订单各状态列表总数
+     *
+     * @author Aick Spt
+     * @date 2023-07-24 16:23
+     */
+    Long getCountListPayment(@Param("settlementReq") SettlementReq settlementReq);
+
+    /**
+     * 运费付款-物流订单详情
+     *
+     * @author Aick Spt
+     * @date 2023-07-24 16:24
+     */
+    SettlementLogisticsDto detailPayment(@Param("id") Long id);
+
+    /**
+     * 根据id查物流结算订单
+     *
+     * @author Aick Spt
+     * @date 2023-07-24 16:24
+     */
+    List<SettlementLogisticsDto> selectIds(@Param("ids") List<Long> ids);
+    List<SettlementLogisticsDto> selectList(@Param("unitType") Integer unitType);
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpSettlementOfflineMapper.java

@@ -2,13 +2,23 @@ package com.sckw.payment.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.payment.model.KwpSettlementOffline;
+import com.sckw.payment.model.dto.SettlementOfflineDto;
+import com.sckw.payment.model.vo.req.SettlementOfflineReq;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
- * @author xucaiqin
- * @date 2023-07-10 16:42:19
+ *
+ * @author Aick Spt
+ * @date 2023-07-25 10:44
  */
-
 @Mapper
 public interface KwpSettlementOfflineMapper extends BaseMapper<KwpSettlementOffline> {
+    List<SettlementOfflineDto> pageListLogisticsCollection(SettlementOfflineReq settlementOfflineReq);
+
+    SettlementOfflineDto detailLogisticsCollection(@Param("id") Long id);
+
+    Integer confirmLogisticsCollection(@Param("id") Long id,@Param("price") Float price);
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpSettlementWalletMapper.java

@@ -1,14 +1,31 @@
 package com.sckw.payment.dao;
 
+import java.util.List;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.payment.model.KwpSettlementWallet;
+import com.sckw.payment.model.dto.SettlementWalletDto;
+import com.sckw.payment.model.vo.req.SettlementWalletReq;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
- * @author xucaiqin
- * @date 2023-07-10 16:42:20
+ * @author Aick Spt
+ * @date 2023-07-25 11:01
  */
 
 @Mapper
-public interface KwpSettlementWalletMapper extends BaseMapper<KwpSettlementWallet> {
+public interface KwpSettlementWalletMapper  extends BaseMapper<KwpSettlementWallet> {
+
+    /**
+     * 运费付款-物流订单列表
+     *
+     * @author Aick Spt
+     * @date 2023-07-24 16:23
+     */
+    List<SettlementWalletDto> pageListLogisticsPayment(@Param("settlementWalletReq") SettlementWalletReq settlementWalletReq);
+
+    SettlementWalletDto detailLogisticsPayment(@Param("id") Long id);
+
+    Integer confirmLogisticsPayment(@Param("id") Long id, @Param("price") Float price);
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpLedgerLogisticsOrder.java

@@ -4,23 +4,16 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
+import lombok.Data;
 
 import java.time.LocalDateTime;
 
 /**
+ * 对账-物流订单-对账关联交易订单
  * @author xucaiqin
  * @date 2023-07-10 16:42:19
  */
-
-/**
- * 对账-物流订单-对账关联交易订单
- */
-@Getter
-@Setter
-@ToString
+@Data
 @TableName(value = "kwp_ledger_logistics_order")
 public class KwpLedgerLogisticsOrder {
     /**
@@ -41,6 +34,12 @@ public class KwpLedgerLogisticsOrder {
     @TableField(value = "l_order_id")
     private Long lOrderId;
 
+    /**
+     * 物流订单编号（kwt_logistics_order）
+     */
+    @TableField(value = "l_order_no")
+    private String lOrderNo;
+
     /**
      * 备注
      */

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpLedgerTradeOrder.java

@@ -4,22 +4,16 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
+import lombok.Data;
 
-/**
- * @author xucaiqin
- * @date 2023-07-10 16:42:19
- */
+import java.time.LocalDateTime;
 
 /**
  * 对账-交易订单-对账关联交易订单
- */
-@Getter
-@Setter
-@ToString
+* @date 2023-07-27 12:45:43
+* @author xucaiqin
+*/
+@Data
 @TableName(value = "kwp_ledger_trade_order")
 public class KwpLedgerTradeOrder {
     /**
@@ -40,6 +34,12 @@ public class KwpLedgerTradeOrder {
     @TableField(value = "t_order_id")
     private Long tOrderId;
 
+    /**
+     * 交易订单编号（kwo_trade_order）
+     */
+    @TableField(value = "t_order_no")
+    private String tOrderNo;
+
     /**
      * 备注
      */

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpSettlementLogistics.java

@@ -13,6 +13,7 @@ import java.time.LocalDateTime;
 
 /**
  * 结算-物流订单
+ *
  * @author xucaiqin
  * @date 2023-07-10 16:42:20
  */
@@ -45,6 +46,9 @@ public class KwpSettlementLogistics {
     @TableField(value = "sl_order_no")
     private String slOrderNo;
 
+    /**
+     * 名称
+     */
     @TableField(value = "`name`")
     private String name;
 
@@ -73,41 +77,50 @@ public class KwpSettlementLogistics {
     private String remark;
 
     /**
-     * 对账审核人名称
+     * 对账托运方财务联系人
      */
     @TableField(value = "audit_user")
     private String auditUser;
 
     /**
-     * 对账审核人电话
+     * 对账托运方财务联系人电话
      */
     @TableField(value = "audit_phone")
     private String auditPhone;
 
     /**
-     * 对账完成人名称
+     * 对账承运方财务联系人
      */
     @TableField(value = "success_user")
     private String successUser;
 
     /**
-     * 对账完成人电话
+     * 对账承运方财务联系人电话
      */
     @TableField(value = "success_phone")
     private String successPhone;
 
     /**
-     * 状态（待回款、部分回款、全部回款、回退）
+     * 状态（1待结算2部分结算3全部结算）
      */
     @TableField(value = "`status`")
     private Integer status;
 
+    /**
+     * 创建人
+     */
     @TableField(value = "create_by")
     private Long createBy;
 
+    /**
+     * 创建时间
+     */
     @TableField(value = "create_time")
     private LocalDateTime createTime;
 
+    /**
+     * 更新人
+     */
     @TableField(value = "update_by")
     private Long updateBy;
 

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpSettlementOffline.java

@@ -11,13 +11,10 @@ import lombok.Setter;
 import lombok.ToString;
 
 /**
+ * 线下结算记录（交易订单结算/物流订单结算）
  * @author xucaiqin
  * @date 2023-07-10 16:42:19
  */
-
-/**
- * 下线结算记录（交易订单结算/物流订单结算）
- */
 @Getter
 @Setter
 @ToString
@@ -151,4 +148,23 @@ public class KwpSettlementOffline {
      */
     @TableField(value = "del_flag")
     private Integer delFlag;
+
+    /**
+     * 结算单类型 1-物流 2-贸易
+     */
+    @TableField(value = "order_type")
+    private Integer orderType;
+
+    /**
+     * 待付金额
+     */
+    @TableField(value = "topay_price")
+    private BigDecimal topayPrice;
+
+    /**
+     * 付款附件
+     */
+    @TableField(value = "url")
+    private String url;
+
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpSettlementTrade.java

@@ -70,25 +70,25 @@ public class KwpSettlementTrade {
     private LocalDateTime receiptTime;
 
     /**
-     * 对账审核人名称
+     * 对账采购财务联系人名称
      */
     @TableField(value = "audit_user")
     private String auditUser;
 
     /**
-     * 对账审核人电话
+     * 对账采购财务联系人电话
      */
     @TableField(value = "audit_phone")
     private String auditPhone;
 
     /**
-     * 对账完成人名称
+     * 对账销售财务联系人名称
      */
     @TableField(value = "success_user")
     private String successUser;
 
     /**
-     * 对账完成人电话
+     * 对账销售财务联系人电话
      */
     @TableField(value = "success_phone")
     private String successPhone;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpSettlementWallet.java

@@ -5,24 +5,30 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.time.LocalDateTime;
+
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
 /**
+ * 电子钱包结算记录（交易订单结算/物流订单结算）
+ *
  * @author xucaiqin
  * @date 2023-07-10 16:42:20
  */
-
-/**
- * 电子钱包结算记录（交易订单结算/物流订单结算）
- */
 @Getter
 @Setter
+@Data
 @ToString
 @TableName(value = "kwp_settlement_wallet")
 public class KwpSettlementWallet {
+
+    /**
+     * 主键
+     */
     @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
@@ -33,27 +39,45 @@ public class KwpSettlementWallet {
     private Long entId;
 
     /**
-     * 交易订单id（kwo_trade_order）
+     * 结算id（交易订单结算/物流订单结算）
+     */
+    @TableField(value = "settlement_id")
+    private Long settlementId;
+
+    /**
+     * 1-物流 2-交易
      */
-    @TableField(value = "order_id")
-    private Long orderId;
+    @TableField(value = "order_type")
+    private Integer orderType;
 
     /**
-     * 企业电子钱包id（kwp_wallet_ent 主键）
+     * 线上渠道 1-huifu
      */
-    @TableField(value = "wallet_id")
-    private Long walletId;
+    @TableField(value = "channel")
+    private Integer channel;
+
+    /**
+     * 回款时间
+     */
+    @TableField(value = "pay_time")
+    private LocalDateTime payTime;
 
     /**
      * 金额
      */
-    @TableField(value = "price")
-    private BigDecimal price;
+    @TableField(value = "pay_price")
+    private BigDecimal payPrice;
+
+    /**
+     * 剩余待付金额
+     */
+    @TableField(value = "topay_price")
+    private BigDecimal topayPrice;
 
     /**
-     * 类型（0付款、1退款）
+     * 类型（1预付款、2货到付款）
      */
-    @TableField(value = "`type`")
+    @TableField(value = "type")
     private Integer type;
 
     /**
@@ -63,17 +87,26 @@ public class KwpSettlementWallet {
     private String remark;
 
     /**
-     * 状态（0扣款、1结算、2异常、）
+     * 状态（1正常 、2异常）
      */
-    @TableField(value = "`status`")
+    @TableField(value = "status")
     private Integer status;
 
+    /**
+     * 创建人
+     */
     @TableField(value = "create_by")
     private Long createBy;
 
+    /**
+     * 创建时间
+     */
     @TableField(value = "create_time")
     private LocalDateTime createTime;
 
+    /**
+     * 更新人
+     */
     @TableField(value = "update_by")
     private Long updateBy;
 
@@ -88,4 +121,5 @@ public class KwpSettlementWallet {
      */
     @TableField(value = "del_flag")
     private Integer delFlag;
+
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/SettlementEnum.java

@@ -8,11 +8,10 @@ package com.sckw.payment.model.constant;
  * @date 2023-07-11 12:00:52
  */
 public enum SettlementEnum {
-    SAVE(1, "已保存"),
-    TO_LEDGER(2, "待对账"),
-    LEDGERED(3, "已对账"),
-    SUCCESS(4, "已完成"),
-    BACK(5, "已退回");
+    WAITING_PAYMENT(1, "待结算"),
+    PARTIAL_PAYMENT(2, "部分结算"),
+    ALL_PAYMENT(3, "全部结算");
+
     private int status;
     private String desc;
 
@@ -36,4 +35,16 @@ public enum SettlementEnum {
     public void setDesc(String desc) {
         this.desc = desc;
     }
+
+    // 添加静态方法，根据 status 获取对应的 desc
+    public static String getStatusDesc(int status) {
+        for (SettlementEnum settlementEnum : values()) {
+            if (settlementEnum.getStatus() == status) {
+                return settlementEnum.getDesc();
+            }
+        }
+        return null; // 可根据实际需求返回默认值或其他处理
+    }
+
+
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/SettlementOrderTypeEnum.java

@@ -0,0 +1,47 @@
+package com.sckw.payment.model.constant;
+
+/**
+ * @author Aick Spt
+ * @date 2023-07-27 12:49
+ */
+public enum SettlementOrderTypeEnum {
+        LOGISTICS(1, "物流"),
+        TRADE(2, "贸易");
+
+        private int status;
+        private String desc;
+
+    SettlementOrderTypeEnum(int status, String desc) {
+            this.status = status;
+            this.desc = desc;
+        }
+
+        public int getStatus() {
+            return status;
+        }
+
+        public void setStatus(int status) {
+            this.status = status;
+        }
+
+        public String getDesc() {
+            return desc;
+        }
+
+        public void setDesc(String desc) {
+            this.desc = desc;
+        }
+
+        // 添加静态方法，根据 status 获取对应的 desc
+        public static String getStatusDesc(int status) {
+            for (SettlementOrderTypeEnum settlementOrderTypeEnum : values()) {
+                if (settlementOrderTypeEnum.getStatus() == status) {
+                    return settlementOrderTypeEnum.getDesc();
+                }
+            }
+            return null; // 可根据实际需求返回默认值或其他处理
+        }
+
+
+    }
+

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/SettlementWalletPayTypeEnum.java

@@ -0,0 +1,36 @@
+package com.sckw.payment.model.constant;
+
+/**
+ * Desc: 暂不明确是否使用
+ * @author Aick Spt
+ * @date 2023-07-20 08:35
+ */
+public enum SettlementWalletPayTypeEnum {
+    ADVANCE_PAYMENT(1, "预付款"),
+    CASH_ON_DELIVERY(2, "货到付款");
+//    OFFLINE_PAYMENT(3, "线下付款");
+
+    private int status;
+    private String desc;
+
+    SettlementWalletPayTypeEnum(int status, String desc) {
+        this.status = status;
+        this.desc = desc;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/WalletChannelEnum.java

@@ -0,0 +1,47 @@
+package com.sckw.payment.model.constant;
+
+/**
+ * @author Aick Spt
+ * @date 2023-07-27 12:54
+ */
+public enum WalletChannelEnum {
+    HF(1, "huifu"),//汇付
+    XS(2, "xinsheng"),//新生
+    ZX(3, "zhongxin");//中信
+
+    private int status;
+    private String desc;
+
+    WalletChannelEnum(int status, String desc) {
+        this.status = status;
+        this.desc = desc;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    // 添加静态方法，根据 status 获取对应的 desc
+    public static String getStatusDesc(int status) {
+        for (WalletChannelEnum walletChannelEnum : values()) {
+            if (walletChannelEnum.getStatus() == status) {
+                return walletChannelEnum.getDesc();
+            }
+        }
+        return null; // 可根据实际需求返回默认值或其他处理
+    }
+
+
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/LedgerTradeDto.java

@@ -76,12 +76,12 @@ public class LedgerTradeDto implements ILedger {
     private BigDecimal actualPrice;
 
     /**
-     * 对账审核人电话
+     * 对账采购财务联系人电话
      */
     private String auditPhone;
 
     /**
-     * 对账审核人名称
+     * 对账采购财务联系人名称
      */
     private String auditUser;
 

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/SettlementLogisticsDto.java

@@ -0,0 +1,179 @@
+package com.sckw.payment.model.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.payment.model.KwpSettlementLogistics;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author Aick Spt
+ * @date 2023-07-18 17:33
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class SettlementLogisticsDto {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 企业id
+     */
+    private Long entId;
+
+    /**
+     * 物流订单对账id
+     */
+    private Long lLedgerId;
+
+    /**
+     * 结算单编号
+     */
+    private String slOrderNo;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 对账金额
+     */
+    private BigDecimal totalPrice;
+
+    /**
+     * 已收账款
+     */
+    private BigDecimal actualPrice;
+
+    /**
+     * 预计收款日期
+     */
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date receiptTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 对账托运方财务联系人
+     */
+    private String auditUser;
+
+    /**
+     * 对账托运方财务联系人电话
+     */
+    private String auditPhone;
+
+    /**
+     * 对账承运方财务联系人
+     */
+    private String successUser;
+
+    /**
+     * 对账承运方财务联系人电话
+     */
+    private String successPhone;
+
+    /**
+     * 状态（1待结算2部分结算3全部结算）
+     */
+    private Integer status;
+
+    private String statusText;
+
+    /**
+     * 创建人
+     */
+    private Long createBy;
+
+    /**
+     * 创建人名称
+     */
+    private String createByText;
+
+    /**
+     * 创建时间
+     */
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private Long updateBy;
+
+    /**
+     * 更新人名称
+     */
+    private String updateByText;
+
+    /**
+     * 更新时间
+     */
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 是否删除（0未删除，1删除）
+     */
+    private Integer delFlag;
+
+    // Getters and Setters
+
+    /**
+     * 对账单名称
+     */
+    private String ledgerName;
+
+
+    /**
+     * 交易方式
+     */
+    private Integer ledgerTrading;
+
+    /**
+     * 对账单编号
+     */
+    private String lLedgerNo;
+
+    /**
+     * 客户企业类型
+     */
+    private Integer unitType;
+
+    /**
+     * 客户名称
+     */
+    private String customerName;
+
+
+    /**
+     * 实际应收还款
+     */
+    private BigDecimal ledgerSettlePrice;
+
+    /**
+     * 剩余待还款
+     */
+    private BigDecimal residuePrice;
+
+    /**
+     * 附件
+     */
+    private String attachmentUrl;
+
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/SettlementLogisticsTrackDto.java

@@ -0,0 +1,80 @@
+package com.sckw.payment.model.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+import java.util.Date;
+
+/**
+ * 结算-物流订单-状态信息
+ * @author Aick Spt
+ * @date 2023-07-20 12:38
+ */
+@Getter
+@Setter
+public class SettlementLogisticsTrackDto {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 物流订单结算id
+     */
+    private Long settlementId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 用户状态（0正常、1已锁）
+     */
+    private Integer status;
+
+    /**
+     * 创建人
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+    /**
+     * 是否删除（0未删除，1删除）
+     */
+    private Integer delFlag;
+
+    // 添加构造函数，getter和setter方法，以及其他业务逻辑方法（根据需要）
+
+    @Override
+    public String toString() {
+        return "SettlementLogisticsTrackDto{" +
+                "id=" + id +
+                ", settlementId=" + settlementId +
+                ", remark='" + remark + '\'' +
+                ", status=" + status +
+                ", createBy=" + createBy +
+                ", createTime=" + createTime +
+                ", updateBy=" + updateBy +
+                ", updateTime=" + updateTime +
+                ", delFlag=" + delFlag +
+                '}';
+    }
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/SettlementOfflineDto.java

@@ -0,0 +1,122 @@
+package com.sckw.payment.model.dto;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author Administrator
+ * @date 2023-07-19 11:54
+ */
+@Getter
+@Setter
+public class SettlementOfflineDto {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 企业类型
+     */
+    private Long entId;
+
+    /**
+     * 结算id（交易订单结算/物流订单结算）
+     */
+    private Long settlementId;
+
+    /**
+     * 结算单类型 1-物流 2-贸易
+     */
+    private Byte orderType;
+
+    /**
+     * 付款日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date payTime;
+
+    /**
+     * 付款金额
+     */
+    private BigDecimal payPrice;
+
+    /**
+     * 待付金额
+     */
+    private BigDecimal topayPrice;
+
+    /**
+     * 付款附件
+     */
+    private String url;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 状态:0正常/1锁定
+     */
+    private Integer status;
+
+    /**
+     * 创建人
+     */
+    private Long createBy;
+    private String createByText;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private Long updateBy;
+    private String updateByText;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+    /**
+     * 删除标识(0正常/1删除)
+     */
+    private Integer delFlag;
+
+    // 添加构造函数，getter和setter方法，以及其他业务逻辑方法（根据需要）
+
+    @Override
+    public String toString() {
+        return "SettlementOfflineDto{" +
+                "id=" + id +
+                ", entId=" + entId +
+                ", settlementId=" + settlementId +
+                ", orderType=" + orderType +
+                ", payTime=" + payTime +
+                ", payPrice=" + payPrice +
+                ", topayPrice=" + topayPrice +
+                ", url='" + url + '\'' +
+                ", remark='" + remark + '\'' +
+                ", status=" + status +
+                ", createBy=" + createBy +
+                ", createTime=" + createTime +
+                ", updateBy=" + updateBy +
+                ", updateTime=" + updateTime +
+                ", delFlag=" + delFlag +
+                '}';
+    }
+
+}
+

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/SettlementTradeDto.java

@@ -0,0 +1,142 @@
+package com.sckw.payment.model.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 结算-交易订单
+ * @author Aick Spt
+ * @date 2023-07-20 12:26
+ */
+@Getter
+@Setter
+public class SettlementTradeDto {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 企业id
+     */
+    private Long entId;
+
+    /**
+     * 交易订单对账id
+     */
+    private Long tLedgerId;
+
+    /**
+     * 结算单编号
+     */
+    private String stOrderNo;
+
+    /**
+     * 结算单名称
+     */
+    private String name;
+
+    /**
+     * 总应收/元
+     */
+    private BigDecimal totalPrice;
+
+    /**
+     * 已收款/元
+     */
+    private BigDecimal actualPrice;
+
+    /**
+     * 预计收款日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date receiptTime;
+
+    /**
+     * 对账采购财务联系人名称
+     */
+    private String auditUser;
+
+    /**
+     * 对账采购财务联系人电话
+     */
+    private String auditPhone;
+
+    /**
+     * 对账销售财务联系人名称
+     */
+    private String successUser;
+
+    /**
+     * 对账销售财务联系人电话
+     */
+    private String successPhone;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 状态（待回款、部分回款、全部回款、回退）
+     */
+    private Integer status;
+
+    /**
+     * 创建人
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+    /**
+     * 是否删除（0未删除，1删除）
+     */
+    private Integer delFlag;
+
+    // 添加构造函数，getter和setter方法，以及其他业务逻辑方法（根据需要）
+
+    @Override
+    public String toString() {
+        return "SettlementTradeDto{" +
+                "id=" + id +
+                ", entId=" + entId +
+                ", tLedgerId=" + tLedgerId +
+                ", stOrderNo='" + stOrderNo + '\'' +
+                ", name='" + name + '\'' +
+                ", totalPrice=" + totalPrice +
+                ", actualPrice=" + actualPrice +
+                ", receiptTime=" + receiptTime +
+                ", auditUser='" + auditUser + '\'' +
+                ", auditPhone='" + auditPhone + '\'' +
+                ", successUser='" + successUser + '\'' +
+                ", successPhone='" + successPhone + '\'' +
+                ", remark='" + remark + '\'' +
+                ", status=" + status +
+                ", createBy=" + createBy +
+                ", createTime=" + createTime +
+                ", updateBy=" + updateBy +
+                ", updateTime=" + updateTime +
+                ", delFlag=" + delFlag +
+                '}';
+    }
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/SettlementTradeTrackDto.java

@@ -0,0 +1,80 @@
+package com.sckw.payment.model.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+import java.util.Date;
+
+/**
+ * 结算-交易订单-状态信息
+ * @author Aick Spt
+ * @date 2023-07-20 12:30
+ */
+@Getter
+@Setter
+public class SettlementTradeTrackDto {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 交易订单结算id
+     */
+    private Long settlementId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 用户状态（0正常、1已锁）
+     */
+    private Integer status;
+
+    /**
+     * 创建人
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+    /**
+     * 是否删除（0未删除，1删除）
+     */
+    private Integer delFlag;
+
+    // 添加构造函数，getter和setter方法，以及其他业务逻辑方法（根据需要）
+
+    @Override
+    public String toString() {
+        return "SettlementTradeTrackDto{" +
+                "id=" + id +
+                ", settlementId=" + settlementId +
+                ", remark='" + remark + '\'' +
+                ", status=" + status +
+                ", createBy=" + createBy +
+                ", createTime=" + createTime +
+                ", updateBy=" + updateBy +
+                ", updateTime=" + updateTime +
+                ", delFlag=" + delFlag +
+                '}';
+    }
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/SettlementWalletDto.java

@@ -0,0 +1,133 @@
+package com.sckw.payment.model.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+import java.util.Date;
+
+/**
+ * 电子钱包结算记录（交易订单结算/物流订单结算）
+ * @author Aick Spt
+ * @date 2023-07-20 14:54
+ */
+@Getter
+@Setter
+public class SettlementWalletDto {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 企业类型
+     */
+    private Long entId;
+
+    /**
+     * 结算id（交易订单结算/物流订单结算）
+     */
+    private Long settlementId;
+
+    /**
+     * 1-物流 2-交易
+     */
+    private Integer orderType;
+
+    /**
+     * 线上渠道 1-huifu
+     */
+    private Integer channel;
+
+    /**
+     * 回款时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date payTime;
+
+    /**
+     * 金额
+     */
+    private Double payPrice;
+
+    /**
+     * 剩余待付金额
+     */
+    private Double topayPrice;
+
+    /**
+     * 类型（0付款、1退款）
+     */
+    private Integer type;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 状态（0扣款、1结算、2异常、）
+     */
+    private Integer status;
+
+    /**
+     * 创建人
+     */
+    private Long createBy;
+
+    /**
+     * 创建人名称
+     */
+    private String createByText;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private Long updateBy;
+
+    /**
+     * 更新人名称
+     */
+    private String updateByText;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+    /**
+     * 是否删除（0未删除，1删除）
+     */
+    private Integer delFlag;
+
+    // 添加构造函数，getter和setter方法，以及其他业务逻辑方法（根据需要）
+
+    @Override
+    public String toString() {
+        return "SettlementWalletDto{" +
+                "id=" + id +
+                ", entId=" + entId +
+                ", settlementId=" + settlementId +
+                ", orderType=" + orderType +
+                ", channel=" + channel +
+                ", payTime=" + payTime +
+                ", payPrice=" + payPrice +
+                ", topayPrice=" + topayPrice +
+                ", type=" + type +
+                ", remark='" + remark + '\'' +
+                ", status=" + status +
+                ", createBy=" + createBy +
+                ", createTime=" + createTime +
+                ", updateBy=" + updateBy +
+                ", updateTime=" + updateTime +
+                ", delFlag=" + delFlag +
+                '}';
+    }
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/LedgerConfirmReq.java

@@ -16,7 +16,7 @@ import lombok.Setter;
 @Setter
 public class LedgerConfirmReq {
     @NotNull(message = "id不能为空")
-    private Long id;
+    private String id;
     /**
      * 对账审核人
      */

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/LedgerReq.java

@@ -14,7 +14,7 @@ import lombok.Setter;
 @Setter
 public class LedgerReq {
     @NotNull(message = "对账单id不能为空")
-    private Long id;
+    private String id;
     @NotBlank(message = "驳回原因不能为空")
     @Size(max = 200, message = "最大不能超过200字符")
     private String remark;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/LedgerSuccessReq.java

@@ -19,7 +19,7 @@ import java.time.LocalDate;
 @Setter
 public class LedgerSuccessReq {
     @NotNull(message = "物流对账单id不能为空")
-    private Long id;
+    private String id;
     @NotBlank(message = "财务联系人不能为空")
     @Size(max = 25, message = "财务联系人不能超过25个字符")
     private String successUser;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/LogisticsReq.java

@@ -7,7 +7,6 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serial;
-import java.util.List;
 
 /**
  * @author xucaiqin
@@ -27,7 +26,7 @@ public class LogisticsReq extends BasePara {
      * @see LedgerEnum
      */
     private Integer status;
-    private List<Long> ids;
+    private String ids;
     private Long entId;
     private Integer unitType;
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/LogisticsSendReq.java

@@ -18,12 +18,12 @@ import java.util.List;
 @Setter
 public class LogisticsSendReq {
 
-    private Long id;
+    private String id;
     /**
      * 托运单位（客户单位）
      */
     @NotNull(message = "客户单位不能为空")
-    private Long checkEntId;
+    private String checkEntId;
 
     /**
      * 名称
@@ -61,22 +61,6 @@ public class LogisticsSendReq {
      */
     @NotNull(message = "付款方式不能为空")
     private Integer trading;
-    /**
-     * 卸货量
-     */
-    private BigDecimal unloadAmount;
-    /**
-     * 装货量
-     */
-    private BigDecimal loadAmount;
-    /**
-     * 亏损量
-     */
-    private BigDecimal deficitAmount;
-    /**
-     * 合理损耗量
-     */
-    private BigDecimal loseAmount;
     /**
      * 总应收/元
      */
@@ -96,7 +80,9 @@ public class LogisticsSendReq {
      * 承运订单
      */
     @NotEmpty(message = "承运订单不能为空")
-    private List<String> ids;
+    private String ids;
+
+    private List<Long> orders;
     private LocalDateTime generateTime;
     private Integer status;
 

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/SettlementOfflineReq.java

@@ -0,0 +1,12 @@
+package com.sckw.payment.model.vo.req;
+
+import com.sckw.core.model.vo.BasePara;
+
+/**
+ * @author Aick Spt
+ * @date 2023-07-24 16:52
+ */
+public class SettlementOfflineReq extends BasePara {
+
+
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/SettlementReq.java

@@ -0,0 +1,51 @@
+package com.sckw.payment.model.vo.req;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.model.vo.BasePara;
+import com.sckw.payment.model.constant.SettlementEnum;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serial;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @author Aick Spt
+ * @date 2023-07-18 11:29
+ */
+@Getter
+@Setter
+public class SettlementReq extends BasePara {
+//    @Serial
+//    private static final long serialVersionUID = 5328731681168692784L;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @NotNull(message = "创建时间开始日期不能为空")
+    private LocalDateTime startCreateTime;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @NotNull(message = "创建时间结束日期不能为空")
+    private LocalDateTime endCreateTime;
+
+        @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @NotNull(message = "预计回款开始日期不能为空")
+    private LocalDateTime startReceiptTime;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @NotNull(message = "预计回款结束日期不能为空")
+    private LocalDateTime endReceiptTime;
+
+    /**
+     * @see SettlementEnum
+     */
+    private Integer status;
+
+
+    private List<Long> ids;
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/SettlementWalletReq.java

@@ -0,0 +1,26 @@
+package com.sckw.payment.model.vo.req;
+
+import com.sckw.core.model.vo.BasePara;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author Aick Spt
+ * @date 2023-07-24 16:52
+ */
+@Getter
+@Setter
+public class SettlementWalletReq extends BasePara {
+
+    /**
+     * 交易方式
+     */
+    private Integer trading;
+
+    /**
+     * 支付方式
+     */
+    private Integer payType;
+
+
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/TradeReq.java

@@ -6,7 +6,6 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serial;
-import java.util.List;
 
 /**
  * @author xucaiqin
@@ -24,7 +23,7 @@ public class TradeReq extends BasePara {
      * @see LedgerEnum
      */
     private Integer status;
-    private List<Long> ids;
+    private String ids;
     private Long entId;
 
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/TradeSendReq.java

@@ -1,7 +1,10 @@
 package com.sckw.payment.model.vo.req;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.PositiveOrZero;
+import jakarta.validation.constraints.Size;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -20,12 +23,12 @@ import java.util.List;
 @Setter
 public class TradeSendReq {
 
-    private Long id;
+    private String id;
     /**
      * 采购单位（客户单位）
      */
-    @NotNull(message = "客户单位不能为空")
-    private Long purchaseEntId;
+    @NotBlank(message = "客户单位不能为空")
+    private String purchaseEntId;
     /**
      * 名称
      */
@@ -77,9 +80,10 @@ public class TradeSendReq {
     /**
      * 销售订单
      */
-    @NotEmpty(message = "销售订单不能为空")
-    private List<Long> ids;
+    @NotBlank(message = "销售订单不能为空")
+    private String ids;
 
+    private List<Long> orders;
     private LocalDateTime generateTime;
     private Integer status;
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/LedgerLogisticsVo.java

@@ -113,13 +113,13 @@ public class LedgerLogisticsVo {
 
 
 //    /**
-//     * 对账审核人电话
+//     * 对账托运方财务联系人电话
 //     */
-//    @ExcelProperty(value = "对账审核人电话")
+//    @ExcelProperty(value = "对账托运方财务联系人电话")
 //    private String auditPhone;
 
     /**
-     * 对账审核人名称
+     * 对账托运方财务联系人
      */
     @ExcelProperty(value = "提交人")
     private String auditUser;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/LedgerTradeVo.java

@@ -98,9 +98,9 @@ public class LedgerTradeVo {
     private BigDecimal actualPrice;
 
 //    /**
-//     * 对账审核人电话
+//     * 对账采购财务联系人电话
 //     */
-//    @ExcelProperty(value = "对账审核人电话")
+//    @ExcelProperty(value = "对账采购财务联系人电话")
 //    private String auditPhone;
     /**
      * 客户联系人
@@ -120,7 +120,7 @@ public class LedgerTradeVo {
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime receiptTime;
     /**
-     * 对账审核人名称
+     * 对账采购财务联系人名称
      */
     @ExcelProperty(value = "提交人")
     private String auditUser;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/SettlementLogisticsStatusCountVo.java

@@ -0,0 +1,35 @@
+package com.sckw.payment.model.vo.res;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author Aick Spt
+ * @date 2023-07-21 14:44
+ */
+@Getter
+@Setter
+public class SettlementLogisticsStatusCountVo {
+
+    /**
+     * 全部数据
+     */
+    public Long allCount;
+
+    /**
+     * 待结算数据
+     */
+    public Long waitingPaymentCount;
+
+    /**
+     * 部分结算数据
+     */
+    public Long partialPaymentCount;
+
+    /**
+     * 全部结算数据
+     */
+    public Long allPaymentCount;
+
+
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/SettlementLogisticsSumVo.java

@@ -0,0 +1,35 @@
+package com.sckw.payment.model.vo.res;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author Aick Spt
+ * @date 2023-07-26 08:52
+ */
+@Getter
+@Setter
+public class SettlementLogisticsSumVo {
+
+    /**
+     * 实际应收
+     */
+    public double actualReceivable;
+
+    /**
+     * 当前收款
+     */
+    public double currentReceipt;
+
+    /**
+     * 剩余待收款
+     */
+    public double remainingReceivables;
+
+
+    /**
+     * 合计
+     */
+    public Long total;
+
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/SettlementLogisticsVo.java

@@ -0,0 +1,160 @@
+package com.sckw.payment.model.vo.res;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.excel.annotation.ExcelContext;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author Aick Spt
+ * @date 2023-07-21 15:28
+ */
+@Getter
+@Setter
+@ExcelContext(fileName = "物流结算订单列表", sheetName = "物流结算订单列表")
+public class SettlementLogisticsVo {
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 结算单编号
+     */
+    @ExcelProperty(value = "结算单编号")
+    private String slOrderNo;
+
+    /**
+     * 名称
+     */
+    @ExcelProperty(value = "名称")
+    private String name;
+
+    /**
+     * 对账金额
+     */
+    @ExcelProperty(value = "对账金额")
+    private BigDecimal totalPrice;
+
+    /**
+     * 已收账款
+     */
+    @ExcelProperty(value = "已收账款")
+    private BigDecimal actualPrice;
+
+    /**
+     * 预计收款日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelProperty(value = "预计收款日期")
+    private Date receiptTime;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 对账托运方财务联系人
+     */
+    @ExcelProperty(value = "对账托运方财务联系人")
+    private String auditUser;
+
+    /**
+     * 对账托运方财务联系人电话
+     */
+    @ExcelProperty(value = "对账托运方财务联系人电话")
+    private String auditPhone;
+
+    /**
+     * 对账承运方财务联系人
+     */
+    @ExcelProperty(value = "对账承运方财务联系人")
+    private String successUser;
+
+    /**
+     * 对账承运方财务联系人电话
+     */
+    @ExcelProperty(value = "对账承运方财务联系人电话")
+    private String successPhone;
+
+
+    @ExcelProperty(value = "状态")
+    private String statusText;
+
+    /**
+     * 创建人名称
+     */
+    @ExcelProperty(value = "创建人名称")
+    private String createByText;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+
+    /**
+     * 更新人名称
+     */
+    @ExcelProperty(value = "更新人名称")
+    private String updateByText;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+
+    /**
+     * 对账单名称
+     */
+    @ExcelProperty(value = "对账单名称")
+    private String ledgerName;
+
+
+    /**
+     * 交易方式
+     */
+    @ExcelProperty(value = "交易方式")
+    private Integer ledgerTrading;
+
+    /**
+     * 对账单编号
+     */
+    @ExcelProperty(value = "对账单编号")
+    private String lLedgerNo;
+
+
+    /**
+     * 客户名称
+     */
+    @ExcelProperty(value = "客户名称")
+    private String customerName;
+
+
+    /**
+     * 实际应收还款
+     */
+    @ExcelProperty(value = "实际应收还款")
+    private BigDecimal ledgerSettlePrice;
+
+    /**
+     * 剩余待还款
+     */
+    @ExcelProperty(value = "剩余待还款")
+    private BigDecimal residuePrice;
+
+
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/SettlementOfflineVo.java

@@ -0,0 +1,102 @@
+package com.sckw.payment.model.vo.res;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author Aick Spt
+ * @date 2023-07-24 16:45
+ */
+@Getter
+@Setter
+public class SettlementOfflineVo {
+
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 企业类型
+     */
+    private Long entId;
+
+    /**
+     * 结算id（交易订单结算/物流订单结算）
+     */
+    private Long settlementId;
+
+    /**
+     * 结算单类型 1-物流 2-贸易
+     */
+    private Byte orderType;
+
+    /**
+     * 付款日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date payTime;
+
+    /**
+     * 付款金额
+     */
+    private BigDecimal payPrice;
+
+    /**
+     * 待付金额
+     */
+    private BigDecimal topayPrice;
+
+    /**
+     * 付款附件
+     */
+    private String url;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 状态:0正常/1锁定
+     */
+    private Integer status;
+
+    /**
+     * 创建人
+     */
+    private Long createBy;
+    private String createByText;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private Long updateBy;
+    private String updateByText;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+    /**
+     * 删除标识(0正常/1删除)
+     */
+    private Integer delFlag;
+
+    // 添加构造函数，getter和setter方法，以及其他业务逻辑方法（根据需要）
+
+
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/SettlementWalletVo.java

@@ -0,0 +1,83 @@
+package com.sckw.payment.model.vo.res;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * @author Aick Spt
+ * @date 2023-07-24 16:45
+ */
+@Getter
+@Setter
+public class SettlementWalletVo {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+
+    /**
+     * 线上渠道 1-huifu
+     */
+    private Integer channel;
+
+    /**
+     * 回款时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date payTime;
+
+    /**
+     * 金额
+     */
+    private Double payPrice;
+
+    /**
+     * 剩余待付金额
+     */
+    private Double topayPrice;
+
+    /**
+     * 类型（1预付款、2货到付款）
+     */
+    private Integer type;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+    /**
+     * 创建人名称
+     */
+    private String createByText;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    /**
+     * 更新人名称
+     */
+    private String updateByText;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+    /**
+     * 是否删除（0未删除，1删除）
+     */
+    private Integer delFlag;
+
+
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/AbsLedger.java

@@ -24,7 +24,7 @@ public abstract class AbsLedger {
         }
     }
 
-    public void detailCheck(Integer status) {
+    public void updateCheck(Integer status) {
         List<Integer> objects = Lists.newArrayList(LedgerEnum.SAVE.getStatus(), LedgerEnum.BACK.getStatus(), LedgerEnum.REVOCATION.getStatus());
         if (Objects.nonNull(status) && !objects.contains(status)) {
             throw new BusinessException("只有【已保存】、【已撤回】和【已退回】的单据才支持修改!");

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerLogisticsOrderService.java

@@ -2,6 +2,7 @@ package com.sckw.payment.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.sckw.core.exception.BusinessException;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.payment.dao.KwpLedgerLogisticsOrderMapper;
 import com.sckw.payment.model.KwpLedgerLogisticsOrder;
@@ -44,4 +45,23 @@ public class KwpLedgerLogisticsOrderService {
         }
         return kwpLedgerLogisticsOrders;
     }
+
+    /**
+     * 校验当前物流订单是否已关联其它草稿单
+     *
+     * @param ids
+     */
+    public void check(List<Long> ids) {
+        List<KwpLedgerLogisticsOrder> kwpLedgerLogisticsOrders = logisticsOrderMapper.selectList(new LambdaQueryWrapper<KwpLedgerLogisticsOrder>()
+                .in(KwpLedgerLogisticsOrder::getLOrderId, ids)
+                .eq(KwpLedgerLogisticsOrder::getDelFlag, 0)
+                .select(KwpLedgerLogisticsOrder::getLLedgerId, KwpLedgerLogisticsOrder::getLOrderId, KwpLedgerLogisticsOrder::getLOrderNo));
+        if (CollectionUtils.isNotEmpty(kwpLedgerLogisticsOrders)) {
+            for (KwpLedgerLogisticsOrder kwpLedgerLogisticsOrder : kwpLedgerLogisticsOrders) {
+                if (ids.contains(kwpLedgerLogisticsOrder.getLOrderId())) {
+                    throw new BusinessException(kwpLedgerLogisticsOrder.getLOrderNo() + "已绑定其它对账单");
+                }
+            }
+        }
+    }
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerLogisticsService.java

@@ -9,8 +9,12 @@ import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.IdWorker;
 import com.sckw.core.utils.OrderGenerateUtils;
 import com.sckw.core.utils.StringTimeUtil;
-import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.payment.dao.KwpLedgerLogisticsMapper;
+import com.sckw.payment.model.KwpLedgerLogistics;
+import com.sckw.payment.model.KwpLedgerLogisticsTrack;
+import com.sckw.payment.model.KwpLedgerLogisticsUnit;
+import com.sckw.payment.model.KwpSettlementLogistics;
+import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.payment.model.*;
 import com.sckw.payment.model.constant.LedgerEnum;
 import com.sckw.payment.model.constant.LedgerTrackEnum;
@@ -28,6 +32,7 @@ import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -125,15 +130,15 @@ public class KwpLedgerLogisticsService extends AbsLedger {
      */
     @Transactional(rollbackFor = Exception.class)
     public String sendLedger(LogisticsSendReq logisticsReq) {
-        Long id = logisticsReq.getId();
-        if (Objects.isNull(id)) {
+        String id = logisticsReq.getId();
+        if (StringUtils.isBlank(id)) {
             //新增
             logisticsReq.setGenerateTime(LocalDateTime.now());
             logisticsReq.setStatus(LedgerEnum.TO_LEDGER.getStatus());
             Long aLong = saveDraft(logisticsReq);
             logisticsTrackService.saveTrack(aLong, "", LedgerTrackEnum.TO_LEDGER);
         } else {
-            removeDraft(id);
+            removeDraft(Long.parseLong(id));
             logisticsReq.setGenerateTime(LocalDateTime.now());
             logisticsReq.setStatus(LedgerEnum.TO_LEDGER.getStatus());
             Long aLong = saveDraft(logisticsReq);
@@ -154,7 +159,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
 
     private Long saveDraft(LogisticsSendReq logisticsSendReq) {
         KwpLedgerLogistics kwpLedgerLogistics = new KwpLedgerLogistics();
-        kwpLedgerLogistics.setId(Objects.isNull(logisticsSendReq.getId()) ? new IdWorker(1).nextId() : logisticsSendReq.getId());
+        kwpLedgerLogistics.setId(StringUtils.isBlank(logisticsSendReq.getId()) ? new IdWorker(1).nextId() : Long.parseLong(logisticsSendReq.getId()));
         kwpLedgerLogistics.setEntId(LoginUserHolder.getEntId());
         kwpLedgerLogistics.setName(logisticsSendReq.getName());
         if (StringUtils.isNotBlank(logisticsSendReq.getStartTime())) {
@@ -172,7 +177,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpLedgerLogistics.setAuditUser("");
         kwpLedgerLogistics.setAuditPhone("");
         kwpLedgerLogistics.setReceiptTime(null);
-        kwpLedgerLogistics.setOrderCount(logisticsSendReq.getIds().size());
+        kwpLedgerLogistics.setOrderCount(logisticsSendReq.getOrders().size());
         kwpLedgerLogistics.setUrl("");
         kwpLedgerLogistics.setGenerateTime(logisticsSendReq.getGenerateTime());
         kwpLedgerLogistics.setRemark("");
@@ -186,15 +191,19 @@ public class KwpLedgerLogisticsService extends AbsLedger {
             kwpLedgerLogistics.setLLedgerNo(OrderGenerateUtils.generateOrderNo("LL"));
             logisticsMapper.insert(kwpLedgerLogistics);
         } else {
+            KwpLedgerLogistics ledgerLogistics = logisticsMapper.selectById(logisticsSendReq.getId());
+            orderCheck(ledgerLogistics);
+            updateCheck(ledgerLogistics.getStatus());
             kwpLedgerLogistics.setUpdateBy(LoginUserHolder.getUserId());
             kwpLedgerLogistics.setUpdateTime(LocalDateTime.now());
             logisticsMapper.updateById(kwpLedgerLogistics);
         }
         /*保存物流订单关联数据*/
-        List<String> ids = logisticsSendReq.getIds();
+        List<Long> ids = logisticsSendReq.getOrders();
         //todo-xcq 校验当前订单是否已存在绑定的对账单
-        List<KwtLogisticsOrderVO> acceptCarriageOrderDetail = transportDubboService.getAcceptCarriageOrderDetail(ids);
-        if (CollectionUtils.isEmpty(acceptCarriageOrderDetail)) {
+        logisticsOrderService.check(ids);
+        List<KwtLogisticsOrderVO> acceptCarriageOrderDetail = transportDubboService.getAcceptCarriageOrderDetail(ids.stream().map(a -> Long.toString(a)).toList());
+        if (CollectionUtils.isEmpty(acceptCarriageOrderDetail) || acceptCarriageOrderDetail.size() < ids.size()) {
             throw new BusinessException("未找到物流订单!");
         }
         List<KwpLedgerLogisticsOrder> collect = acceptCarriageOrderDetail.stream().map(a -> {
@@ -202,6 +211,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
             logisticsOrder.setId(new IdWorker(1).nextId());
             logisticsOrder.setLLedgerId(kwpLedgerLogistics.getId());
             logisticsOrder.setLOrderId(a.getId());
+            logisticsOrder.setLOrderNo(a.getLOrderNo());
             logisticsOrder.setRemark("");
             logisticsOrder.setStatus(0);
             logisticsOrder.setCreateBy(LoginUserHolder.getUserId());
@@ -214,7 +224,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
 
         logisticsOrderService.saveList(collect);
         /*保存企业相关信息*/
-        Long checkEntId = logisticsSendReq.getCheckEntId();
+        Long checkEntId = Long.parseLong(logisticsSendReq.getCheckEntId());
 
         Map<Long, EntCacheResDto> entMap = remoteSystemService.queryEntTreeByIds(Collections.singletonList(checkEntId));
         EntCacheResDto entCacheResDto = entMap.get(checkEntId);
@@ -343,7 +353,8 @@ public class KwpLedgerLogisticsService extends AbsLedger {
      * @return
      */
     public Integer doBack(LedgerReq ledgerReq) {
-        KwpLedgerLogistics kwpLedgerLogistics = logisticsMapper.selectById(ledgerReq.getId());
+        Long id = Long.parseLong(ledgerReq.getId());
+        KwpLedgerLogistics kwpLedgerLogistics = logisticsMapper.selectById(id);
         if (Objects.isNull(kwpLedgerLogistics)) {
             throw new BusinessException("对账单不存在!");
         }
@@ -352,7 +363,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpLedgerLogistics.setUpdateBy(LoginUserHolder.getUserId());
         kwpLedgerLogistics.setUpdateTime(LocalDateTime.now());
         logisticsMapper.updateById(kwpLedgerLogistics);
-        return logisticsTrackService.saveTrack(ledgerReq.getId(), ledgerReq.getRemark(), LedgerTrackEnum.REJECT);
+        return logisticsTrackService.saveTrack(id, ledgerReq.getRemark(), LedgerTrackEnum.REJECT);
     }
 
     /**
@@ -364,7 +375,8 @@ public class KwpLedgerLogisticsService extends AbsLedger {
      */
     @Transactional(rollbackFor = Exception.class)
     public Integer confirmOrder(LedgerConfirmReq confirmReq) {
-        KwpLedgerLogistics kwpLedgerLogistics = logisticsMapper.selectById(confirmReq.getId());
+        Long id = Long.parseLong(confirmReq.getId());
+        KwpLedgerLogistics kwpLedgerLogistics = logisticsMapper.selectById(id);
         orderCheck(kwpLedgerLogistics);
         confirmCheck(kwpLedgerLogistics.getStatus());
         kwpLedgerLogistics.setStatus(LedgerEnum.LEDGERED.getStatus());
@@ -374,7 +386,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpLedgerLogistics.setUpdateTime(LocalDateTime.now());
         kwpLedgerLogistics.setUpdateBy(LoginUserHolder.getUserId());
         logisticsMapper.updateById(kwpLedgerLogistics);
-        return logisticsTrackService.saveTrack(confirmReq.getId(), "", LedgerTrackEnum.CONFIRM);
+        return logisticsTrackService.saveTrack(id, "", LedgerTrackEnum.CONFIRM);
     }
 
     /**
@@ -385,7 +397,8 @@ public class KwpLedgerLogisticsService extends AbsLedger {
      */
     @Transactional(rollbackFor = Exception.class)
     public String orderSuccess(LedgerSuccessReq ledgerReq) {
-        KwpLedgerLogistics kwpLedgerLogistics = logisticsMapper.selectById(ledgerReq.getId());
+        Long id = Long.parseLong(ledgerReq.getId());
+        KwpLedgerLogistics kwpLedgerLogistics = logisticsMapper.selectById(id);
         orderCheck(kwpLedgerLogistics);
 
         successCheck(kwpLedgerLogistics.getStatus());
@@ -419,7 +432,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
 
         settlementLogisticsService.save(kwpSettlementLogistics);
 
-        logisticsTrackService.saveTrack(ledgerReq.getId(), "", LedgerTrackEnum.SUCCESS);
+        logisticsTrackService.saveTrack(id, "", LedgerTrackEnum.SUCCESS);
         return "对账完成";
     }
 
@@ -467,11 +480,21 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         return ledgerLogistics;
     }
 
+    public LedgerLogisticsDetailVo queryUpdate(Long id) {
+        LedgerLogisticsDto ledgerLogisticsDto = logisticsMapper.selectId(id);
+        orderCheck(ledgerLogisticsDto);
+        updateCheck(ledgerLogisticsDto.getStatus());
+        return getLedgerLogisticsDetailVo(ledgerLogisticsDto);
+    }
+
     public LedgerLogisticsDetailVo queryDetail(Long id) {
         LedgerLogisticsDto ledgerLogisticsDto = logisticsMapper.selectId(id);
         orderCheck(ledgerLogisticsDto);
-        detailCheck(ledgerLogisticsDto.getStatus());
+        return getLedgerLogisticsDetailVo(ledgerLogisticsDto);
+    }
 
+    @NotNull
+    private LedgerLogisticsDetailVo getLedgerLogisticsDetailVo(LedgerLogisticsDto ledgerLogisticsDto) {
         List<KwpLedgerLogisticsOrder> kwpLedgerLogisticsOrders = logisticsOrderService.queryList(ledgerLogisticsDto.getId());
         LedgerLogisticsDetailVo ledgerLogisticsDetailVo = new LedgerLogisticsDetailVo();
         ledgerLogisticsDetailVo.setId(ledgerLogisticsDto.getId());

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerTradeOrderService.java

@@ -2,6 +2,7 @@ package com.sckw.payment.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.sckw.core.exception.BusinessException;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.payment.dao.KwpLedgerTradeOrderMapper;
 import com.sckw.payment.model.KwpLedgerTradeOrder;
@@ -32,7 +33,7 @@ public class KwpLedgerTradeOrderService {
     }
 
     public void saveList(List<KwpLedgerTradeOrder> list) {
-        if(!CollectionUtils.isEmpty(list)){
+        if (!CollectionUtils.isEmpty(list)) {
             for (KwpLedgerTradeOrder kwpLedgerTradeOrder : list) {
                 tradeOrderMapper.insert(kwpLedgerTradeOrder);
             }
@@ -47,4 +48,18 @@ public class KwpLedgerTradeOrderService {
         }
         return kwpLedgerLogisticsOrders;
     }
+
+    public void check(List<Long> ids) {
+        List<KwpLedgerTradeOrder> kwpLedgerLogisticsOrders = tradeOrderMapper.selectList(new LambdaQueryWrapper<KwpLedgerTradeOrder>()
+                .in(KwpLedgerTradeOrder::getTOrderId, ids)
+                .eq(KwpLedgerTradeOrder::getDelFlag, 0)
+                .select(KwpLedgerTradeOrder::getTLedgerId, KwpLedgerTradeOrder::getTOrderId, KwpLedgerTradeOrder::getTOrderNo));
+        if (CollectionUtils.isNotEmpty(kwpLedgerLogisticsOrders)) {
+            for (KwpLedgerTradeOrder kwpLedgerTradeOrder : kwpLedgerLogisticsOrders) {
+                if (ids.contains(kwpLedgerTradeOrder.getTOrderId())) {
+                    throw new BusinessException(kwpLedgerTradeOrder.getTOrderNo() + "已绑定其它对账单");
+                }
+            }
+        }
+    }
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerTradeService.java

@@ -141,13 +141,13 @@ public class KwpLedgerTradeService extends AbsLedger {
 
     private Long saveDraft(TradeSendReq tradeSendReq) {
         KwpLedgerTrade kwpLedgerTrade = new KwpLedgerTrade();
-        kwpLedgerTrade.setId(Objects.isNull(tradeSendReq.getId()) ? new IdWorker(1).nextId() : tradeSendReq.getId());
+        kwpLedgerTrade.setId(StringUtils.isBlank(tradeSendReq.getId()) ? new IdWorker(1).nextId() : Long.parseLong(tradeSendReq.getId()));
         kwpLedgerTrade.setEntId(LoginUserHolder.getEntId());
         kwpLedgerTrade.setName(tradeSendReq.getName());
-        if(StringUtils.isNotBlank(tradeSendReq.getStartTime())){
+        if (StringUtils.isNotBlank(tradeSendReq.getStartTime())) {
             kwpLedgerTrade.setStartTime(StringTimeUtil.startDateTime(tradeSendReq.getStartTime()));
         }
-        if(StringUtils.isNotBlank(tradeSendReq.getEndTime())){
+        if (StringUtils.isNotBlank(tradeSendReq.getEndTime())) {
             kwpLedgerTrade.setEndTime(StringTimeUtil.endDateTime(tradeSendReq.getEndTime()));
         }
         kwpLedgerTrade.setTaxRate(tradeSendReq.getTaxRate());
@@ -160,7 +160,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpLedgerTrade.setAuditPhone("");
         kwpLedgerTrade.setGenerateTime(tradeSendReq.getGenerateTime());
         kwpLedgerTrade.setReceiptTime(null);
-        kwpLedgerTrade.setOrderCount(tradeSendReq.getIds().size());
+        kwpLedgerTrade.setOrderCount(tradeSendReq.getOrders().size());
         kwpLedgerTrade.setUrl("");
         kwpLedgerTrade.setRemark("");
         kwpLedgerTrade.setStatus(tradeSendReq.getStatus());
@@ -174,14 +174,18 @@ public class KwpLedgerTradeService extends AbsLedger {
             kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
             tradeMapper.insert(kwpLedgerTrade);
         } else {
+            KwpLedgerTrade ledgerTrade = tradeMapper.selectById(tradeSendReq.getId());
+            orderCheck(ledgerTrade);
+            updateCheck(ledgerTrade.getStatus());
             kwpLedgerTrade.setUpdateBy(LoginUserHolder.getUserId());
             kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
             tradeMapper.updateById(kwpLedgerTrade);
         }
 
         /*保存贸易订单关联数据*/
-        List<Long> ids = tradeSendReq.getIds();
+        List<Long> ids = tradeSendReq.getOrders();
         //todo-xcq 校验当前订单是否已存在绑定的对账单
+        tradeOrderService.check(ids);
         List<OrderDetailRes> resList = new ArrayList<>();
         for (Long id : ids) {
             OrderDetailRes orderDetailById = tradeOrderInfoService.getOrderDetailById(id);
@@ -207,7 +211,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         tradeOrderService.saveList(collect);
         /*保存企业单位相关信息*/
         //todo-xcq dubbo拿取采购客户单位的信息
-        Long purchaseEntId = tradeSendReq.getPurchaseEntId();
+        Long purchaseEntId = Long.parseLong(tradeSendReq.getPurchaseEntId());
         Map<Long, EntCacheResDto> entMap = remoteSystemService.queryEntTreeByIds(Collections.singletonList(purchaseEntId));
         EntCacheResDto entCacheResDto = entMap.get(purchaseEntId);
         if (Objects.isNull(entCacheResDto)) {
@@ -272,8 +276,8 @@ public class KwpLedgerTradeService extends AbsLedger {
     @Transactional(rollbackFor = Exception.class)
     public String sendLedger(TradeSendReq tradeSendReq) {
         log.info("保存对账单入参：{}", JSONObject.toJSONString(tradeSendReq));
-        Long id = tradeSendReq.getId();
-        if (Objects.isNull(id)) {
+        String id = tradeSendReq.getId();
+        if (StringUtils.isBlank(id)) {
             //新增
             tradeSendReq.setGenerateTime(LocalDateTime.now());
             tradeSendReq.setStatus(LedgerEnum.TO_LEDGER.getStatus());
@@ -281,7 +285,7 @@ public class KwpLedgerTradeService extends AbsLedger {
             tradeTrackService.saveTrack(aLong, "", LedgerTrackEnum.TO_LEDGER);
         } else {
             //先删除
-            removeDraft(id);
+            removeDraft(Long.parseLong(id));
             //在新增
             tradeSendReq.setGenerateTime(LocalDateTime.now());
             tradeSendReq.setStatus(LedgerEnum.TO_LEDGER.getStatus());
@@ -360,14 +364,15 @@ public class KwpLedgerTradeService extends AbsLedger {
      * @return
      */
     public String doBack(LedgerReq ledgerReq) {
-        KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(ledgerReq.getId());
+        Long id = Long.parseLong(ledgerReq.getId());
+        KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(id);
         orderCheck(kwpLedgerTrade);
         backCheck(kwpLedgerTrade.getStatus());
         kwpLedgerTrade.setStatus(LedgerEnum.BACK.getStatus());
         kwpLedgerTrade.setUpdateBy(LoginUserHolder.getUserId());
         kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
         tradeMapper.updateById(kwpLedgerTrade);
-        tradeTrackService.saveTrack(ledgerReq.getId(), ledgerReq.getRemark(), LedgerTrackEnum.REJECT);
+        tradeTrackService.saveTrack(id, ledgerReq.getRemark(), LedgerTrackEnum.REJECT);
         return "驳回成功";
     }
 
@@ -379,7 +384,8 @@ public class KwpLedgerTradeService extends AbsLedger {
      */
     @Transactional(rollbackFor = Exception.class)
     public String confirmOrder(LedgerConfirmReq confirmReq) {
-        KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(confirmReq.getId());
+        Long id = Long.parseLong(confirmReq.getId());
+        KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(id);
         orderCheck(kwpLedgerTrade);
         confirmCheck(kwpLedgerTrade.getStatus());
         kwpLedgerTrade.setStatus(LedgerEnum.LEDGERED.getStatus());
@@ -389,7 +395,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpLedgerTrade.setUpdateBy(LoginUserHolder.getUserId());
         kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
         tradeMapper.updateById(kwpLedgerTrade);
-        tradeTrackService.saveTrack(confirmReq.getId(), "", LedgerTrackEnum.CONFIRM);
+        tradeTrackService.saveTrack(id, "", LedgerTrackEnum.CONFIRM);
         return "对账确认成功";
     }
 
@@ -401,7 +407,9 @@ public class KwpLedgerTradeService extends AbsLedger {
      */
     @Transactional(rollbackFor = Exception.class)
     public String orderSuccess(LedgerSuccessReq ledgerReq) {
-        KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(ledgerReq.getId());
+        Long id = Long.parseLong(ledgerReq.getId());
+
+        KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(id);
         orderCheck(kwpLedgerTrade);
         successCheck(kwpLedgerTrade.getStatus());
 
@@ -432,7 +440,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpSettlementTrade.setDelFlag(0);
         settlementTradeService.save(kwpSettlementTrade);
 
-        tradeTrackService.saveTrack(ledgerReq.getId(), "", LedgerTrackEnum.SUCCESS);
+        tradeTrackService.saveTrack(id, "", LedgerTrackEnum.SUCCESS);
         return "对账完成";
     }
 
@@ -464,10 +472,38 @@ public class KwpLedgerTradeService extends AbsLedger {
         return ledgerSellDto;
     }
 
+    public LedgerTradeDetailVo queryUpdate(Long id) {
+        LedgerTradeDto ledgerTradeDto = tradeMapper.selectId(id);
+        orderCheck(ledgerTradeDto);
+        updateCheck(ledgerTradeDto.getStatus());
+        List<KwpLedgerTradeOrder> kwpLedgerTradeOrders = tradeOrderService.queryList(ledgerTradeDto.getId());
+        LedgerTradeDetailVo ledgerTradeDetailVo = new LedgerTradeDetailVo();
+        ledgerTradeDetailVo.setId(ledgerTradeDto.getId());
+        ledgerTradeDetailVo.setTLedgerNo(ledgerTradeDto.getTLedgerNo());
+        ledgerTradeDetailVo.setName(ledgerTradeDto.getName());
+        ledgerTradeDetailVo.setFirmName(ledgerTradeDto.getFirmName());
+        ledgerTradeDetailVo.setTrading(ledgerTradeDto.getTrading());
+        ledgerTradeDetailVo.setTaxRate(ledgerTradeDto.getTaxRate());
+        ledgerTradeDetailVo.setTotalPrice(ledgerTradeDto.getTotalPrice());
+        ledgerTradeDetailVo.setActualPrice(ledgerTradeDto.getActualPrice());
+        ledgerTradeDetailVo.setStartTime(ledgerTradeDto.getStartTime());
+        ledgerTradeDetailVo.setEndTime(ledgerTradeDto.getEndTime());
+        ledgerTradeDetailVo.setRemark(ledgerTradeDto.getRemark());
+        List<Long> collect = kwpLedgerTradeOrders.stream().map(KwpLedgerTradeOrder::getTOrderId).toList();
+        List<OrderDetailRes> detailRes = new ArrayList<>();
+        OrderDetailRes orderDetailById;
+        for (Long aLong : collect) {
+            orderDetailById = tradeOrderInfoService.getOrderDetailById(aLong);
+            detailRes.add(orderDetailById);
+        }
+        ledgerTradeDetailVo.setOrderList(detailRes);
+        return ledgerTradeDetailVo;
+    }
+
     public LedgerTradeDetailVo queryDetail(Long id) {
         LedgerTradeDto ledgerTradeDto = tradeMapper.selectId(id);
         orderCheck(ledgerTradeDto);
-        detailCheck(ledgerTradeDto.getStatus());
+
         List<KwpLedgerTradeOrder> kwpLedgerTradeOrders = tradeOrderService.queryList(ledgerTradeDto.getId());
         LedgerTradeDetailVo ledgerTradeDetailVo = new LedgerTradeDetailVo();
         ledgerTradeDetailVo.setId(ledgerTradeDto.getId());

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementLogisticsService.java

@@ -1,21 +1,193 @@
 package com.sckw.payment.service;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.sckw.core.model.page.PageRes;
 import com.sckw.payment.dao.KwpSettlementLogisticsMapper;
 import com.sckw.payment.model.KwpSettlementLogistics;
+import com.sckw.payment.model.constant.SettlementEnum;
+import com.sckw.payment.model.dto.SettlementLogisticsDto;
+import com.sckw.payment.model.vo.req.SettlementReq;
+import com.sckw.payment.model.vo.res.SettlementLogisticsStatusCountVo;
+import com.sckw.payment.model.vo.res.SettlementLogisticsSumVo;
+import com.sckw.payment.utils.CommonValidator;
+import com.sckw.payment.utils.PageMoreRes;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
- * @author xucaiqin
+ * @author Aick Spt
  * @date 2023-07-10 16:38:36
  */
 @AllArgsConstructor
 @Service
+@Slf4j
 public class KwpSettlementLogisticsService {
     private final KwpSettlementLogisticsMapper settlementLogisticsMapper;
 
-    public void save(KwpSettlementLogistics kwpSettlementLogistics) {
-        settlementLogisticsMapper.insert(kwpSettlementLogistics);
+    public void save(KwpSettlementLogistics settlementLogistics) {
+        settlementLogisticsMapper.insert(settlementLogistics);
+    }
+//    public SettlementLogisticsStatusCountVo getCountList() {
+//        SettlementLogisticsStatusCountVo settlementLogisticsStatusCountVos = new SettlementLogisticsStatusCountVo();
+//        LambdaQueryWrapper<KwpSettlementLogistics> wrapper = new LambdaQueryWrapper<>();
+//
+//        settlementLogisticsStatusCountVos.setAllCount(settlementLogisticsMapper.selectCount(wrapper));
+//
+//        wrapper.eq(KwpSettlementLogistics::getStatus, SettlementEnum.WAITING_PAYMENT.getStatus());//待结算
+//        settlementLogisticsStatusCountVos.setWaitingPaymentCount(settlementLogisticsMapper.selectCount(wrapper));
+//
+//        wrapper.clear();
+//        wrapper.eq(KwpSettlementLogistics::getStatus, SettlementEnum.PARTIAL_PAYMENT.getStatus());//部分结算
+//        settlementLogisticsStatusCountVos.setPartialPaymentCount(settlementLogisticsMapper.selectCount(wrapper));
+//
+//        wrapper.clear();
+//        wrapper.eq(KwpSettlementLogistics::getStatus, SettlementEnum.ALL_PAYMENT.getStatus());//全部结算
+//        settlementLogisticsStatusCountVos.setAllPaymentCount(settlementLogisticsMapper.selectCount(wrapper));
+//
+//        return settlementLogisticsStatusCountVos;
+//    }
+
+    /**
+     * 运费收款-物流订单各状态列表总数
+     *
+     * @author Aick Spt
+     * @date 2023-07-24 16:21
+     */
+    public SettlementLogisticsStatusCountVo getCountListCollection(SettlementReq settlementReq) {
+        SettlementLogisticsStatusCountVo settlementLogisticsStatusCountVos = new SettlementLogisticsStatusCountVo();
+        //总
+        settlementReq.setStatus(null);
+        settlementLogisticsStatusCountVos.setAllCount(settlementLogisticsMapper.getCountListCollection(settlementReq));
+
+        //待结算
+        settlementReq.setStatus(SettlementEnum.WAITING_PAYMENT.getStatus());
+        settlementLogisticsStatusCountVos.setWaitingPaymentCount(settlementLogisticsMapper.getCountListCollection(settlementReq));
+
+        //部分结算
+        settlementReq.setStatus(SettlementEnum.PARTIAL_PAYMENT.getStatus());
+        settlementLogisticsStatusCountVos.setPartialPaymentCount(settlementLogisticsMapper.getCountListCollection(settlementReq));
+
+        //全部结算
+        settlementReq.setStatus(SettlementEnum.ALL_PAYMENT.getStatus());
+        settlementLogisticsStatusCountVos.setAllPaymentCount(settlementLogisticsMapper.getCountListCollection(settlementReq));
+
+        return settlementLogisticsStatusCountVos;
+    }
+
+    /**
+     * 运费付款-物流订单各状态列表总数
+     *
+     * @author Aick Spt
+     * @date 2023-07-24 16:23
+     */
+    public SettlementLogisticsStatusCountVo getCountListPayment(SettlementReq settlementReq) {
+        SettlementLogisticsStatusCountVo settlementLogisticsStatusCountVos = new SettlementLogisticsStatusCountVo();
+        //总
+        settlementReq.setStatus(null);
+        settlementLogisticsStatusCountVos.setAllCount(settlementLogisticsMapper.getCountListPayment(settlementReq));
+
+        //待结算
+        settlementReq.setStatus(SettlementEnum.WAITING_PAYMENT.getStatus());
+        settlementLogisticsStatusCountVos.setWaitingPaymentCount(settlementLogisticsMapper.getCountListPayment(settlementReq));
+
+        //部分结算
+        settlementReq.setStatus(SettlementEnum.PARTIAL_PAYMENT.getStatus());
+        settlementLogisticsStatusCountVos.setPartialPaymentCount(settlementLogisticsMapper.getCountListPayment(settlementReq));
+
+        //全部结算
+        settlementReq.setStatus(SettlementEnum.ALL_PAYMENT.getStatus());
+        settlementLogisticsStatusCountVos.setAllPaymentCount(settlementLogisticsMapper.getCountListPayment(settlementReq));
+
+        return settlementLogisticsStatusCountVos;
+    }
+
+    /**
+     * 运费收款-物流订单列表
+     *
+     * @author Aick Spt
+     * @date 2023-07-24 16:21
+     */
+    public PageMoreRes<SettlementLogisticsDto> pageSelectCollection(SettlementReq settlementReq) {
+        CommonValidator.isValidCoexisting(settlementReq.getStartCreateTime(), settlementReq.getEndCreateTime(), "");
+        CommonValidator.isValidCoexisting(settlementReq.getStartReceiptTime(), settlementReq.getEndReceiptTime(), "预计收款开始和结束时间");
+
+        PageHelper.startPage(settlementReq.getPage(), settlementReq.getPageSize());
+        List<SettlementLogisticsDto> kwpLedgerLogisticsList = settlementLogisticsMapper.pageSelectCollection(settlementReq);
+        SettlementLogisticsSumVo settlementLogisticsSum = settlementLogisticsMapper.selectCollectionSum(settlementReq);
+
+        // 对查询结果进行处理，转换 status 到 desc
+        return new PageMoreRes<>(getSettlementLogisticsDtoPageRes(kwpLedgerLogisticsList), settlementLogisticsSum);
+    }
+
+
+    /**
+     * 运费付款-物流订单列表
+     *
+     * @author Aick Spt
+     * @date 2023-07-24 16:23
+     */
+    public PageRes<SettlementLogisticsDto> pageSelectPayment(SettlementReq settlementReq) {
+        CommonValidator.isValidCoexisting(settlementReq.getStartCreateTime(), settlementReq.getEndCreateTime(), "");
+        CommonValidator.isValidCoexisting(settlementReq.getStartReceiptTime(), settlementReq.getEndReceiptTime(), "预计付款开始和结束时间");
+
+        PageHelper.startPage(settlementReq.getPage(), settlementReq.getPageSize());
+        List<SettlementLogisticsDto> kwpLedgerLogisticsList = settlementLogisticsMapper.pageSelectPayment(settlementReq);
+
+        // 对查询结果进行处理，转换 status 到 desc
+        return new PageRes<>(getSettlementLogisticsDtoPageRes(kwpLedgerLogisticsList));
+    }
+
+    @NotNull
+    private PageInfo<SettlementLogisticsDto> getSettlementLogisticsDtoPageRes(List<SettlementLogisticsDto> kwpLedgerLogisticsList) {
+        for (SettlementLogisticsDto entity : kwpLedgerLogisticsList) {
+            entity.setStatusText(SettlementEnum.getStatusDesc(entity.getStatus()));
+            entity.setResiduePrice(entity.getLedgerSettlePrice().subtract(entity.getActualPrice()));
+            entity.setCreateByText("创建人名称");
+            entity.setUpdateByText("更新人名称");
+        }
+        return new PageInfo<>(kwpLedgerLogisticsList);
+    }
+
+
+    /**
+     * 运费收款-物流订单详情
+     *
+     * @author Aick Spt
+     * @date 2023-07-24 16:22
+     */
+    public SettlementLogisticsDto detailCollection(Long id) {
+        return settlementLogisticsMapper.detailCollection(id);
+    }
+
+    /**
+     * 运费付款-物流订单详情
+     *
+     * @author Aick Spt
+     * @date 2023-07-24 16:24
+     */
+    public SettlementLogisticsDto detailPayment(Long id) {
+        return settlementLogisticsMapper.detailPayment(id);
+    }
+
+
+    /**
+     * 根据id查物流结算订单
+     *
+     * @param ids 物流结算订单集合List<Long>
+     * @author Aick Spt
+     * @date 2023-07-21 16:16
+     */
+    public List<SettlementLogisticsDto> selectList(List<Long> ids) {
+        return settlementLogisticsMapper.selectIds(ids);
+    }
+
+    public List<SettlementLogisticsDto> selectList(Integer unitType) {
+        return settlementLogisticsMapper.selectList(unitType);
     }
 
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementLogisticsTrackService.java

@@ -1,5 +1,7 @@
 package com.sckw.payment.service;
 
+import com.sckw.payment.dao.KwpSettlementLogisticsTrackMapper;
+import com.sckw.payment.model.KwpSettlementLogisticsTrack;
 import org.springframework.stereotype.Service;
 /**
  * @author xucaiqin
@@ -9,4 +11,13 @@ import org.springframework.stereotype.Service;
 @Service
 public class KwpSettlementLogisticsTrackService  {
 
+    private final KwpSettlementLogisticsTrackMapper settlementLogisticsTrackMapper;
+
+    public KwpSettlementLogisticsTrackService(KwpSettlementLogisticsTrackMapper settlementLogisticsTrackMapper) {
+        this.settlementLogisticsTrackMapper = settlementLogisticsTrackMapper;
+    }
+
+    public void save(KwpSettlementLogisticsTrack kwpSettlementLogisticsTrack) {
+        settlementLogisticsTrackMapper.insert(kwpSettlementLogisticsTrack);
+    }
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementOfflineService.java

@@ -1,12 +1,156 @@
 package com.sckw.payment.service;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.sckw.core.model.page.PageRes;
+import com.sckw.core.utils.IdWorker;
+import com.sckw.payment.dao.KwpSettlementOfflineMapper;
+import com.sckw.payment.model.KwpSettlementOffline;
+import com.sckw.payment.model.constant.SettlementWalletPayTypeEnum;
+import com.sckw.payment.model.dto.SettlementOfflineDto;
+import com.sckw.payment.model.vo.req.SettlementOfflineReq;
+import com.sckw.payment.model.vo.req.SettlementReq;
+import com.sckw.payment.model.vo.res.SettlementOfflineVo;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * @author xucaiqin
  * @date 2023-07-10 16:38:36
  */
-
+@AllArgsConstructor
 @Service
+@Slf4j
 public class KwpSettlementOfflineService {
 
+    private final KwpSettlementOfflineMapper settlementOfflineMapper;
+
+    /**
+     * 物流-线下付款(运费收款)记录-列表
+     * @author Aick Spt
+     * @date 2023-07-26 17:15
+     */
+    public PageRes<SettlementOfflineVo> pageListLogisticsCollection(SettlementOfflineReq settlementOfflineReq) {
+//        //todo 查询缓存，获取客户企业id
+//        String keywords = settlementReq.getKeywords();
+//        if (StringUtils.isNotBlank(keywords)) {
+//            System.out.println("关键之：" + keywords);
+//        }
+        PageHelper.startPage(settlementOfflineReq.getPage(), settlementOfflineReq.getPageSize());
+
+        List<SettlementOfflineDto> settlementOfflineLogisticsList = settlementOfflineMapper.pageListLogisticsCollection(settlementOfflineReq);
+
+        if (CollectionUtils.isEmpty(settlementOfflineLogisticsList)) {
+            return new PageRes<>(new PageInfo<>());
+        }
+
+        for (SettlementOfflineDto entity : settlementOfflineLogisticsList) {
+            entity.setCreateByText("创建人名称");
+            entity.setUpdateByText("更新人名称");
+        }
+
+        //指定返回值
+        List<SettlementOfflineVo> collect = settlementOfflineLogisticsList.stream().map(a -> {
+            SettlementOfflineVo settlementOfflineVo = new SettlementOfflineVo();
+            BeanUtils.copyProperties(a, settlementOfflineVo);
+            return settlementOfflineVo;
+        }).collect(Collectors.toList());
+
+        return new PageRes<>(new PageInfo<>(collect));
+    }
+
+
+    /**
+     * 结算-物流-线下付款(运费收款)记录-详情
+     *
+     * @param id 结算物流订单id
+     * @author Aick Spt
+     * @date 2023-07-19 09:11
+     */
+    public SettlementOfflineDto detailLogisticsCollection(Long id) {
+        return settlementOfflineMapper.detailLogisticsCollection(id);
+    }
+
+    /**
+     * 物流-线下付款(运费收款)记录-新增
+     *
+     * @param id    结算单id
+     * @param price 付款金额
+     * @return InsertId
+     * @author Aick Spt
+     * @date 2023-07-20 14:23
+     */
+    public Integer confirmLogisticsCollection(Long id, Float price) {
+        log.info("接收到数据，开始物流-物流-线下付款(运费收款)记录-新增，待完善");
+        //todo 待完善
+        //先查询出结算单情况
+
+        //检查结算单状态和所差金额
+
+        //对比金额
+
+        //累加入库结算单
+
+        //新增电子钱包结算记录
+        KwpSettlementOffline kwpSettlementOffline = new KwpSettlementOffline();
+        kwpSettlementOffline.setId(new IdWorker(1).nextId());
+
+        //todo 待完善
+        settlementOfflineMapper.insert(kwpSettlementOffline);
+        return settlementOfflineMapper.confirmLogisticsCollection(id, price);
+    }
+
+    public PageRes<SettlementOfflineVo> pageListTradeCollection(SettlementOfflineReq settlementOfflineReq) {
+        //        //todo 查询缓存，获取客户企业id
+//        String keywords = settlementReq.getKeywords();
+//        if (StringUtils.isNotBlank(keywords)) {
+//            System.out.println("关键之：" + keywords);
+//        }
+        PageHelper.startPage(settlementOfflineReq.getPage(), settlementOfflineReq.getPageSize());
+
+        List<SettlementOfflineDto> settlementOfflineLogisticsList = settlementOfflineMapper.pageListLogisticsCollection(settlementOfflineReq);
+        for (SettlementOfflineDto entity : settlementOfflineLogisticsList) {
+            entity.setCreateByText("创建人名称");
+            entity.setUpdateByText("更新人名称");
+        }
+
+        if (CollectionUtils.isEmpty(settlementOfflineLogisticsList)) {
+            return new PageRes<>(new PageInfo<>());
+        }
+
+        //指定返回值
+        List<SettlementOfflineVo> collect = settlementOfflineLogisticsList.stream().map(a -> {
+            SettlementOfflineVo settlementOfflineVo = new SettlementOfflineVo();
+            BeanUtils.copyProperties(a, settlementOfflineVo);
+            return settlementOfflineVo;
+        }).collect(Collectors.toList());
+
+        return new PageRes<>(new PageInfo<>(collect));
+    }
+
+    public Integer confirmTradeCollection(Long id, Float price) {
+        log.info("接收到数据，开始物流-物流-线下付款(销售收款)记录-新增，待完善");
+        //todo 待完善
+        //先查询出结算单情况
+
+        //检查结算单状态和所差金额
+
+        //对比金额
+
+        //累加入库结算单
+
+        //新增电子钱包结算记录
+        KwpSettlementOffline kwpSettlementOffline = new KwpSettlementOffline();
+        kwpSettlementOffline.setId(new IdWorker(1).nextId());
+
+        //todo 待完善
+        settlementOfflineMapper.insert(kwpSettlementOffline);
+        return settlementOfflineMapper.confirmLogisticsCollection(id, price);
+    }
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementTradeService.java

@@ -1,10 +1,20 @@
 package com.sckw.payment.service;
 
+import com.github.pagehelper.PageInfo;
+import com.sckw.core.model.page.PageRes;
 import com.sckw.payment.dao.KwpSettlementTradeMapper;
 import com.sckw.payment.model.KwpSettlementTrade;
+import com.sckw.payment.model.constant.SettlementEnum;
+import com.sckw.payment.model.dto.SettlementLogisticsDto;
+import com.sckw.payment.model.dto.SettlementTradeDto;
+import com.sckw.payment.model.dto.SettlementWalletDto;
+import com.sckw.payment.model.vo.req.SettlementReq;
+import com.sckw.payment.model.vo.res.SettlementLogisticsStatusCountVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author xucaiqin
  * @date 2023-07-10 16:38:36
@@ -17,4 +27,77 @@ public class KwpSettlementTradeService {
     public void save(KwpSettlementTrade kwpSettlementTrade) {
         settlementTradeMapper.insert(kwpSettlementTrade);
     }
+
+    public PageRes<SettlementTradeDto> pageListCollection(SettlementReq settlementReq) {
+//        //todo 查询缓存，获取客户企业id
+//        String keywords = settlementReq.getKeywords();
+//        if (StringUtils.isNotBlank(keywords)) {
+//            System.out.println("关键之：" + keywords);
+//        }
+//        PageHelper.startPage(settlementReq.getPage(), settlementReq.getPageSize());
+//
+//        List<SettlementLogisticsDto> kwpLedgerLogisticsList = settlementOfflineMapper.pageSelect(settlementReq);
+//
+//        return new PageRes<>(new PageInfo<>(kwpLedgerLogisticsList));
+        return new PageRes<>(new PageInfo<>());
+    }
+
+    public SettlementLogisticsStatusCountVo getCountListCollection(SettlementReq settlementReq) {
+        SettlementLogisticsStatusCountVo settlementLogisticsStatusCountVos = new SettlementLogisticsStatusCountVo();
+        //总
+//        settlementReq.setStatus(null);
+//        settlementLogisticsStatusCountVos.setAllCount(settlementLogisticsMapper.getCountListCollection(settlementReq));
+//
+//        //待结算
+//        settlementReq.setStatus(SettlementEnum.WAITING_PAYMENT.getStatus());
+//        settlementLogisticsStatusCountVos.setWaitingPaymentCount(settlementLogisticsMapper.getCountListCollection(settlementReq));
+//
+//        //部分结算
+//        settlementReq.setStatus(SettlementEnum.PARTIAL_PAYMENT.getStatus());
+//        settlementLogisticsStatusCountVos.setPartialPaymentCount(settlementLogisticsMapper.getCountListCollection(settlementReq));
+//
+//        //全部结算
+//        settlementReq.setStatus(SettlementEnum.ALL_PAYMENT.getStatus());
+//        settlementLogisticsStatusCountVos.setAllPaymentCount(settlementLogisticsMapper.getCountListCollection(settlementReq));
+
+        return settlementLogisticsStatusCountVos;
+    }
+
+
+    public List<SettlementTradeDto> selectList(List<Long> ids) {
+        return null;
+    }
+
+    /**
+     * 结算-物流订单详情
+     *
+     * @param id 结算物流订单id
+     * @author Aick Spt
+     * @date 2023-07-19 09:11
+     */
+    public SettlementTradeDto detailCollection(Long id) {
+        return null;
+    }
+
+    public PageRes<SettlementTradeDto> pageListPayment(SettlementReq settlementReq) {
+//        //todo 查询缓存，获取客户企业id
+//        String keywords = settlementReq.getKeywords();
+//        if (StringUtils.isNotBlank(keywords)) {
+//            System.out.println("关键之：" + keywords);
+//        }
+//        PageHelper.startPage(settlementReq.getPage(), settlementReq.getPageSize());
+//
+//        List<SettlementLogisticsDto> kwpLedgerLogisticsList = settlementOfflineMapper.pageSelect(settlementReq);
+//
+//        return new PageRes<>(new PageInfo<>(kwpLedgerLogisticsList));
+        return new PageRes<>(new PageInfo<>());
+    }
+
+    public SettlementLogisticsStatusCountVo getCountListPayment(SettlementReq settlementReq) {
+        return null;
+    }
+
+    public SettlementTradeDto detailPayment(Long id) {
+        return null;
+    }
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementTradeTrackService.java

@@ -1,5 +1,7 @@
 package com.sckw.payment.service;
 
+import com.sckw.payment.dao.KwpSettlementTradeTrackMapper;
+import com.sckw.payment.model.KwpSettlementTradeTrack;
 import org.springframework.stereotype.Service;
 /**
  * @author xucaiqin
@@ -9,4 +11,13 @@ import org.springframework.stereotype.Service;
 @Service
 public class KwpSettlementTradeTrackService  {
 
+    private final KwpSettlementTradeTrackMapper settlementTradeTrackMapper;
+
+    public KwpSettlementTradeTrackService(KwpSettlementTradeTrackMapper settlementTradeTrackMapper) {
+        this.settlementTradeTrackMapper = settlementTradeTrackMapper;
+    }
+
+    public void save(KwpSettlementTradeTrack kwpSettlementTradeTrack) {
+        settlementTradeTrackMapper.insert(kwpSettlementTradeTrack);
+    }
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementWalletService.java

@@ -1,13 +1,329 @@
 package com.sckw.payment.service;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.sckw.core.exception.BusinessException;
+import com.sckw.core.model.page.PageRes;
+import com.sckw.core.utils.IdWorker;
+import com.sckw.payment.dao.KwpSettlementLogisticsMapper;
+import com.sckw.payment.dao.KwpSettlementTradeMapper;
+import com.sckw.payment.dao.KwpSettlementWalletMapper;
+import com.sckw.payment.model.KwpSettlementLogistics;
+import com.sckw.payment.model.KwpSettlementTrade;
+import com.sckw.payment.model.KwpSettlementWallet;
+import com.sckw.payment.model.constant.SettlementEnum;
+import com.sckw.payment.model.constant.SettlementOrderTypeEnum;
+import com.sckw.payment.model.constant.SettlementWalletPayTypeEnum;
+import com.sckw.payment.model.constant.WalletChannelEnum;
+import com.sckw.payment.model.dto.SettlementLogisticsDto;
+import com.sckw.payment.model.dto.SettlementTradeDto;
+import com.sckw.payment.model.dto.SettlementWalletDto;
+import com.sckw.payment.model.vo.req.SettlementWalletReq;
+import com.sckw.payment.model.vo.res.SettlementWalletVo;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
- * @author xucaiqin
- * @date 2023-07-10 16:38:36
+ * @author Aick Spt
+ * @date 2023-07-20 14:55
  */
-
+@AllArgsConstructor
 @Service
+@Slf4j
 public class KwpSettlementWalletService {
 
+    private final KwpSettlementWalletMapper settlementWalletMapper;
+
+    private final KwpSettlementLogisticsMapper kwpSettlementLogisticsMapper;
+
+    private final KwpSettlementLogisticsService kwpSettlementLogisticsService;
+
+    private final KwpSettlementTradeService kwpSettlementTradeService;
+
+    private final KwpSettlementTradeMapper kwpSettlementTradeMapper;
+
+    /**
+     * 物流-电子钱包付款（货到付款）结算记录-列表
+     *
+     * @author Aick Spt
+     * @date 2023-07-26 16:43
+     */
+    public PageRes<SettlementWalletVo> pageListLogisticsPayment(SettlementWalletReq settlementWalletReq) {
+//        //todo 查询缓存，获取客户企业id
+//        String keywords = settlementReq.getKeywords();
+//        if (StringUtils.isNotBlank(keywords)) {
+//            System.out.println("关键之：" + keywords);
+//        }
+        PageHelper.startPage(settlementWalletReq.getPage(), settlementWalletReq.getPageSize());
+        settlementWalletReq.setPayType(SettlementWalletPayTypeEnum.CASH_ON_DELIVERY.getStatus());//只筛选 货到付款
+        List<SettlementWalletDto> settlementWalletLogisticsList = settlementWalletMapper.pageListLogisticsPayment(settlementWalletReq);
+
+        if (CollectionUtils.isEmpty(settlementWalletLogisticsList)) {
+            return new PageRes<>(new PageInfo<>());
+        }
+
+        for (SettlementWalletDto entity : settlementWalletLogisticsList) {
+            entity.setCreateByText("创建人名称");
+            entity.setUpdateByText("更新人名称");
+        }
+
+        //指定返回值
+        List<SettlementWalletVo> collect = settlementWalletLogisticsList.stream().map(a -> {
+            SettlementWalletVo settlementWalletVo = new SettlementWalletVo();
+            BeanUtils.copyProperties(a, settlementWalletVo);
+            return settlementWalletVo;
+        }).collect(Collectors.toList());
+
+        return new PageRes<>(new PageInfo<>(collect));
+    }
+
+
+    /**
+     * 结算-物流订单详情
+     *
+     * @param id 结算物流订单id
+     * @author Aick Spt
+     * @date 2023-07-19 09:11
+     */
+    public SettlementWalletDto detailLogisticsPayment(Long id) {
+        return settlementWalletMapper.detailLogisticsPayment(id);
+    }
+
+    /**
+     * 物流-电子钱包付款（货到付款）结算记录-新增
+     *
+     * @param id    结算单id
+     * @param price 付款金额
+     * @return InsertId
+     * @author Aick Spt
+     * @date 2023-07-20 14:23
+     * <p>
+     * Transactional// isolation:事务的隔离级别，此处使用后端数据库的默认隔离级别, propagation: 如果当前没有事务，就新建一个事务，如果已经存在一个事务中，加入到这个事务中(常见)。(rollbackFor = Exception.class, isolation = Isolation.DEFAULT, propagation = Propagation.REQUIRED)
+     */
+    @Transactional
+    public Integer confirmLogisticsPayment(Long id, BigDecimal price) {
+        //先查询出结算单情况
+        SettlementLogisticsDto settlementLogisticsDto = kwpSettlementLogisticsService.detailPayment(id);
+        log.info(String.valueOf(settlementLogisticsDto));
+        //检查结算单状态和所差金额
+        if (settlementLogisticsDto == null) {
+            log.error("非法请求，查无数据：" + id);
+            throw new BusinessException("非法请求运费结算参数ID");
+        }
+        if (settlementLogisticsDto.getStatus() == SettlementEnum.ALL_PAYMENT.getStatus()) {
+            log.error("非法请求，该订单已结算完成：" + id);
+            throw new BusinessException("该订单已结算完成，无法操作");
+        }
+        BigDecimal remainingReceivables = settlementLogisticsDto.getTotalPrice();
+        if (settlementLogisticsDto.getActualPrice() != null) {//剩余金额
+            remainingReceivables = settlementLogisticsDto.getTotalPrice().subtract(settlementLogisticsDto.getActualPrice());
+        }
+
+        if (remainingReceivables.compareTo(price) < 0) {//-1表示小于,0是等于,1是大于
+            log.error("本次结算输入金额比剩余付款金额大：ID：" + id + " 剩余金额：" + remainingReceivables + " 本次输入金额：" + price);
+            throw new BusinessException("参数错误：输入金额过大 " + price + " 剩余金额最大值：" + remainingReceivables);
+        }
+        //累加入库结算单
+        KwpSettlementLogistics settlementLogistics1 = new KwpSettlementLogistics();
+        settlementLogistics1.setId(settlementLogisticsDto.getId());
+        settlementLogistics1.setUpdateTime(LocalDateTime.now());
+        if (remainingReceivables.compareTo(price) == 0) {//全部结算
+            settlementLogistics1.setStatus(SettlementEnum.ALL_PAYMENT.getStatus());
+        }
+        if (remainingReceivables.compareTo(price) > 0) {//部分结算
+            settlementLogistics1.setStatus(SettlementEnum.PARTIAL_PAYMENT.getStatus());
+        }
+        BigDecimal actualPrice = settlementLogisticsDto.getActualPrice();
+        settlementLogistics1.setActualPrice((actualPrice == null) ? price : actualPrice.add(price));
+        int upInt = kwpSettlementLogisticsMapper.updateById(settlementLogistics1);
+        if (upInt > 0) {
+            //新增一条电子钱包结算记录
+            remainingReceivables = remainingReceivables.subtract(price);
+            KwpSettlementWallet kwpSettlementWallet = new KwpSettlementWallet();
+            kwpSettlementWallet.setId(new IdWorker(1).nextId());
+            kwpSettlementWallet.setEntId(settlementLogisticsDto.getEntId());
+            kwpSettlementWallet.setSettlementId(settlementLogisticsDto.getId());
+            kwpSettlementWallet.setOrderType(SettlementOrderTypeEnum.LOGISTICS.getStatus());
+            kwpSettlementWallet.setChannel(WalletChannelEnum.HF.getStatus());//先用数字默认定义为1
+            kwpSettlementWallet.setPayTime(LocalDateTime.now());
+            kwpSettlementWallet.setPayPrice(price);
+            kwpSettlementWallet.setTopayPrice(remainingReceivables);
+            kwpSettlementWallet.setType(SettlementWalletPayTypeEnum.CASH_ON_DELIVERY.getStatus());
+            kwpSettlementWallet.setRemark("");
+            kwpSettlementWallet.setStatus(1);
+            kwpSettlementWallet.setCreateBy(1L);//todo 待处理明确创建人
+            kwpSettlementWallet.setCreateTime(LocalDateTime.now());
+            kwpSettlementWallet.setUpdateBy(1L);//todo 待处理明确更新人
+            kwpSettlementWallet.setUpdateTime(LocalDateTime.now());
+            kwpSettlementWallet.setDelFlag(0);
+            Integer insertKwpSettlementWallet = settlementWalletMapper.insert(kwpSettlementWallet);
+
+            //物流货到付款电子钱包逻辑
+            //todo 待处理费电子钱包逻辑
+
+            return insertKwpSettlementWallet;
+        }
+        return null;
+    }
+
+    public PageRes<SettlementWalletVo> pageListTradePayment(SettlementWalletReq settlementWalletReq) {
+//        //todo 查询缓存，获取客户企业id
+//        String keywords = settlementReq.getKeywords();
+//        if (StringUtils.isNotBlank(keywords)) {
+//            System.out.println("关键之：" + keywords);
+//        }
+        PageHelper.startPage(settlementWalletReq.getPage(), settlementWalletReq.getPageSize());
+
+        List<SettlementWalletDto> settlementWalletLogisticsList = settlementWalletMapper.pageListLogisticsPayment(settlementWalletReq);
+        for (SettlementWalletDto entity : settlementWalletLogisticsList) {
+            entity.setCreateByText("创建人名称");
+            entity.setUpdateByText("更新人名称");
+        }
+
+        if (CollectionUtils.isEmpty(settlementWalletLogisticsList)) {
+            return new PageRes<>(new PageInfo<>());
+        }
+
+        //指定返回值
+        List<SettlementWalletVo> collect = settlementWalletLogisticsList.stream().map(a -> {
+            SettlementWalletVo settlementWalletVo = new SettlementWalletVo();
+            BeanUtils.copyProperties(a, settlementWalletVo);
+            return settlementWalletVo;
+        }).collect(Collectors.toList());
+
+        return new PageRes<>(new PageInfo<>(collect));
+    }
+
+
+    /**
+     * 销售-付款确认-(新增电子钱包记录-采购货到付款)
+     *
+     * @author Aick Spt
+     * @date 2023-07-27 16:13
+     */
+    public Integer confirmTradePayment(Long id, BigDecimal price) {
+        //先查询出结算单情况
+        SettlementTradeDto settlementTradeDto = kwpSettlementTradeService.detailPayment(id);
+        log.info(String.valueOf(settlementTradeDto));
+        //检查结算单状态和所差金额
+        if (settlementTradeDto == null) {
+            log.error("非法请求，查无数据：" + id);
+            throw new BusinessException("非法请求运费结算参数ID");
+        }
+        if (settlementTradeDto.getStatus() == SettlementEnum.ALL_PAYMENT.getStatus()) {
+            log.error("非法请求，该订单已结算完成：" + id);
+            throw new BusinessException("该订单已结算完成，无法操作");
+        }
+        BigDecimal remainingReceivables = settlementTradeDto.getTotalPrice();
+        if (settlementTradeDto.getActualPrice() != null) {//剩余金额
+            remainingReceivables = settlementTradeDto.getTotalPrice().subtract(settlementTradeDto.getActualPrice());
+        }
+
+        if (remainingReceivables.compareTo(price) < 0) {//-1表示小于,0是等于,1是大于
+            log.error("本次结算输入金额比剩余付款金额大：ID：" + id + " 剩余金额：" + remainingReceivables + " 本次输入金额：" + price);
+            throw new BusinessException("参数错误：输入金额过大 " + price + " 剩余金额最大值：" + remainingReceivables);
+        }
+        //累加入库结算单
+        KwpSettlementTrade kwpSettlementTrade = new KwpSettlementTrade();
+        kwpSettlementTrade.setId(settlementTradeDto.getId());
+        kwpSettlementTrade.setUpdateTime(LocalDateTime.now());
+        if (remainingReceivables.compareTo(price) == 0) {//全部结算
+            kwpSettlementTrade.setStatus(SettlementEnum.ALL_PAYMENT.getStatus());
+        }
+        if (remainingReceivables.compareTo(price) > 0) {//部分结算
+            kwpSettlementTrade.setStatus(SettlementEnum.PARTIAL_PAYMENT.getStatus());
+        }
+        BigDecimal actualPrice = settlementTradeDto.getActualPrice();
+        kwpSettlementTrade.setActualPrice((actualPrice == null) ? price : actualPrice.add(price));
+        int upInt = kwpSettlementTradeMapper.updateById(kwpSettlementTrade);
+        if (upInt > 0) {
+            //新增一条电子钱包结算记录
+            remainingReceivables = remainingReceivables.subtract(price);
+            KwpSettlementWallet kwpSettlementWallet = new KwpSettlementWallet();
+            kwpSettlementWallet.setId(new IdWorker(1).nextId());
+            kwpSettlementWallet.setEntId(settlementTradeDto.getEntId());
+            kwpSettlementWallet.setSettlementId(settlementTradeDto.getId());
+            kwpSettlementWallet.setOrderType(SettlementOrderTypeEnum.LOGISTICS.getStatus());
+            kwpSettlementWallet.setChannel(WalletChannelEnum.HF.getStatus());//先用数字默认定义为1
+            kwpSettlementWallet.setPayTime(LocalDateTime.now());
+            kwpSettlementWallet.setPayPrice(price);
+            kwpSettlementWallet.setTopayPrice(remainingReceivables);
+            kwpSettlementWallet.setType(SettlementWalletPayTypeEnum.CASH_ON_DELIVERY.getStatus());
+            kwpSettlementWallet.setRemark("");
+            kwpSettlementWallet.setStatus(1);
+            kwpSettlementWallet.setCreateBy(1L);//todo 待处理明确创建人
+            kwpSettlementWallet.setCreateTime(LocalDateTime.now());
+            kwpSettlementWallet.setUpdateBy(1L);//todo 待处理明确更新人
+            kwpSettlementWallet.setUpdateTime(LocalDateTime.now());
+            kwpSettlementWallet.setDelFlag(0);
+            Integer insertKwpSettlementWallet = settlementWalletMapper.insert(kwpSettlementWallet);
+
+            //物流货到付款电子钱包逻辑
+            //todo 待处理费电子钱包逻辑
+
+            return insertKwpSettlementWallet;
+        }
+        return null;
+    }
+
+    public PageRes<SettlementWalletVo> pageListTradeCollection(SettlementWalletReq settlementWalletReq) {
+//        //todo 查询缓存，获取客户企业id
+//        String keywords = settlementReq.getKeywords();
+//        if (StringUtils.isNotBlank(keywords)) {
+//            System.out.println("关键之：" + keywords);
+//        }
+        PageHelper.startPage(settlementWalletReq.getPage(), settlementWalletReq.getPageSize());
+
+        List<SettlementWalletDto> settlementWalletLogisticsList = settlementWalletMapper.pageListLogisticsPayment(settlementWalletReq);
+        for (SettlementWalletDto entity : settlementWalletLogisticsList) {
+            entity.setCreateByText("创建人名称");
+            entity.setUpdateByText("更新人名称");
+        }
+
+        if (CollectionUtils.isEmpty(settlementWalletLogisticsList)) {
+            return new PageRes<>(new PageInfo<>());
+        }
+
+        //指定返回值
+        List<SettlementWalletVo> collect = settlementWalletLogisticsList.stream().map(a -> {
+            SettlementWalletVo settlementWalletVo = new SettlementWalletVo();
+            BeanUtils.copyProperties(a, settlementWalletVo);
+            return settlementWalletVo;
+        }).collect(Collectors.toList());
+
+        return new PageRes<>(new PageInfo<>(collect));
+    }
+
+
+    public Integer confirmTradeCollection(Long id, Float price) {
+        log.info("接收到数据，开始物流-销售-收款确认-预付款(电子钱包)-新增，待完善");
+        //todo 待完善
+        //先查询出结算单情况
+
+        //检查结算单状态和所差金额
+
+        //对比金额
+
+        //累加入库结算单
+
+        //扣费电子钱包
+
+        //新增电子钱包结算记录
+        KwpSettlementWallet kwpSettlementWallet = new KwpSettlementWallet();
+        kwpSettlementWallet.setId(new IdWorker(1).nextId());
+        //todo 待完善
+        settlementWalletMapper.insert(kwpSettlementWallet);
+        return settlementWalletMapper.confirmLogisticsPayment(id, price);
+    }
 }
+

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/utils/CommonValidator.java

@@ -0,0 +1,48 @@
+package com.sckw.payment.utils;
+
+import com.sckw.core.exception.BusinessException;
+import org.apache.commons.lang3.StringUtils;
+
+import java.time.LocalDateTime;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
+
+/**
+ * @author Aick Spt
+ * @date 2023-07-20 17:18
+ */
+public class CommonValidator {
+
+    // 时间格式的正则表达式
+    private static final String TIME_PATTERN = "\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}";
+
+    /**
+     * 判断时间段的开始时间和结束时间是否同时存在或同时不存在，且格式为 yyyy-MM-dd HH:mm:ss
+     *
+     * @param startTime 时间段的开始时间
+     * @param endTime   时间段的结束时间
+     * @return 如果格式正确且同时存在返回 true，否则返回 false
+     * @author Aick Spt
+     * @date 2023-07-20 17:19
+     */
+    public static boolean isValidTimeRange(String startTime, String endTime) {
+        // 使用正则表达式匹配时间格式
+        if (StringUtils.isBlank(startTime) && StringUtils.isBlank(endTime)) {
+            return true;
+        }
+        Pattern pattern = Pattern.compile(TIME_PATTERN);
+        Matcher startMatcher = pattern.matcher(startTime);
+        Matcher endMatcher = pattern.matcher(endTime);
+
+        // 检查开始时间和结束时间是否同时存在，并且格式符合要求
+        return startMatcher.matches() && endMatcher.matches();
+    }
+
+    public static void isValidCoexisting(LocalDateTime startCreateTime, LocalDateTime endCreateTime, String msg) {
+        if (!((startCreateTime == null && endCreateTime == null) || (startCreateTime != null && endCreateTime != null))) {
+            throw new BusinessException("请正确填写" + (StringUtils.isNotBlank(msg) ? msg : "开始和结束时间"));
+        }
+    }
+
+
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/utils/PageMoreRes.java

@@ -0,0 +1,39 @@
+package com.sckw.payment.utils;
+
+import com.github.pagehelper.PageInfo;
+import com.sckw.core.model.page.PageRes;
+import com.sckw.payment.model.vo.res.SettlementLogisticsSumVo;
+
+import java.util.List;
+
+/**
+ * 返回的分页数据中，有额外需要返回的参数
+ *
+ * @author Aick Spt
+ * @date 2023-07-25 17:31
+ */
+public class PageMoreRes<T> extends PageRes<T> {
+
+    /**
+     * 更多其余数据
+     */
+    public SettlementLogisticsSumVo otherList;
+
+
+    public void setOtherList(SettlementLogisticsSumVo otherList) {
+        this.otherList = otherList;
+    }
+
+
+    public SettlementLogisticsSumVo getOtherList() {
+        return otherList;
+    }
+
+    public PageMoreRes(PageInfo<T> pageInfo, SettlementLogisticsSumVo otherList) {
+        super(pageInfo);
+        this.otherList = otherList;
+    }
+
+
+
+}

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

@@ -0,0 +1,24 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 10.10.10.230:8848
+        # 命名空间
+        namespace: sckw_pdy
+        # 共享配置
+        group: sckw-service-platform
+      config:
+        # 配置中心地址
+        server-addr: 10.10.10.230:8848
+        # 配置文件格式
+        file-extension: yaml
+        # 命名空间
+        namespace: sckw_pdy
+        # 共享配置
+        group: sckw-service-platform
+        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        extension-configs:
+          - dataId: sckw-common.yml
+            group: sckw-service-platform
+            refresh: true

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

@@ -0,0 +1,28 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: @nacos.server@
+        # 命名空间
+        namespace: @nacos.namespace@
+        # 共享配置
+        group: sckw-service-platform
+      config:
+        # 配置中心地址
+        server-addr: @nacos.server@
+        # 命名空间
+        namespace: @nacos.namespace@
+        # 共享配置
+        group: sckw-service-platform
+        # 配置文件格式
+        file-extension: yaml
+        shared-configs:
+          - data-id: sckw-common.yml
+            group: sckw-common
+            refresh: true
+        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        extension-configs:
+          - dataId: sckw-common.yml
+            group: sckw-service-platform
+            refresh: true

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

@@ -5,7 +5,7 @@ spring:
   application:
     name: sckw-payment
   profiles:
-    active: ${DEPLOY_MODE:dev}
+    active: @profiles.active@
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true

sckw-modules/sckw-payment/src/main/resources/mapper/KwpLedgerLogisticsOrderMapper.xml

@@ -7,6 +7,7 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="l_ledger_id" jdbcType="BIGINT" property="lLedgerId" />
     <result column="l_order_id" jdbcType="BIGINT" property="lOrderId" />
+    <result column="l_order_no" jdbcType="VARCHAR" property="lOrderNo" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="create_by" jdbcType="BIGINT" property="createBy" />
@@ -17,7 +18,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, l_ledger_id, l_order_id, remark, `status`, create_by, create_time, update_by, 
-    update_time, del_flag
+    id, l_ledger_id, l_order_id, l_order_no, remark, `status`, create_by, create_time, 
+    update_by, update_time, del_flag
   </sql>
 </mapper>

sckw-modules/sckw-payment/src/main/resources/mapper/KwpLedgerTradeOrderMapper.xml

@@ -7,6 +7,7 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="t_ledger_id" jdbcType="BIGINT" property="tLedgerId" />
     <result column="t_order_id" jdbcType="BIGINT" property="tOrderId" />
+    <result column="t_order_no" jdbcType="VARCHAR" property="tOrderNo" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="create_by" jdbcType="BIGINT" property="createBy" />
@@ -17,7 +18,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, t_ledger_id, t_order_id, remark, `status`, create_by, create_time, update_by, 
-    update_time, del_flag
+    id, t_ledger_id, t_order_id, t_order_no, remark, `status`, create_by, create_time, 
+    update_by, update_time, del_flag
   </sql>
 </mapper>

sckw-modules/sckw-payment/src/main/resources/mapper/KwpSettlementLogisticsMapper.xml

@@ -1,33 +1,264 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sckw.payment.dao.KwpSettlementLogisticsMapper">
-  <resultMap id="BaseResultMap" type="com.sckw.payment.model.KwpSettlementLogistics">
-    <!--@mbg.generated-->
-    <!--@Table kwp_settlement_logistics-->
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="ent_id" jdbcType="BIGINT" property="entId" />
-    <result column="l_ledger_id" jdbcType="BIGINT" property="lLedgerId" />
-    <result column="sl_order_no" jdbcType="VARCHAR" property="slOrderNo" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="total_price" jdbcType="DECIMAL" property="totalPrice" />
-    <result column="actual_price" jdbcType="DECIMAL" property="actualPrice" />
-    <result column="receipt_time" jdbcType="TIMESTAMP" property="receiptTime" />
-    <result column="remark" jdbcType="VARCHAR" property="remark" />
-    <result column="audit_user" jdbcType="VARCHAR" property="auditUser" />
-    <result column="audit_phone" jdbcType="VARCHAR" property="auditPhone" />
-    <result column="success_user" jdbcType="VARCHAR" property="successUser" />
-    <result column="success_phone" jdbcType="VARCHAR" property="successPhone" />
-    <result column="status" jdbcType="INTEGER" property="status" />
-    <result column="create_by" jdbcType="BIGINT" property="createBy" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_by" jdbcType="BIGINT" property="updateBy" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, ent_id, l_ledger_id, sl_order_no, `name`, total_price, actual_price, receipt_time, 
-    remark, audit_user, audit_phone, success_user, success_phone, `status`, create_by, 
-    create_time, update_by, update_time, del_flag
-  </sql>
+    <resultMap id="BaseResultMap" type="com.sckw.payment.model.KwpSettlementLogistics">
+        <!--@mbg.generated-->
+        <!--@Table kwp_settlement_logistics-->
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="ent_id" jdbcType="BIGINT" property="entId"/>
+        <result column="l_ledger_id" jdbcType="BIGINT" property="lLedgerId"/>
+        <result column="sl_order_no" jdbcType="VARCHAR" property="slOrderNo"/>
+        <result column="name" jdbcType="VARCHAR" property="name"/>
+        <result column="total_price" jdbcType="DECIMAL" property="totalPrice"/>
+        <result column="actual_price" jdbcType="DECIMAL" property="actualPrice"/>
+        <result column="receipt_time" jdbcType="TIMESTAMP" property="receiptTime"/>
+        <result column="remark" jdbcType="VARCHAR" property="remark"/>
+        <result column="audit_user" jdbcType="VARCHAR" property="auditUser"/>
+        <result column="audit_phone" jdbcType="VARCHAR" property="auditPhone"/>
+        <result column="success_user" jdbcType="VARCHAR" property="successUser"/>
+        <result column="success_phone" jdbcType="VARCHAR" property="successPhone"/>
+        <result column="status" jdbcType="INTEGER" property="status"/>
+        <result column="create_by" jdbcType="BIGINT" property="createBy"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_by" jdbcType="BIGINT" property="updateBy"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="del_flag" jdbcType="INTEGER" property="delFlag"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,
+        ent_id,
+        l_ledger_id,
+        sl_order_no,
+        name,
+        total_price,
+        actual_price,
+        receipt_time,
+        remark,
+        audit_user,
+        audit_phone,
+        success_user,
+        success_phone,
+        status,
+        create_by,
+        create_time,
+        update_by,
+        update_time,
+        del_flag
+    </sql>
+
+    <sql id="Join_Column_List">
+        s.id,
+        s.ent_id        as entId,
+        s.l_ledger_id   as lLedgerId,
+        s.sl_order_no   as slOrderNo,
+        s.name,
+        s.total_price   as totalPrice,
+        s.actual_price  as actualPrice,
+        s.receipt_time  as receiptTime,
+        s.remark,
+        s.audit_user    as auditUser,
+        s.audit_phone   as auditPhone,
+        s.success_user  as successUser,
+        s.success_phone as successPhone,
+        s.status,
+        s.create_by     as createBy,
+        s.create_time   as createTime,
+        s.update_by     as updateBy,
+        s.update_time   as updateTime,
+        s.del_flag      as delFlag
+    </sql>
+
+
+    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+        <!--@mbg.generated-->
+        select
+        <include refid="Base_Column_List"/>
+        from kwp_settlement_logistics
+        where id = #{id,jdbcType=BIGINT}
+    </select>
+
+    <!--  连表筛选准备  -->
+    <sql id="settlementLogisticsSelect">
+        select l.name       as ledgerName,
+               l.l_ledger_no  as lLedgerNo,
+               l.trading      as ledgerTrading,
+               l.settle_price as ledgerSettlePrice,
+                l.url          as attachmentUrl,
+
+               lu.unit_type   as unitType,
+               lu.firm_name   as CustomerName,
+
+        <include refid="Join_Column_List"/>
+        from kwp_settlement_logistics s
+                 left join kwp_ledger_logistics l on s.l_ledger_id = l.id
+                 left join kwp_ledger_logistics_unit lu on s.l_ledger_id = lu.l_ledger_id
+    </sql>
+    <!--  连表筛选准备  -->
+    <sql id="settlementLogisticsSelectSum">
+        select count(l.id)                                    total,
+               sum(l.settle_price)                         as actualReceivable,
+               sum(s.actual_price)                         as currentReceipt
+        from kwp_settlement_logistics s
+                 left join kwp_ledger_logistics l on s.l_ledger_id = l.id
+                 left join kwp_ledger_logistics_unit lu on s.l_ledger_id = lu.l_ledger_id
+    </sql>
+
+    <!--  根据连表，查询条件准备  -->
+    <sql id="settlementLogisticsSelectWhere">
+        <if test="settlementReq.status != null">
+            and s.status = #{settlementReq.status}
+        </if>
+
+        <if test="settlementReq.startCreateTime != null and settlementReq.endCreateTime != null">
+            and s.create_time between #{settlementReq.startCreateTime,jdbcType=TIMESTAMP} and #{settlementReq.endCreateTime,jdbcType=TIMESTAMP}
+        </if>
+        <if test="settlementReq.startReceiptTime != null and settlementReq.endReceiptTime != null">
+            and s.receipt_time between #{settlementReq.startReceiptTime,jdbcType=TIMESTAMP} and #{settlementReq.endReceiptTime,jdbcType=TIMESTAMP}
+        </if>
+
+        <if test="settlementReq.keywords != null and settlementReq.keywords != ''">
+            and ( l.l_ledger_no like concat('%'
+                 , #{settlementReq.keywords}
+                 , '%')
+                )
+        </if>
+    </sql>
+
+
+    <!-- 结算运费收款(承运方)-物流订单列表  -->
+    <select id="pageSelectCollection" resultType="com.sckw.payment.model.dto.SettlementLogisticsDto">
+        <include refid="settlementLogisticsSelect"/>
+        <where>
+            lu.unit_type = 1
+              and l.del_flag = 0
+              and s.del_flag = 0
+              and lu.del_flag = 0
+            <include refid="settlementLogisticsSelectWhere"/>
+        </where>
+        order by s.update_time desc
+    </select>
+
+    <!--  结算运费收款(承运方)-物流订单列表合计  -->
+    <select id="selectCollectionSum" resultType="com.sckw.payment.model.vo.res.SettlementLogisticsSumVo">
+        select a.*, (a.actualReceivable - a.currentReceipt) AS remainingReceivables From (
+        <include refid="settlementLogisticsSelectSum"/>
+        <where>
+            lu.unit_type = 1
+              and l.del_flag = 0
+              and s.del_flag = 0
+              and lu.del_flag = 0
+            <include refid="settlementLogisticsSelectWhere"/>
+        </where>
+        ) a
+    </select>
+
+    <!-- 结算运费收款(承运方)-物流订单列表头部汇总数  -->
+    <select id="getCountListCollection" resultType="java.lang.Long">
+        select count(s.id) as num
+        from kwp_settlement_logistics s
+                 left join kwp_ledger_logistics l on s.l_ledger_id = l.id
+                 left join kwp_ledger_logistics_unit lu on s.l_ledger_id = lu.l_ledger_id
+        <where>
+            lu.unit_type = 1
+              and l.del_flag = 0
+              and s.del_flag = 0
+              and lu.del_flag = 0
+            <include refid="settlementLogisticsSelectWhere"/>
+        </where>
+    </select>
+
+    <!--  根据结算(承运方)物流订单id查详情   -->
+    <select id="detailCollection" parameterType="java.lang.Long" resultType="com.sckw.payment.model.dto.SettlementLogisticsDto">
+        select l.name         as ledgerName,
+               l.l_ledger_no  as lLedgerNo,
+               l.trading      as ledgerTrading,
+               l.settle_price as ledgerSettlePrice,
+        l.url          as attachmentUrl,
+
+               lu.unit_type   as unitType,
+               lu.firm_name   as CustomerName,
+        <include refid="Join_Column_List"/>
+        from kwp_settlement_logistics s
+                 left join kwp_ledger_logistics l on s.l_ledger_id = l.id
+                 left join kwp_ledger_logistics_unit lu on s.l_ledger_id = lu.l_ledger_id
+        where s.id = #{id,jdbcType=BIGINT}
+          and lu.unit_type = 1
+    </select>
+
+
+
+    <!-- 结算运费付款(托运方)-物流订单列表  -->
+    <select id="pageSelectPayment" resultType="com.sckw.payment.model.dto.SettlementLogisticsDto">
+        <include refid="settlementLogisticsSelect"/>
+        <where>
+            lu.unit_type = 2
+              and l.del_flag = 0
+              and s.del_flag = 0
+              and lu.del_flag = 0
+            <include refid="settlementLogisticsSelectWhere"/>
+        </where>
+        order by s.update_time desc
+    </select>
+
+    <!-- 结算运费付款(托运方)-物流订单列表头部汇总数  -->
+    <select id="getCountListPayment" resultType="java.lang.Long">
+        select count(s.id) as num
+        from kwp_settlement_logistics s
+                 left join kwp_ledger_logistics l on s.l_ledger_id = l.id
+                 left join kwp_ledger_logistics_unit lu on s.l_ledger_id = lu.l_ledger_id
+        <where>
+            lu.unit_type = 2
+              and l.del_flag = 0
+              and s.del_flag = 0
+              and lu.del_flag = 0
+            <include refid="settlementLogisticsSelectWhere"/>
+        </where>
+    </select>
+
+    <!-- 根据结算(托运方)物流订单id查详情   -->
+    <select id="detailPayment" parameterType="java.lang.Long" resultType="com.sckw.payment.model.dto.SettlementLogisticsDto">
+        select l.name         as ledgerName,
+               l.l_ledger_no  as lLedgerNo,
+               l.trading      as ledgerTrading,
+               l.settle_price as ledgerSettlePrice,
+               l.url          as attachmentUrl,
+
+               lu.unit_type   as unitType,
+               lu.firm_name   as CustomerName,
+        <include refid="Join_Column_List"/>
+        from kwp_settlement_logistics s
+                 left join kwp_ledger_logistics l on s.l_ledger_id = l.id
+                 left join kwp_ledger_logistics_unit lu on s.l_ledger_id = lu.l_ledger_id
+        where s.id = #{id,jdbcType=BIGINT}
+          and lu.unit_type = 2
+    </select>
+
+
+    <!--  根据多个结算运费收款(线下收款)物流订单id查订单，用于导出   -->
+    <select id="selectIds" resultType="com.sckw.payment.model.dto.SettlementLogisticsDto">
+        <include refid="settlementLogisticsSelect"/>
+        <where>
+            lu.unit_type = 2
+            and l.del_flag = 0
+            and s.del_flag = 0
+            and lu.del_flag = 0
+              and s.id in
+            <foreach collection="ids" item="id" close=")" open="(" separator=",">
+                #{id,jdbcType=BIGINT}
+            </foreach>
+        </where>
+        order by s.update_time desc
+    </select>
+
+    <select id="selectList" resultType="com.sckw.payment.model.dto.SettlementLogisticsDto">
+        <include refid="settlementLogisticsSelect"/>
+        <where>
+            lu.unit_type = #{unitType,jdbcType=INTEGER}
+              and l.del_flag = 0
+              and s.del_flag = 0
+              and lu.del_flag = 0
+        </where>
+        order by s.update_time desc
+    </select>
 </mapper>

sckw-modules/sckw-payment/src/main/resources/mapper/KwpSettlementOfflineMapper.xml

@@ -1,36 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sckw.payment.dao.KwpSettlementOfflineMapper">
-  <resultMap id="BaseResultMap" type="com.sckw.payment.model.KwpSettlementOffline">
-    <!--@mbg.generated-->
-    <!--@Table kwp_settlement_offline-->
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="ent_id" jdbcType="BIGINT" property="entId" />
-    <result column="settlement_id" jdbcType="BIGINT" property="settlementId" />
-    <result column="coll_ent_id" jdbcType="BIGINT" property="collEntId" />
-    <result column="coll_firm_name" jdbcType="VARCHAR" property="collFirmName" />
-    <result column="coll_price" jdbcType="DECIMAL" property="collPrice" />
-    <result column="coll_time" jdbcType="TIMESTAMP" property="collTime" />
-    <result column="coll_user_id" jdbcType="BIGINT" property="collUserId" />
-    <result column="coll_urls" jdbcType="VARCHAR" property="collUrls" />
-    <result column="pay_ent_id" jdbcType="BIGINT" property="payEntId" />
-    <result column="pay_firm_name" jdbcType="VARCHAR" property="payFirmName" />
-    <result column="pay_price" jdbcType="DECIMAL" property="payPrice" />
-    <result column="pay_time" jdbcType="TIMESTAMP" property="payTime" />
-    <result column="pay_user_id" jdbcType="BIGINT" property="payUserId" />
-    <result column="pay_urls" jdbcType="VARCHAR" property="payUrls" />
-    <result column="remark" jdbcType="VARCHAR" property="remark" />
-    <result column="status" jdbcType="INTEGER" property="status" />
-    <result column="create_by" jdbcType="BIGINT" property="createBy" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_by" jdbcType="BIGINT" property="updateBy" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, ent_id, settlement_id, coll_ent_id, coll_firm_name, coll_price, coll_time, coll_user_id, 
-    coll_urls, pay_ent_id, pay_firm_name, pay_price, pay_time, pay_user_id, pay_urls, 
-    remark, `status`, create_by, create_time, update_by, update_time, del_flag
-  </sql>
+    <resultMap id="BaseResultMap" type="com.sckw.payment.model.KwpSettlementOffline">
+        <!--@mbg.generated-->
+        <!--@Table kwp_settlement_offline-->
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="ent_id" jdbcType="BIGINT" property="entId"/>
+        <result column="settlement_id" jdbcType="BIGINT" property="settlementId"/>
+        <result column="order_type" jdbcType="TINYINT" property="orderType"/>
+        <result column="pay_time" jdbcType="TIMESTAMP" property="payTime"/>
+        <result column="pay_price" jdbcType="DECIMAL" property="payPrice"/>
+        <result column="topay_price" jdbcType="DECIMAL" property="topayPrice"/>
+        <result column="url" jdbcType="VARCHAR" property="url"/>
+        <result column="remark" jdbcType="VARCHAR" property="remark"/>
+        <result column="status" jdbcType="INTEGER" property="status"/>
+        <result column="create_by" jdbcType="BIGINT" property="createBy"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_by" jdbcType="BIGINT" property="updateBy"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="del_flag" jdbcType="INTEGER" property="delFlag"/>
+    </resultMap>
+
+
+    <sql id="Base_Column_List">
+        <!--@mbg.generated-->
+        id,
+        ent_id,
+        settlement_id,
+        order_type,
+        pay_time,
+        pay_price,
+        topay_price,
+        url,
+        remark,
+        `status`,
+        create_by,
+        create_time,
+        update_by,
+        update_time,
+        del_flag
+    </sql>
+
+    <!-- 物流-线下付款(运费收款)记录-列表 -->
+    <select id="pageListLogisticsCollection" resultType="com.sckw.payment.model.dto.SettlementOfflineDto">
+        select
+        <include refid="Base_Column_List"/>
+        FROM kwp_settlement_offline
+        <where>
+            order_type = 1
+        </where>
+    </select>
+
+    <select id="detailLogisticsCollection" resultType="com.sckw.payment.model.dto.SettlementOfflineDto">
+        select
+        <include refid="Base_Column_List"/>
+        FROM kwp_settlement_offline
+        <where>
+            order_type = 1
+        </where>
+    </select>
+
+    <select id="confirmLogisticsCollection" resultType="java.lang.Integer">
+    </select>
 </mapper>

sckw-modules/sckw-payment/src/main/resources/mapper/KwpSettlementWalletMapper.xml

@@ -1,26 +1,84 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sckw.payment.dao.KwpSettlementWalletMapper">
-  <resultMap id="BaseResultMap" type="com.sckw.payment.model.KwpSettlementWallet">
-    <!--@mbg.generated-->
-    <!--@Table kwp_settlement_wallet-->
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="ent_id" jdbcType="BIGINT" property="entId" />
-    <result column="order_id" jdbcType="BIGINT" property="orderId" />
-    <result column="wallet_id" jdbcType="BIGINT" property="walletId" />
-    <result column="price" jdbcType="DECIMAL" property="price" />
-    <result column="type" jdbcType="INTEGER" property="type" />
-    <result column="remark" jdbcType="VARCHAR" property="remark" />
-    <result column="status" jdbcType="INTEGER" property="status" />
-    <result column="create_by" jdbcType="BIGINT" property="createBy" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_by" jdbcType="BIGINT" property="updateBy" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, ent_id, order_id, wallet_id, price, `type`, remark, `status`, create_by, create_time, 
-    update_by, update_time, del_flag
-  </sql>
+    <resultMap id="BaseResultMap" type="com.sckw.payment.model.KwpSettlementWallet">
+        <!--@mbg.generated-->
+        <!--@Table kwp_settlement_wallet-->
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="ent_id" jdbcType="BIGINT" property="entId"/>
+        <result column="settlement_id" jdbcType="BIGINT" property="settlementId"/>
+        <result column="order_type" jdbcType="INTEGER" property="orderType"/>
+        <result column="channel" jdbcType="BOOLEAN" property="channel"/>
+        <result column="pay_time" jdbcType="TIMESTAMP" property="payTime"/>
+        <result column="pay_price" jdbcType="DECIMAL" property="payPrice"/>
+        <result column="topay_price" jdbcType="DECIMAL" property="topayPrice"/>
+        <result column="type" jdbcType="INTEGER" property="type"/>
+        <result column="remark" jdbcType="VARCHAR" property="remark"/>
+        <result column="status" jdbcType="INTEGER" property="status"/>
+        <result column="create_by" jdbcType="BIGINT" property="createBy"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_by" jdbcType="BIGINT" property="updateBy"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="del_flag" jdbcType="INTEGER" property="delFlag"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,
+        ent_id,
+        settlement_id,
+        order_type,
+        channel,
+        pay_time,
+        pay_price,
+        topay_price,
+        `type`,
+        remark,
+        `status`,
+        create_by,
+        create_time,
+        update_by,
+        update_time,
+        del_flag
+    </sql>
+
+
+    <sql id="Join_Column_List">
+        w.id,
+        w.ent_id,
+        w.settlement_id,
+        w.order_type,
+        w.channel,
+        w.pay_time,
+        w.pay_price,
+        w.topay_price,
+        w.`type`,
+        w.remark,
+        w.`status`,
+        w.create_by,
+        w.create_time,
+        w.update_by,
+        w.update_time,
+        w.del_flag
+    </sql>
+
+    <select id="pageListLogisticsPayment" resultType="com.sckw.payment.model.dto.SettlementWalletDto">
+        select
+        <include refid="Join_Column_List"/>
+        from kwp_settlement_wallet w
+        <where>
+            w.type = #{settlementWalletReq.payType}
+        </where>
+        order by w.update_time desc
+    </select>
+
+    <select id="detailLogisticsPayment" resultType="com.sckw.payment.model.dto.SettlementWalletDto">
+        select
+        <include refid="Base_Column_List"/>
+        from kwp_settlement_wallet
+        where id = #{id,jdbcType=BIGINT}
+    </select>
+
+    <select id="confirmLogisticsPayment" resultType="java.lang.Integer">
+        insert into kwp_settlement_wallet ( <include refid="Base_Column_List"/>) value ();
+    </select>
 </mapper>

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/BuildingMaterialsMarketListParam.java

@@ -23,9 +23,14 @@ public class BuildingMaterialsMarketListParam extends PageRequest {
     private String keywords;
 
     /**
-     * 商品类型集合（不限为空）
+     * 商品类型type
      */
-    private List<String> goodsTypes;
+    private String goodsType;
+
+    /**
+     * 商品类型type值
+     */
+    private String goodsTypeValue;
 
     /**
      * 区域code