优化缴费周期超过 费用结束时间问题

java110

2020-07-03 b812de6dc95d60f1703761a318d0c6ede5d41135

 pom.xml

@@ -11,29 +11,26 @@
    <modules>
        <module>java110-bean</module>
        <module>java110-config</module>
        <module>java110-common</module>
        <module>UserService</module>
        <module>LogService</module>
        <module>FeeService</module>
        <module>eureka</module>
        <module>java110-utils</module>
        <module>java110-core</module>
        <module>java110-service</module>
        <module>CodeService</module>
        <module>StoreService</module>
        <module>RuleService</module>
        <module>java110-event</module>
        <module>OrderService</module>
        <module>java110-cacheAgent</module>
        <module>WebService</module>
        <module>java110-logAgent</module>
        <module>zipkin</module>
        <module>ShopService</module>
        <module>CommentService</module>
        <module>Api</module>
        <module>CommunityService</module>
        <module>java110-code-generator</module>
        <module>java110-db</module>
        <module>JobService</module>
        <module>service-user</module>
        <module>service-log</module>
        <module>service-fee</module>
        <module>service-eureka</module>
        <module>service-sequence</module>
        <module>service-store</module>
        <module>service-rule</module>
        <module>service-order</module>
        <module>service-comment</module>
        <module>service-api</module>
        <module>service-community</module>
        <module>service-job</module>
        <module>service-common</module>
        <module>service-report</module>
        <module>service-front</module>
        <module>java110-generator</module>
    </modules>

    <parent>
@@ -55,7 +52,7 @@

        <apache.common.lang3.version>3.4</apache.common.lang3.version>
        <mybatis.version>3.4.1</mybatis.version>
        <log4j.version>1.2.17</log4j.version>
        <log4j.version>2.11.0</log4j.version>
        <tomcat.servlet.version>6.0.37</tomcat.servlet.version>
        <druid.version>1.1.10</druid.version>
        <mybatis-spring.version>1.3.1</mybatis-spring.version>
@@ -76,6 +73,7 @@
        <spring.version>5.0.8.RELEASE</spring.version>
        <zookeeper.version>3.4.14</zookeeper.version>
        <swagger.version>2.5.0</swagger.version>
        <pinyin4j.version>2.5.0</pinyin4j.version>
    </properties>

    <dependencyManagement>
@@ -95,8 +93,11 @@
                <version>${spring.version}</version>
            </dependency>



            <dependency>
                <groupId>com.belerweb</groupId>
                <artifactId>pinyin4j</artifactId>
                <version>${pinyin4j.version}</version>
            </dependency>
            <dependency>
                <groupId>com.alibaba</groupId>
                <artifactId>fastjson</artifactId>
@@ -129,7 +130,7 @@

            <dependency>
                <groupId>com.java110</groupId>
                <artifactId>java110-common</artifactId>
                <artifactId>java110-utils</artifactId>
                <version>${microcommunity.version}</version>
            </dependency>
            <dependency>
@@ -138,11 +139,6 @@
                <version>${microcommunity.version}</version>
            </dependency>

            <dependency>
                <groupId>com.java110</groupId>
                <artifactId>java110-event</artifactId>
                <version>${microcommunity.version}</version>
            </dependency>

            <dependency>
                <groupId>com.java110</groupId>
@@ -161,16 +157,7 @@
                <version>${microcommunity.version}</version>
            </dependency>

            <dependency>
                <groupId>com.java110</groupId>
                <artifactId>java110-cacheAgent</artifactId>
                <version>${microcommunity.version}</version>
            </dependency>
            <dependency>
                <groupId>com.java110</groupId>
                <artifactId>java110-logAgent</artifactId>
                <version>${microcommunity.version}</version>
            </dependency>

            <dependency>
                <groupId>com.java110</groupId>
                <artifactId>java110-db</artifactId>
@@ -200,9 +187,37 @@
            </dependency>

            <dependency>
                <groupId>log4j</groupId>
                <artifactId>log4j</artifactId>
                <version>1.2.17</version>
                <groupId>org.apache.logging.log4j</groupId>
                <artifactId>log4j-core</artifactId>
                <version>${log4j.version}</version>
            </dependency>
            <dependency>
                <groupId>org.apache.logging.log4j</groupId>
                <artifactId>log4j-api</artifactId>
                <version>${log4j.version}</version>
            </dependency>
            <dependency>
                <groupId>org.apache.logging.log4j</groupId>
                <artifactId>log4j-web</artifactId>
                <version>${log4j.version}</version>
            </dependency>
            <!-- 桥接：告诉Slf4j使用Log4j2 -->
            <dependency>
                <groupId>org.apache.logging.log4j</groupId>
                <artifactId>log4j-slf4j-impl</artifactId>
                <version>${log4j.version}</version>
            </dependency>
            <!-- 桥接：告诉commons logging使用Log4j2 -->
            <dependency>
                <groupId>org.apache.logging.log4j</groupId>
                <artifactId>log4j-jcl</artifactId>
                <version>${log4j.version}</version>
            </dependency>
            <!-- https://mvnrepository.com/artifact/org.slf4j/log4j-over-slf4j -->
            <dependency>
                <groupId>org.slf4j</groupId>
                <artifactId>log4j-over-slf4j</artifactId>
                <version>1.7.30</version>
            </dependency>

            <!-- https://mvnrepository.com/artifact/com.mchange/c3p0 -->
@@ -218,6 +233,11 @@
                <version>3.0.9.RELEASE</version>
            </dependency>

            <dependency>
                <groupId>com.jcraft</groupId>
                <artifactId>jsch</artifactId>
                <version>0.1.49</version>
            </dependency>

            <dependency>
                <groupId>org.apache.activemq</groupId>
@@ -285,7 +305,7 @@
            <dependency>
                <groupId>commons-beanutils</groupId>
                <artifactId>commons-beanutils</artifactId>
                <version>1.9.3</version>
                <version>1.9.4</version>
            </dependency>


@@ -374,11 +394,11 @@
            </dependency>


           <!-- <dependency>
                <groupId>org.quartz-scheduler</groupId>
                <artifactId>quartz</artifactId>
                <version>2.3.0</version>
            </dependency>-->
            <!-- <dependency>
                 <groupId>org.quartz-scheduler</groupId>
                 <artifactId>quartz</artifactId>
                 <version>2.3.0</version>
             </dependency>-->
            <dependency>
                <groupId>org.quartz-scheduler</groupId>
                <artifactId>quartz</artifactId>
@@ -433,22 +453,96 @@
            <dependency>
                <groupId>com.aliyun</groupId>
                <artifactId>aliyun-java-sdk-core</artifactId>
                <version>4.0.3</version>
                <version>4.4.6</version>
            </dependency>

            <!--flowable工作流依赖-->
            <dependency>
                <groupId>com.aliyun</groupId>
                <artifactId>aliyun-java-sdk-ecs</artifactId>
                <version>4.17.6</version>
            </dependency>

            <!--flowable工作流依赖
            <dependency>
                <groupId>org.flowable</groupId>
                <artifactId>flowable-spring-boot-starter</artifactId>
                <version>6.4.1</version>
            </dependency>

            -->
            <!-- https://mvnrepository.com/artifact/org.jsoup/jsoup -->
            <dependency>
                <groupId>org.jsoup</groupId>
                <artifactId>jsoup</artifactId>
                <version>1.11.3</version>
            </dependency>

            <!-- 引入poi，解析workbook视图 -->
            <dependency>
                <groupId>org.apache.poi</groupId>
                <artifactId>poi-ooxml</artifactId>
                <version>3.17</version>
            </dependency>

            <dependency>
                <groupId>org.apache.poi</groupId>
                <artifactId>poi-ooxml-schemas</artifactId>
                <version>3.17</version>
            </dependency>

            <dependency>
                <groupId>org.apache.poi</groupId>
                <artifactId>poi</artifactId>
                <version>3.17</version>
            </dependency>

            <dependency>
                <groupId>org.activiti</groupId>
                <artifactId>activiti-spring</artifactId>
                <version>6.0.0</version>
            </dependency>
            <dependency>
                <groupId>org.activiti</groupId>
                <artifactId>activiti-bpmn-layout</artifactId>
                <version>6.0.0.RC1</version>
            </dependency>

            <!--<dependency>
                <groupId>org.activiti</groupId>
                <artifactId>activiti-modeler</artifactId>
                <version>6.0.0</version>
            </dependency>-->

            <dependency>
                <groupId>org.activiti</groupId>
                <artifactId>activiti-spring-boot-starter-basic</artifactId>
                <version>6.0.0</version>
                <exclusions>
                    <exclusion>
                        <groupId>org.mybatis</groupId>
                        <artifactId>mybatis</artifactId>
                    </exclusion>
                </exclusions>
            </dependency>

            <dependency>
                <groupId>com.tencentcloudapi</groupId>
                <artifactId>tencentcloud-sdk-java</artifactId>
                <!-- go to https://search.maven.org/search?q=tencentcloud-sdk-java and get the latest version. -->
                <!-- 请到https://search.maven.org/search?q=tencentcloud-sdk-java查询最新版本 -->
                <version>3.0.112</version>
            </dependency>

            <!--<dependency>
                <groupId>org.activiti</groupId>
                <artifactId>activiti-modeler</artifactId>
                <version>5.22.0</version>
                <exclusions>
                    <exclusion>
                        <groupId>org.activiti</groupId>
                        <artifactId>activiti-bpmn-model</artifactId>
                    </exclusion>
                </exclusions>
            </dependency>-->

        </dependencies>

@@ -487,9 +581,9 @@
    <build>
        <plugins>
            <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-javadoc-plugin</artifactId>
                    <version>2.10.4</version>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-javadoc-plugin</artifactId>
                <version>2.10.4</version>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>