针对退款时将所有的订单信息进行退款2021-10-15

.idea/artifacts/SAAS_AFTEREND2_jar.xml

@@ -0,0 +1,136 @@
+<component name="ArtifactManager">
+  <artifact type="jar" build-on-make="true" name="SAAS-AFTEREND2:jar">
+    <output-path>$PROJECT_DIR$/out/artifacts/SAAS_AFTEREND2_jar</output-path>
+    <root id="archive" name="SAAS-AFTEREND2.jar">
+      <element id="module-output" name="yijia-admin" />
+      <element id="module-output" name="yijia-framework" />
+      <element id="module-output" name="yijia-system" />
+      <element id="module-output" name="yijia-quartz" />
+      <element id="module-output" name="yijia-common" />
+      <element id="module-output" name="yijia-generator" />
+      <element id="module-output" name="yijia-station" />
+      <element id="module-output" name="yijia-customer" />
+      <element id="module-output" name="yijia-market" />
+      <element id="module-output" name="yijia-integral" />
+      <element id="module-output" name="yijia-coupon" />
+      <element id="module-output" name="yijia-label" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.1.17.RELEASE/spring-boot-starter-web-2.1.17.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/io/netty/netty-codec/4.1.52.Final/netty-codec-4.1.52.Final.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.5/mybatis-spring-2.0.5.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.10/jackson-datatype-jsr310-2.9.10.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.21/mysql-connector-java-8.0.21.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/net/java/dev/jna/jna/5.5.0/jna-5.5.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/io/projectreactor/reactor-core/3.2.20.RELEASE/reactor-core-3.2.20.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/io/netty/netty-resolver/4.1.52.Final/netty-resolver-4.1.52.Final.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/spring-context/5.1.18.RELEASE/spring-context-5.1.18.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/io/lettuce/lettuce-core/5.1.8.RELEASE/lettuce-core-5.1.8.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.11.2/log4j-to-slf4j-2.11.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.38/tomcat-embed-websocket-9.0.38.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/io/netty/netty-transport/4.1.52.Final/netty-transport-4.1.52.Final.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-ui/2.9.2/springfox-swagger-ui-2.9.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/google/guava/guava/20.0/guava-20.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/security/spring-security-core/5.1.12.RELEASE/spring-security-core-5.1.12.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/io/springfox/springfox-spi/2.9.2/springfox-spi-2.9.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/net/java/dev/jna/jna-platform/5.5.0/jna-platform-5.5.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/2.9.2/springfox-swagger2-2.9.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/data/spring-data-redis/2.1.20.RELEASE/spring-data-redis-2.1.20.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/io/swagger/swagger-models/1.5.21/swagger-models-1.5.21.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml/3.17/poi-ooxml-3.17.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.18.RELEASE/spring-web-5.1.18.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.23/snakeyaml-1.23.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-devtools/2.1.17.RELEASE/spring-boot-devtools-2.1.17.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/github/penggle/kaptcha/2.3.2/kaptcha-2.3.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/4.0.1/javax.servlet-api-4.0.1.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-starter/1.3.0/pagehelper-spring-boot-starter-1.3.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.1.18.RELEASE/spring-beans-5.1.18.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.10.6/jackson-databind-2.9.10.6.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/2.1.3/mybatis-spring-boot-starter-2.1.3.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/security/spring-security-config/5.1.12.RELEASE/spring-security-config-5.1.12.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-security/2.1.17.RELEASE/spring-boot-starter-security-2.1.17.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.6/httpcore-4.4.6.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/data/spring-data-keyvalue/2.1.20.RELEASE/spring-data-keyvalue-2.1.20.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.1.18.RELEASE/spring-jdbc-5.1.18.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.1.17.RELEASE/spring-boot-autoconfigure-2.1.17.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.20.Final/hibernate-validator-6.0.20.Final.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-common/2.9.2/springfox-swagger-common-2.9.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.10/jackson-datatype-jdk8-2.9.10.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/stax/stax-api/1.0.1/stax-api-1.0.1.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.1.20.RELEASE/spring-data-commons-2.1.20.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/io/netty/netty-buffer/4.1.52.Final/netty-buffer-4.1.52.Final.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.1.17.RELEASE/spring-boot-starter-jdbc-2.1.17.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.5/httpclient-4.5.5.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.1.18.RELEASE/spring-expression-5.1.18.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.1.18.RELEASE/spring-webmvc-5.1.18.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.9.6/aspectjweaver-1.9.6.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.1.18.RELEASE/spring-aop-5.1.18.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.11.2/log4j-api-2.11.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.11/commons-codec-1.11.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/2.6.0/xmlbeans-2.6.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/spring-oxm/5.1.18.RELEASE/spring-oxm-5.1.18.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.38/tomcat-embed-core-9.0.38.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/io/springfox/springfox-schema/2.9.2/springfox-schema-2.9.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.1.17.RELEASE/spring-boot-starter-json-2.1.17.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.2.0/pagehelper-5.2.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/eu/bitwalker/UserAgentUtils/1.19/UserAgentUtils-1.19.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.10/jackson-module-parameter-names-2.9.10.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/2.1.17.RELEASE/spring-boot-starter-aop-2.1.17.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/security/spring-security-web/5.1.12.RELEASE/spring-security-web-5.1.12.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.9.10/jackson-annotations-2.9.10.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/jhlabs/filters/2.0.235-1/filters-2.0.235-1.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.5/mybatis-3.5.5.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.1.17.RELEASE/spring-boot-2.1.17.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-redis/2.1.17.RELEASE/spring-boot-starter-data-redis-2.1.17.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/spring-core/5.1.18.RELEASE/spring-core-5.1.18.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/alibaba/druid-spring-boot-starter/1.2.1/druid-spring-boot-starter-1.2.1.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/alibaba/druid/1.2.1/druid-1.2.1.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/commons-io/commons-io/2.5/commons-io-2.5.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.38/tomcat-embed-el-9.0.38.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt/0.9.1/jjwt-0.9.1.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.10/jackson-core-2.9.10.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/quartz-scheduler/quartz/2.3.2/quartz-2.3.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml-schemas/3.17/poi-ooxml-schemas-3.17.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.4.0/classmate-1.4.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/poi/poi/3.17/poi-3.17.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/io/springfox/springfox-core/2.9.2/springfox-core-2.9.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.1.17.RELEASE/spring-boot-starter-logging-2.1.17.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.1.17.RELEASE/spring-boot-starter-tomcat-2.1.17.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/github/oshi/oshi-core/5.2.5/oshi-core-5.2.5.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/commons/commons-pool2/2.6.2/commons-pool2-2.6.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.2.0.Final/mapstruct-1.2.0.Final.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.3.0/pagehelper-spring-boot-autoconfigure-1.3.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$USER_HOME$/Desktop/document_JavaSDK/saobei-open-sdk-1.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.21/swagger-annotations-1.5.21.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.3.Final/jboss-logging-3.3.3.Final.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/3.2/jsqlparser-3.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/io/netty/netty-common/4.1.52.Final/netty-common-4.1.52.Final.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/io/netty/netty-handler/4.1.52.Final/netty-handler-4.1.52.Final.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/mchange/mchange-commons-java/0.2.15/mchange-commons-java-0.2.15.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/2.9.2/springfox-spring-web-2.9.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.1.18.RELEASE/spring-context-support-5.1.18.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.1.17.RELEASE/spring-boot-starter-2.1.17.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/github/virtuald/curvesapi/1.04/curvesapi-1.04.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.1.18.RELEASE/spring-tx-5.1.18.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.1.18.RELEASE/spring-jcl-5.1.18.RELEASE.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/2.1.3/mybatis-spring-boot-autoconfigure-2.1.3.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.9.16/byte-buddy-1.9.16.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.74/fastjson-1.2.74.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/velocity/velocity/1.7/velocity-1.7.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.11/commons-lang3-3.11.jar" path-in-jar="/" />
+    </root>
+  </artifact>
+</component>

.idea/libraries/Maven__org_saobei_saobeiopen_1_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.saobei:saobeiopen:1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/saobei/saobeiopen/1.0/saobeiopen-1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/saobei/saobeiopen/1.0/saobeiopen-1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/saobei/saobeiopen/1.0/saobeiopen-1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/yijia_station_1_0_1.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="yijia-station-1.0.1">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/yijia-station/target/yijia-station-1.0.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/workspace.xml

@@ -25,16 +25,13 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d95263d0-9dff-44b4-8deb-343711f78d5d" name="Default Changelist" comment="退款信息修改，班结统计的方式，退款审核2021-10-15">
-      <change afterPath="$PROJECT_DIR$/yijia-customer/src/main/java/com/yijia/customer/domain/CardListImport.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/SysAppUserInfoController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/domain/SysAppUserInfo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/mapper/SysAppUserInfoMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/ISysAppUserInfoService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/SysAppUserInfoImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/yijia-station/src/main/resources/mapper/station/SysAppUserInfoMapper.xml" afterDir="false" />
+    <list default="true" id="d95263d0-9dff-44b4-8deb-343711f78d5d" name="Default Changelist" comment="针对退款时将所有的订单信息进行退款2021-10-15">
+      <change afterPath="$PROJECT_DIR$/.idea/artifacts/SAAS_AFTEREND2_jar.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_saobei_saobeiopen_1_0.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/yijia_station_1_0_1.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-admin/src/main/resources/application-druid.yml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/src/main/resources/application-druid.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/src/main/resources/application.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-admin/src/main/resources/logback.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/src/main/resources/logback.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-admin/target/classes/application-druid.yml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/classes/application-druid.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-admin/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/classes/application.yml" afterDir="false" />
@@ -42,50 +39,31 @@
       <change beforePath="$PROJECT_DIR$/yijia-admin/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-admin/target/yijia-admin.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/yijia-admin.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-admin/target/yijia-admin.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/yijia-admin.jar.original" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-admin/yijia-admin.iml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/yijia-admin.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-common/src/main/java/com/yijia/common/core/domain/entity/SysDept.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/src/main/java/com/yijia/common/core/domain/entity/SysDept.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/core/domain/entity/SysDept.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/core/domain/entity/SysDept.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-common/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-common/target/yijia-common-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/target/yijia-common-1.0.1.jar" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-coupon/src/main/java/com/yijia/coupon/controller/CouponIssueController.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/src/main/java/com/yijia/coupon/controller/CouponIssueController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-coupon/src/main/java/com/yijia/coupon/controller/CouponUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/src/main/java/com/yijia/coupon/controller/CouponUserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-coupon/src/main/resources/mapper/coupon/CouponUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/src/main/resources/mapper/coupon/CouponUserMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-coupon/target/classes/com/yijia/coupon/controller/CouponIssueController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/target/classes/com/yijia/coupon/controller/CouponIssueController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-coupon/target/classes/com/yijia/coupon/controller/CouponUserController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/target/classes/com/yijia/coupon/controller/CouponUserController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-coupon/target/classes/mapper/coupon/CouponUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/target/classes/mapper/coupon/CouponUserMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-coupon/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-coupon/target/yijia-coupon-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/target/yijia-coupon-1.0.1.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-customer/src/main/java/com/yijia/customer/controller/CardExcelImportController.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/src/main/java/com/yijia/customer/controller/CardExcelImportController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-customer/src/main/java/com/yijia/customer/domain/CardExcelImport.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/src/main/java/com/yijia/customer/domain/CardExcelImport.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-customer/src/main/java/com/yijia/customer/mapper/CardExcelImportMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/src/main/java/com/yijia/customer/mapper/CardExcelImportMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-customer/src/main/java/com/yijia/customer/service/ICardExcelImportService.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/src/main/java/com/yijia/customer/service/ICardExcelImportService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-customer/src/main/java/com/yijia/customer/service/impl/CardExcelImportServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/src/main/java/com/yijia/customer/service/impl/CardExcelImportServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-customer/src/main/resources/mapper/customer/CardExcelImportMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/src/main/resources/mapper/customer/CardExcelImportMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-customer/src/main/resources/mapper/customer/CustomerManageMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/src/main/resources/mapper/customer/CustomerManageMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/controller/CardExcelImportController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/controller/CardExcelImportController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/domain/CardExcelImport.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/domain/CardExcelImport.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/mapper/CardExcelImportMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/mapper/CardExcelImportMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/service/ICardExcelImportService.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/service/ICardExcelImportService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/service/impl/CardExcelImportServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/service/impl/CardExcelImportServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/mapper/customer/CardExcelImportMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/mapper/customer/CardExcelImportMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/mapper/customer/CustomerManageMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/mapper/customer/CustomerManageMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-customer/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-customer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-customer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-customer/target/yijia-customer-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/yijia-customer-1.0.1.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-framework/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-framework/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-framework/target/yijia-framework-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-framework/target/yijia-framework-1.0.1.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-generator/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-generator/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-generator/target/yijia-generator-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-generator/target/yijia-generator-1.0.1.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-integral/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-integral/src/main/java/com/yijia/integral/domain/IntegralRuleDetail.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/src/main/java/com/yijia/integral/domain/IntegralRuleDetail.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-integral/src/main/java/com/yijia/integral/service/impl/IntegralRuleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/src/main/java/com/yijia/integral/service/impl/IntegralRuleServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-integral/src/main/resources/mapper/integral/CustomerPointsRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/src/main/resources/mapper/integral/CustomerPointsRecordMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-integral/target/classes/com/yijia/integral/domain/IntegralRuleDetail.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/target/classes/com/yijia/integral/domain/IntegralRuleDetail.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-integral/target/classes/com/yijia/integral/service/impl/IntegralRuleServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/target/classes/com/yijia/integral/service/impl/IntegralRuleServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-integral/target/classes/mapper/integral/CustomerPointsRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/target/classes/mapper/integral/CustomerPointsRecordMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-integral/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-integral/target/yijia-integral-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/target/yijia-integral-1.0.1.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-integral/yijia-integral.iml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/yijia-integral.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-label/src/main/resources/mapper/label/CustomerLabelDemoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-label/src/main/resources/mapper/label/CustomerLabelDemoMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-label/target/classes/mapper/label/CustomerLabelDemoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-label/target/classes/mapper/label/CustomerLabelDemoMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-label/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-label/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-label/target/yijia-label-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-label/target/yijia-label-1.0.1.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-market/src/main/java/com/yijia/markert/controller/MarkertPlanController.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-market/src/main/java/com/yijia/markert/controller/MarkertPlanController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-market/target/classes/com/yijia/markert/controller/MarkertPlanController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-market/target/classes/com/yijia/markert/controller/MarkertPlanController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-market/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-market/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-market/target/yijia-market-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-market/target/yijia-market-1.0.1.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-quartz/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-quartz/target/maven-archiver/pom.properties" afterDir="false" />
@@ -93,20 +71,34 @@
       <change beforePath="$PROJECT_DIR$/yijia-station/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/pom.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/PayOrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/PayOrderController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/SysAppUserInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/SysAppUserInfoController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/domain/PayOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/domain/PayOrder.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/domain/StationClassStructure.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/domain/StationClassStructure.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/domain/StationClassesSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/domain/StationClassesSummary.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/domain/SysAppUserInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/src/main/java/com/yijia/system/domain/SysAppUserInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/mapper/PayOrderMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/mapper/PayOrderMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/mapper/SysAppUserInfoMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/src/main/java/com/yijia/system/mapper/SysAppUserInfoMapper.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/IPayOrderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/IPayOrderService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/ISysAppUserInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/src/main/java/com/yijia/system/service/ISysAppUserInfoService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/SysAppUserInfoImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/src/main/java/com/yijia/system/service/impl/SysAppUserInfoImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/src/main/resources/mapper/station/PayOrderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/resources/mapper/station/PayOrderMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/resources/mapper/station/StationClassStructureMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/resources/mapper/station/StationClassStructureMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/resources/mapper/station/StationBalanceChangeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/resources/mapper/station/StationBalanceChangeMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/src/main/resources/mapper/station/StationClassesSummaryMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/src/main/resources/mapper/station/StationClassesSummaryMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/src/main/resources/mapper/station/SysAppUserInfoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/src/main/resources/mapper/system/SysAppUserInfoMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/PayOrderController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/PayOrderController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationClassStructureController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationClassStructureController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/SysAppUserInfoController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/SysAppUserInfoController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/PayOrder.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/PayOrder.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/SysAppUserInfo.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/mapper/PayOrderMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/mapper/PayOrderMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/mapper/SysAppUserInfoMapper.class" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/IPayOrderService.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/IPayOrderService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/ISysAppUserInfoService.class" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/impl/PayOrderServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/impl/PayOrderServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/impl/SysAppUserInfoImpl.class" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/PayOrderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/PayOrderMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/StationBalanceChangeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/StationBalanceChangeMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/StationClassesSummaryMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/StationClassesSummaryMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/SysAppUserInfoMapper.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
@@ -115,6 +107,8 @@
       <change beforePath="$PROJECT_DIR$/yijia-system/src/main/resources/mapper/system/SysDeptMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/src/main/resources/mapper/system/SysDeptMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-system/target/classes/mapper/system/SysDeptMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/classes/mapper/system/SysDeptMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-system/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/maven-archiver/pom.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-system/target/yijia-system-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/yijia-system-1.0.1.jar" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -125,20 +119,6 @@
   <component name="CodeInsightWorkspaceSettings">
     <option name="optimizeImportsOnTheFly" value="true" />
   </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
@@ -157,6 +137,18 @@
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="MavenImportPreferences">
+    <option name="generalSettings">
+      <MavenGeneralSettings>
+        <option name="mavenHome" value="已捆绑(Maven 3)" />
+      </MavenGeneralSettings>
+    </option>
+    <option name="importingSettings">
+      <MavenImportingSettings>
+        <option name="vmOptionsForImporter" value="-Xmx768m" />
+      </MavenImportingSettings>
+    </option>
+  </component>
   <component name="ProjectId" id="1rsUhoIAb4lHab0lIKX0r7632LF" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectViewState">
@@ -173,7 +165,7 @@
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/yijia-station/src/main/resources/mapper/station" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
@@ -185,15 +177,21 @@
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="restartRequiresConfirmation" value="false" />
-    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
+    <property name="settings.editor.selected.configurable" value="MavenSettings" />
   </component>
   <component name="ReactorSettings">
     <option name="notificationShown" value="true" />
   </component>
   <component name="RecentsManager">
-    <key name="CreateClassDialog.RecentsKey">
-      <recent name="com.yijia.station.service" />
-      <recent name="com.yijia.station.controller" />
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\resources\mapper\system" />
+    </key>
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\resources\mapper\station" />
+      <recent name="D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\resources\mapper\system" />
+      <recent name="D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller" />
+      <recent name="D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\resources\mapper\customer" />
+      <recent name="D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\mapper" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="com.yijia.station.service" />
@@ -202,17 +200,14 @@
       <recent name="com.yijia.station.domain" />
       <recent name="com.yijia.system.service.impl" />
     </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\resources\mapper\station" />
-      <recent name="D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\resources\mapper\system" />
-      <recent name="D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller" />
-      <recent name="D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\resources\mapper\customer" />
-      <recent name="D:\java项目\SAAS-AFTEREND2\yijia-customer\src\main\java\com\yijia\customer\mapper" />
+    <key name="CreateClassDialog.RecentsKey">
+      <recent name="com.yijia.station.service" />
+      <recent name="com.yijia.station.controller" />
     </key>
   </component>
   <component name="RunManager" selected="Spring Boot.YiJiaApplication">
-    <configuration name="test" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="com.yijia.web.test" />
+    <configuration name="YiJiaApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.yijia.YiJiaApplication" />
       <module name="yijia-admin" />
       <extension name="coverage">
         <pattern>
@@ -231,6 +226,15 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <list>
+      <item itemvalue="Spring Boot.YiJiaApplication" />
+      <item itemvalue="应用程序.YiJiaApplication" />
+    </list>
+    <recent_temporary>
+      <list>
+        <item itemvalue="应用程序.YiJiaApplication" />
+      </list>
+    </recent_temporary>
   </component>
   <component name="SpellCheckerSettings" BundledDictionaries="0" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" Dictionaries="0" CorrectionsLimit="5" DefaultDictionary="application-level" UseSingleDictionary="true" />
   <component name="SvnConfiguration">
@@ -322,7 +326,37 @@
       <workItem from="1632449990619" duration="12563000" />
       <workItem from="1632467786341" duration="9050000" />
       <workItem from="1632617410759" duration="112263000" />
-      <workItem from="1633653715898" duration="132193000" />
+      <workItem from="1633653715898" duration="204382000" />
+      <workItem from="1634887741113" duration="610000" />
+      <workItem from="1634957890077" duration="1558000" />
+      <workItem from="1635214739713" duration="28989000" />
+      <workItem from="1635330829285" duration="23036000" />
+      <workItem from="1635934334563" duration="934000" />
+      <workItem from="1636613372742" duration="757000" />
+      <workItem from="1636687145807" duration="2494000" />
+      <workItem from="1636784764665" duration="4895000" />
+      <workItem from="1637493391388" duration="1854000" />
+      <workItem from="1637545335811" duration="3726000" />
+      <workItem from="1637552220886" duration="601000" />
+      <workItem from="1637631116248" duration="2402000" />
+      <workItem from="1637634030563" duration="5597000" />
+      <workItem from="1637767575063" duration="4742000" />
+      <workItem from="1637891889003" duration="3314000" />
+      <workItem from="1638008815547" duration="5952000" />
+      <workItem from="1638871491503" duration="1247000" />
+      <workItem from="1638925809627" duration="133000" />
+      <workItem from="1638925957496" duration="3976000" />
+      <workItem from="1639616449394" duration="3631000" />
+      <workItem from="1640053899916" duration="2063000" />
+      <workItem from="1640144694760" duration="9802000" />
+      <workItem from="1640653152595" duration="3018000" />
+      <workItem from="1640745334578" duration="2453000" />
+      <workItem from="1641516522132" duration="1321000" />
+      <workItem from="1649311130858" duration="1149000" />
+      <workItem from="1653013556525" duration="2657000" />
+      <workItem from="1653290763696" duration="1589000" />
+      <workItem from="1655264893988" duration="2135000" />
+      <workItem from="1655801947868" duration="12904000" />
     </task>
     <task id="LOCAL-00001" summary="前端配置文件package-config.json删除">
       <created>1619772586309</created>
@@ -618,7 +652,35 @@
       <option name="project" value="LOCAL" />
       <updated>1632449036877</updated>
     </task>
-    <option name="localTasksCounter" value="43" />
+    <task id="LOCAL-00043" summary="退款信息修改，班结统计的方式，退款审核2021-10-15">
+      <created>1634291954126</created>
+      <option name="number" value="00043" />
+      <option name="presentableId" value="LOCAL-00043" />
+      <option name="project" value="LOCAL" />
+      <updated>1634291954126</updated>
+    </task>
+    <task id="LOCAL-00044" summary="退款信息修改，班结统计的方式，退款审核2021-10-15">
+      <created>1634292026919</created>
+      <option name="number" value="00044" />
+      <option name="presentableId" value="LOCAL-00044" />
+      <option name="project" value="LOCAL" />
+      <updated>1634292026919</updated>
+    </task>
+    <task id="LOCAL-00045" summary="退款信息修改，班结统计的方式，退款审核2021-10-15">
+      <created>1634292042252</created>
+      <option name="number" value="00045" />
+      <option name="presentableId" value="LOCAL-00045" />
+      <option name="project" value="LOCAL" />
+      <updated>1634292042252</updated>
+    </task>
+    <task id="LOCAL-00046" summary="针对退款时将所有的订单信息进行退款2021-10-15">
+      <created>1634292126022</created>
+      <option name="number" value="00046" />
+      <option name="presentableId" value="LOCAL-00046" />
+      <option name="project" value="LOCAL" />
+      <updated>1634292126022</updated>
+    </task>
+    <option name="localTasksCounter" value="47" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -659,7 +721,6 @@
     <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加标签管理" />
     <MESSAGE value="电子卡增加标签营销方案" />
     <MESSAGE value="增加营销管理字段" />
     <MESSAGE value="便签管理" />
@@ -684,293 +745,58 @@
     <MESSAGE value="增加加油员id" />
     <MESSAGE value="删除没有用的引入包" />
     <MESSAGE value="退款信息修改，班结统计的方式，退款审核2021-10-15" />
-    <option name="LAST_COMMIT_MESSAGE" value="退款信息修改，班结统计的方式，退款审核2021-10-15" />
+    <MESSAGE value="针对退款时将所有的订单信息进行退款2021-10-15" />
+    <option name="LAST_COMMIT_MESSAGE" value="针对退款时将所有的订单信息进行退款2021-10-15" />
   </component>
   <component name="WindowStateProjectService">
-    <state x="2511" y="202" key="#Project_Structure" timestamp="1626674692213">
-      <screen x="1998" y="0" width="1842" height="1080" />
-    </state>
-    <state x="2511" y="202" key="#Project_Structure/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1626674692213" />
-    <state x="691" y="335" key="#com.intellij.codeInsight.editorActions.RestoreReferencesDialog" timestamp="1632708843299">
-      <screen x="0" y="0" width="1920" height="1160" />
-    </state>
-    <state x="691" y="335" key="#com.intellij.codeInsight.editorActions.RestoreReferencesDialog/0.0.1920.1160/2880.0.1920.1040@0.0.1920.1160" timestamp="1632708843299" />
-    <state x="718" y="149" width="330" height="698" key="#com.intellij.ide.util.MemberChooser" timestamp="1634288891463">
-      <screen x="0" y="0" width="1920" height="1160" />
-    </state>
-    <state x="718" y="149" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1160/2880.0.1920.1040@0.0.1920.1160" timestamp="1633742405591" />
-    <state x="718" y="149" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1160/2880.0.1920.1080@0.0.1920.1160" timestamp="1632446769749" />
-    <state x="718" y="149" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1160@0.0.1920.1160" timestamp="1634288891463" />
-    <state x="2677" y="139" key="#com.intellij.ide.util.MemberChooser/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625208134199" />
-    <state x="613" y="111" key="#com.intellij.ide.util.MemberChooser/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625536749818" />
-    <state x="2687" y="139" width="330" height="698" key="#com.intellij.ide.util.MemberChooser/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627267573135" />
-    <state x="613" y="111" key="#com.intellij.ide.util.MemberChooser/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628060217000" />
-    <state x="613" y="111" key="#com.intellij.ide.util.MemberChooser/62.0.1474.864@62.0.1474.864" timestamp="1625230033870" />
-    <state x="2649" y="321" key="#com.intellij.ide.util.PackageChooserDialog" timestamp="1626141793813">
-      <screen x="1998" y="0" width="1842" height="1080" />
-    </state>
-    <state x="2649" y="321" key="#com.intellij.ide.util.PackageChooserDialog/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1626141793813" />
-    <state x="2530" y="468" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1625808251467">
-      <screen x="1998" y="0" width="1842" height="1080" />
-    </state>
-    <state x="2530" y="468" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1625808251467" />
-    <state x="732" y="447" width="457" height="273" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes" timestamp="1632463356170">
-      <screen x="0" y="0" width="1920" height="1160" />
-    </state>
-    <state x="732" y="447" width="457" height="273" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes/0.0.1920.1160/2880.0.1920.1040@0.0.1920.1160" timestamp="1632463356170" />
-    <state x="2602" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog" timestamp="1625132595885">
-      <screen x="1982" y="0" width="1858" height="1080" />
-    </state>
-    <state x="2602" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625132595885" />
-    <state x="679" y="311" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1632708558627">
-      <screen x="0" y="0" width="1920" height="1160" />
-    </state>
-    <state x="679" y="311" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1920.1160/2880.0.1920.1040@0.0.1920.1160" timestamp="1632708558627" />
-    <state x="2649" y="290" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1626161037622" />
-    <state x="587" y="259" key="#检查" timestamp="1632707483588">
-      <screen x="0" y="0" width="1920" height="1160" />
-    </state>
-    <state x="587" y="259" key="#检查/0.0.1920.1160/2880.0.1920.1040@0.0.1920.1160" timestamp="1632707483588" />
-    <state x="441" y="155" key="#项目结构" timestamp="1632462526765">
-      <screen x="0" y="0" width="1920" height="1160" />
-    </state>
-    <state x="441" y="155" key="#项目结构/0.0.1920.1160/2880.0.1920.1040@0.0.1920.1160" timestamp="1632462526765" />
-    <state x="330" y="13" key="CommitChangelistDialog2" timestamp="1634291878605">
-      <screen x="0" y="0" width="1920" height="1160" />
-    </state>
-    <state x="800" y="149" key="CommitChangelistDialog2/0.0.1920.1160/2880.0.1920.1080@0.0.1920.1160" timestamp="1632449486744" />
-    <state x="330" y="13" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1634291878605" />
-    <state x="315" y="10" key="CommitChangelistDialog2/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625106671147" />
-    <state x="2314" y="13" key="CommitChangelistDialog2/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1626759368770" />
-    <state x="315" y="10" key="CommitChangelistDialog2/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628066457913" />
-    <state x="315" y="10" key="CommitChangelistDialog2/62.0.1474.864@62.0.1474.864" timestamp="1628039017272" />
-    <state width="461" height="501" key="DebuggerActiveHint" timestamp="1634204301881">
-      <screen x="0" y="0" width="1920" height="1160" />
-    </state>
-    <state width="461" height="501" key="DebuggerActiveHint/0.0.1920.1160@0.0.1920.1160" timestamp="1634204301881" />
-    <state width="442" height="466" key="DebuggerActiveHint/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1625736545533" />
-    <state x="184" y="98" width="1179" height="717" key="DiffContextDialog" timestamp="1629343078027">
-      <screen x="0" y="0" width="1920" height="1160" />
-    </state>
-    <state x="184" y="98" key="DiffContextDialog/0.0.1920.1160@0.0.1920.1160" timestamp="1629343078027" />
-    <state x="2174" y="91" width="1535" height="857" key="DiffContextDialog/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1626140278320" />
-    <state x="203" y="73" width="1229" height="686" key="DiffContextDialog/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1627291889476" />
-    <state x="203" y="73" width="1179" height="717" key="DiffContextDialog/62.0.1474.864@62.0.1474.864" timestamp="1628038977442" />
-    <state width="1877" height="345" key="GridCell.Tab.0.bottom" timestamp="1634291878756">
-      <screen x="0" y="0" width="1920" height="1160" />
-    </state>
-    <state width="1877" height="353" key="GridCell.Tab.0.bottom/0.0.1920.1160/2880.0.1920.1040@0.0.1920.1160" timestamp="1633760891838" />
-    <state width="1877" height="322" key="GridCell.Tab.0.bottom/0.0.1920.1160/2880.0.1920.1080@0.0.1920.1160" timestamp="1632449447182" />
-    <state width="1877" height="345" key="GridCell.Tab.0.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1634291878756" />
-    <state width="1815" height="362" key="GridCell.Tab.0.bottom/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625541178075" />
-    <state width="1431" height="470" key="GridCell.Tab.0.bottom/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625539990085" />
-    <state width="1799" height="305" key="GridCell.Tab.0.bottom/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627881554363" />
-    <state width="1431" height="231" key="GridCell.Tab.0.bottom/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628071448697" />
-    <state width="1431" height="231" key="GridCell.Tab.0.bottom/62.0.1474.864@62.0.1474.864" timestamp="1628092930649" />
-    <state width="1877" height="345" key="GridCell.Tab.0.center" timestamp="1634291878756">
-      <screen x="0" y="0" width="1920" height="1160" />
-    </state>
-    <state width="1877" height="353" key="GridCell.Tab.0.center/0.0.1920.1160/2880.0.1920.1040@0.0.1920.1160" timestamp="1633760891838" />
-    <state width="1877" height="322" key="GridCell.Tab.0.center/0.0.1920.1160/2880.0.1920.1080@0.0.1920.1160" timestamp="1632449447182" />
-    <state width="1877" height="345" key="GridCell.Tab.0.center/0.0.1920.1160@0.0.1920.1160" timestamp="1634291878756" />
-    <state width="1815" height="362" key="GridCell.Tab.0.center/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625541178075" />
-    <state width="1431" height="470" key="GridCell.Tab.0.center/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625539990085" />
-    <state width="1799" height="305" key="GridCell.Tab.0.center/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627881554363" />
-    <state width="1431" height="231" key="GridCell.Tab.0.center/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628071448697" />
-    <state width="1431" height="231" key="GridCell.Tab.0.center/62.0.1474.864@62.0.1474.864" timestamp="1628092930649" />
-    <state width="1877" height="345" key="GridCell.Tab.0.left" timestamp="1634291878756">
-      <screen x="0" y="0" width="1920" height="1160" />
-    </state>
-    <state width="1877" height="353" key="GridCell.Tab.0.left/0.0.1920.1160/2880.0.1920.1040@0.0.1920.1160" timestamp="1633760891838" />
-    <state width="1877" height="322" key="GridCell.Tab.0.left/0.0.1920.1160/2880.0.1920.1080@0.0.1920.1160" timestamp="1632449447182" />
-    <state width="1877" height="345" key="GridCell.Tab.0.left/0.0.1920.1160@0.0.1920.1160" timestamp="1634291878756" />
-    <state width="1815" height="362" key="GridCell.Tab.0.left/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625541178075" />
-    <state width="1431" height="470" key="GridCell.Tab.0.left/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625539990085" />
-    <state width="1799" height="305" key="GridCell.Tab.0.left/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627881554363" />
-    <state width="1431" height="231" key="GridCell.Tab.0.left/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628071448697" />
-    <state width="1431" height="231" key="GridCell.Tab.0.left/62.0.1474.864@62.0.1474.864" timestamp="1628092930648" />
-    <state width="1877" height="345" key="GridCell.Tab.0.right" timestamp="1634291878756">
-      <screen x="0" y="0" width="1920" height="1160" />
-    </state>
-    <state width="1877" height="353" key="GridCell.Tab.0.right/0.0.1920.1160/2880.0.1920.1040@0.0.1920.1160" timestamp="1633760891838" />
-    <state width="1877" height="322" key="GridCell.Tab.0.right/0.0.1920.1160/2880.0.1920.1080@0.0.1920.1160" timestamp="1632449447182" />
-    <state width="1877" height="345" key="GridCell.Tab.0.right/0.0.1920.1160@0.0.1920.1160" timestamp="1634291878756" />
-    <state width="1815" height="362" key="GridCell.Tab.0.right/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625541178075" />
-    <state width="1431" height="470" key="GridCell.Tab.0.right/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625539990085" />
-    <state width="1799" height="305" key="GridCell.Tab.0.right/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627881554363" />
-    <state width="1431" height="231" key="GridCell.Tab.0.right/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628071448697" />
-    <state width="1431" height="231" key="GridCell.Tab.0.right/62.0.1474.864@62.0.1474.864" timestamp="1628092930649" />
-    <state width="1877" height="345" key="GridCell.Tab.1.bottom" timestamp="1634291878757">
-      <screen x="0" y="0" width="1920" height="1160" />
-    </state>
-    <state width="1877" height="353" key="GridCell.Tab.1.bottom/0.0.1920.1160/2880.0.1920.1040@0.0.1920.1160" timestamp="1633761426735" />
-    <state width="1877" height="371" key="GridCell.Tab.1.bottom/0.0.1920.1160/2880.0.1920.1080@0.0.1920.1160" timestamp="1632449445853" />
-    <state width="1877" height="345" key="GridCell.Tab.1.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1634291878757" />
-    <state width="1815" height="362" key="GridCell.Tab.1.bottom/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625541177903" />
-    <state width="1431" height="413" key="GridCell.Tab.1.bottom/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625118962646" />
-    <state width="1799" height="530" key="GridCell.Tab.1.bottom/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627874091344" />
-    <state width="1431" height="490" key="GridCell.Tab.1.bottom/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628071448689" />
-    <state width="1431" height="406" key="GridCell.Tab.1.bottom/62.0.1474.864@62.0.1474.864" timestamp="1627985853679" />
-    <state width="1877" height="345" key="GridCell.Tab.1.center" timestamp="1634291878756">
-      <screen x="0" y="0" width="1920" height="1160" />
-    </state>
-    <state width="1877" height="353" key="GridCell.Tab.1.center/0.0.1920.1160/2880.0.1920.1040@0.0.1920.1160" timestamp="1633761426734" />
-    <state width="1877" height="371" key="GridCell.Tab.1.center/0.0.1920.1160/2880.0.1920.1080@0.0.1920.1160" timestamp="1632449445853" />
-    <state width="1877" height="345" key="GridCell.Tab.1.center/0.0.1920.1160@0.0.1920.1160" timestamp="1634291878756" />
-    <state width="1815" height="362" key="GridCell.Tab.1.center/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625541177903" />
-    <state width="1431" height="413" key="GridCell.Tab.1.center/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625118962646" />
-    <state width="1799" height="530" key="GridCell.Tab.1.center/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627874091344" />
-    <state width="1431" height="490" key="GridCell.Tab.1.center/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628071448689" />
-    <state width="1431" height="406" key="GridCell.Tab.1.center/62.0.1474.864@62.0.1474.864" timestamp="1627985853679" />
-    <state width="1877" height="345" key="GridCell.Tab.1.left" timestamp="1634291878756">
-      <screen x="0" y="0" width="1920" height="1160" />
-    </state>
-    <state width="1877" height="353" key="GridCell.Tab.1.left/0.0.1920.1160/2880.0.1920.1040@0.0.1920.1160" timestamp="1633761426734" />
-    <state width="1877" height="371" key="GridCell.Tab.1.left/0.0.1920.1160/2880.0.1920.1080@0.0.1920.1160" timestamp="1632449445853" />
-    <state width="1877" height="345" key="GridCell.Tab.1.left/0.0.1920.1160@0.0.1920.1160" timestamp="1634291878756" />
-    <state width="1815" height="362" key="GridCell.Tab.1.left/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625541177903" />
-    <state width="1431" height="413" key="GridCell.Tab.1.left/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625118962646" />
-    <state width="1799" height="530" key="GridCell.Tab.1.left/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627874091344" />
-    <state width="1431" height="490" key="GridCell.Tab.1.left/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628071448689" />
-    <state width="1431" height="406" key="GridCell.Tab.1.left/62.0.1474.864@62.0.1474.864" timestamp="1627985853679" />
-    <state width="1877" height="345" key="GridCell.Tab.1.right" timestamp="1634291878756">
-      <screen x="0" y="0" width="1920" height="1160" />
-    </state>
-    <state width="1877" height="353" key="GridCell.Tab.1.right/0.0.1920.1160/2880.0.1920.1040@0.0.1920.1160" timestamp="1633761426734" />
-    <state width="1877" height="371" key="GridCell.Tab.1.right/0.0.1920.1160/2880.0.1920.1080@0.0.1920.1160" timestamp="1632449445853" />
-    <state width="1877" height="345" key="GridCell.Tab.1.right/0.0.1920.1160@0.0.1920.1160" timestamp="1634291878756" />
-    <state width="1815" height="362" key="GridCell.Tab.1.right/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625541177903" />
-    <state width="1431" height="413" key="GridCell.Tab.1.right/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625118962646" />
-    <state width="1799" height="530" key="GridCell.Tab.1.right/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627874091344" />
-    <state width="1431" height="490" key="GridCell.Tab.1.right/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628071448689" />
-    <state width="1431" height="406" key="GridCell.Tab.1.right/62.0.1474.864@62.0.1474.864" timestamp="1627985853679" />
-    <state width="1877" height="345" key="GridCell.Tab.2.bottom" timestamp="1634291878757">
+    <state width="1209" height="338" key="GridCell.Tab.0.bottom" timestamp="1656466631895">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1877" height="353" key="GridCell.Tab.2.bottom/0.0.1920.1160/2880.0.1920.1040@0.0.1920.1160" timestamp="1633760891633" />
-    <state width="1877" height="371" key="GridCell.Tab.2.bottom/0.0.1920.1160/2880.0.1920.1080@0.0.1920.1160" timestamp="1632449445853" />
-    <state width="1877" height="345" key="GridCell.Tab.2.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1634291878757" />
-    <state width="1815" height="362" key="GridCell.Tab.2.bottom/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625541177903" />
-    <state width="1431" height="413" key="GridCell.Tab.2.bottom/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625118962647" />
-    <state width="1799" height="530" key="GridCell.Tab.2.bottom/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627874091344" />
-    <state width="1431" height="490" key="GridCell.Tab.2.bottom/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628071448690" />
-    <state width="1431" height="406" key="GridCell.Tab.2.bottom/62.0.1474.864@62.0.1474.864" timestamp="1627985853680" />
-    <state width="1877" height="345" key="GridCell.Tab.2.center" timestamp="1634291878757">
+    <state width="1209" height="338" key="GridCell.Tab.0.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1656466631895" />
+    <state width="1209" height="338" key="GridCell.Tab.0.center" timestamp="1656466631895">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1877" height="353" key="GridCell.Tab.2.center/0.0.1920.1160/2880.0.1920.1040@0.0.1920.1160" timestamp="1633760891633" />
-    <state width="1877" height="371" key="GridCell.Tab.2.center/0.0.1920.1160/2880.0.1920.1080@0.0.1920.1160" timestamp="1632449445853" />
-    <state width="1877" height="345" key="GridCell.Tab.2.center/0.0.1920.1160@0.0.1920.1160" timestamp="1634291878757" />
-    <state width="1815" height="362" key="GridCell.Tab.2.center/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625541177903" />
-    <state width="1431" height="413" key="GridCell.Tab.2.center/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625118962646" />
-    <state width="1799" height="530" key="GridCell.Tab.2.center/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627874091344" />
-    <state width="1431" height="490" key="GridCell.Tab.2.center/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628071448690" />
-    <state width="1431" height="406" key="GridCell.Tab.2.center/62.0.1474.864@62.0.1474.864" timestamp="1627985853680" />
-    <state width="1877" height="345" key="GridCell.Tab.2.left" timestamp="1634291878757">
+    <state width="1209" height="338" key="GridCell.Tab.0.center/0.0.1920.1160@0.0.1920.1160" timestamp="1656466631895" />
+    <state width="1209" height="338" key="GridCell.Tab.0.left" timestamp="1656466631895">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1877" height="353" key="GridCell.Tab.2.left/0.0.1920.1160/2880.0.1920.1040@0.0.1920.1160" timestamp="1633760891633" />
-    <state width="1877" height="371" key="GridCell.Tab.2.left/0.0.1920.1160/2880.0.1920.1080@0.0.1920.1160" timestamp="1632449445853" />
-    <state width="1877" height="345" key="GridCell.Tab.2.left/0.0.1920.1160@0.0.1920.1160" timestamp="1634291878757" />
-    <state width="1815" height="362" key="GridCell.Tab.2.left/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625541177903" />
-    <state width="1431" height="413" key="GridCell.Tab.2.left/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625118962646" />
-    <state width="1799" height="530" key="GridCell.Tab.2.left/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627874091344" />
-    <state width="1431" height="490" key="GridCell.Tab.2.left/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628071448689" />
-    <state width="1431" height="406" key="GridCell.Tab.2.left/62.0.1474.864@62.0.1474.864" timestamp="1627985853679" />
-    <state width="1877" height="345" key="GridCell.Tab.2.right" timestamp="1634291878757">
+    <state width="1209" height="338" key="GridCell.Tab.0.left/0.0.1920.1160@0.0.1920.1160" timestamp="1656466631895" />
+    <state width="1209" height="338" key="GridCell.Tab.0.right" timestamp="1656466631895">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="1877" height="353" key="GridCell.Tab.2.right/0.0.1920.1160/2880.0.1920.1040@0.0.1920.1160" timestamp="1633760891633" />
-    <state width="1877" height="371" key="GridCell.Tab.2.right/0.0.1920.1160/2880.0.1920.1080@0.0.1920.1160" timestamp="1632449445853" />
-    <state width="1877" height="345" key="GridCell.Tab.2.right/0.0.1920.1160@0.0.1920.1160" timestamp="1634291878757" />
-    <state width="1815" height="362" key="GridCell.Tab.2.right/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625541177903" />
-    <state width="1431" height="413" key="GridCell.Tab.2.right/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625118962646" />
-    <state width="1799" height="530" key="GridCell.Tab.2.right/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627874091344" />
-    <state width="1431" height="490" key="GridCell.Tab.2.right/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628071448690" />
-    <state width="1431" height="406" key="GridCell.Tab.2.right/62.0.1474.864@62.0.1474.864" timestamp="1627985853680" />
-    <state x="491" y="235" key="Maven.ArtifactSearchDialog" timestamp="1632468050042">
+    <state width="1209" height="338" key="GridCell.Tab.0.right/0.0.1920.1160@0.0.1920.1160" timestamp="1656466631895" />
+    <state width="1209" height="338" key="GridCell.Tab.1.bottom" timestamp="1656466631712">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state x="491" y="235" key="Maven.ArtifactSearchDialog/0.0.1920.1160/2880.0.1920.1040@0.0.1920.1160" timestamp="1632468050042" />
-    <state x="457" y="132" key="RollbackChangesDialog" timestamp="1627291822313">
-      <screen x="62" y="0" width="1474" height="864" />
-    </state>
-    <state x="457" y="132" key="RollbackChangesDialog/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1627291822313" />
-    <state x="440" y="28" key="SettingsEditor" timestamp="1632449969968">
-      <screen x="0" y="0" width="1920" height="1160" />
-    </state>
-    <state x="440" y="28" key="SettingsEditor/0.0.1920.1160/2880.0.1920.1080@0.0.1920.1160" timestamp="1632449969968" />
-    <state x="2420" y="26" key="SettingsEditor/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627463021455" />
-    <state x="400" y="21" key="SettingsEditor/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1627952237591" />
-    <state width="498" height="446" key="SwitcherDM" timestamp="1626317409209">
-      <screen x="62" y="0" width="1474" height="864" />
-    </state>
-    <state width="498" height="446" key="SwitcherDM/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1626317409209" />
-    <state x="451" y="209" key="Vcs.Push.Dialog.v2" timestamp="1632450169334">
+    <state width="1209" height="338" key="GridCell.Tab.1.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1656466631712" />
+    <state width="1209" height="338" key="GridCell.Tab.1.center" timestamp="1656466631712">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state x="451" y="209" key="Vcs.Push.Dialog.v2/0.0.1920.1160/2880.0.1920.1040@0.0.1920.1160" timestamp="1632450169334" />
-    <state x="451" y="209" key="Vcs.Push.Dialog.v2/0.0.1920.1160/2880.0.1920.1080@0.0.1920.1160" timestamp="1632449859971" />
-    <state x="408" y="156" key="Vcs.Push.Dialog.v2/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625106675482" />
-    <state x="2430" y="195" key="Vcs.Push.Dialog.v2/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1626759375489" />
-    <state x="408" y="156" key="Vcs.Push.Dialog.v2/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628066487588" />
-    <state x="408" y="156" key="Vcs.Push.Dialog.v2/62.0.1474.864@62.0.1474.864" timestamp="1628039025108" />
-    <state width="968" height="588" key="XDebugger.FullValuePopup" timestamp="1633761535031">
+    <state width="1209" height="338" key="GridCell.Tab.1.center/0.0.1920.1160@0.0.1920.1160" timestamp="1656466631712" />
+    <state width="1209" height="338" key="GridCell.Tab.1.left" timestamp="1656466631712">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state width="968" height="588" key="XDebugger.FullValuePopup/0.0.1920.1160/2880.0.1920.1040@0.0.1920.1160" timestamp="1633761535031" />
-    <state width="968" height="588" key="XDebugger.FullValuePopup/0.0.1920.1160@0.0.1920.1160" timestamp="1630480352669" />
-    <state x="555" y="266" key="com.intellij.ide.util.TipDialog" timestamp="1628125102884">
-      <screen x="62" y="0" width="1474" height="864" />
-    </state>
-    <state x="2603" y="333" key="com.intellij.ide.util.TipDialog/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625540886632" />
-    <state x="555" y="266" key="com.intellij.ide.util.TipDialog/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1628125102884" />
-    <state x="555" y="266" key="com.intellij.ide.util.TipDialog/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1627952027425" />
-    <state x="555" y="266" key="com.intellij.ide.util.TipDialog/62.0.1474.864@62.0.1474.864" timestamp="1628037877990" />
-    <state x="445" y="68" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1632363466835">
+    <state width="1209" height="338" key="GridCell.Tab.1.left/0.0.1920.1160@0.0.1920.1160" timestamp="1656466631712" />
+    <state width="1209" height="338" key="GridCell.Tab.1.right" timestamp="1656466631712">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state x="445" y="68" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/0.0.1920.1160/2880.0.1920.1040@0.0.1920.1160" timestamp="1632363466835" />
-    <state x="404" y="51" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625111594055" />
-    <state x="404" y="51" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1626834042581" />
-    <state x="773" y="492" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1629342554748">
+    <state width="1209" height="338" key="GridCell.Tab.1.right/0.0.1920.1160@0.0.1920.1160" timestamp="1656466631712" />
+    <state width="1209" height="338" key="GridCell.Tab.2.bottom" timestamp="1656466631713">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state x="773" y="492" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1160@0.0.1920.1160" timestamp="1629342554748" />
-    <state x="393" y="0" width="1081" height="742" key="dock-window-1" timestamp="1626676277215">
-      <screen x="62" y="0" width="1474" height="864" />
-    </state>
-    <state x="393" y="0" width="1081" height="742" key="dock-window-1/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1626676277215" />
-    <state x="2331" y="26" width="1029" height="850" key="dock-window-1/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1626402796996" />
-    <state x="2340" y="95" width="759" height="596" key="find.popup" timestamp="1627542367203">
-      <screen x="1998" y="0" width="1842" height="1080" />
-    </state>
-    <state x="2589" y="273" width="759" height="596" key="find.popup/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625218868912" />
-    <state x="2340" y="95" width="759" height="596" key="find.popup/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627542367203" />
-    <state x="336" y="76" width="755" height="548" key="find.popup/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1627005888059" />
-    <state x="2560" y="266" width="700" height="530" key="recent.locations.popup" timestamp="1626680746891">
-      <screen x="1998" y="0" width="1842" height="1080" />
-    </state>
-    <state x="2560" y="266" width="700" height="530" key="recent.locations.popup/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1626680746891" />
-    <state x="602" y="269" key="run.anything.popup" timestamp="1631778572619">
+    <state width="1209" height="338" key="GridCell.Tab.2.bottom/0.0.1920.1160@0.0.1920.1160" timestamp="1656466631713" />
+    <state width="1209" height="338" key="GridCell.Tab.2.center" timestamp="1656466631713">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state x="602" y="269" key="run.anything.popup/0.0.1920.1160/2880.0.1920.1040@0.0.1920.1160" timestamp="1631778572619" />
-    <state x="602" y="269" key="run.anything.popup/0.0.1920.1160@0.0.1920.1160" timestamp="1630893673828" />
-    <state x="2575" y="250" key="run.anything.popup/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1625820790244" />
-    <state x="524" y="200" key="run.anything.popup/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1626318275914" />
-    <state x="539" y="204" width="877" height="956" key="search.everywhere.popup" timestamp="1630460911129">
+    <state width="1209" height="338" key="GridCell.Tab.2.center/0.0.1920.1160@0.0.1920.1160" timestamp="1656466631713" />
+    <state width="1209" height="338" key="GridCell.Tab.2.left" timestamp="1656466631712">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state x="539" y="204" width="877" height="956" key="search.everywhere.popup/0.0.1920.1160@0.0.1920.1160" timestamp="1630460911129" />
-    <state x="2504" y="190" width="813" height="889" key="search.everywhere.popup/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625219525449" />
-    <state x="476" y="152" width="672" height="712" key="search.everywhere.popup/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625537009967" />
-    <state x="2515" y="190" width="840" height="890" key="search.everywhere.popup/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627530876622" />
-    <state x="476" y="152" width="673" height="712" key="search.everywhere.popup/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628059938895" />
-    <state x="589" y="262" key="spring file set editor" timestamp="1630649635378">
+    <state width="1209" height="338" key="GridCell.Tab.2.left/0.0.1920.1160@0.0.1920.1160" timestamp="1656466631712" />
+    <state width="1209" height="338" key="GridCell.Tab.2.right" timestamp="1656466631713">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state x="589" y="262" key="spring file set editor/0.0.1920.1160@0.0.1920.1160" timestamp="1630649635378" />
+    <state width="1209" height="338" key="GridCell.Tab.2.right/0.0.1920.1160@0.0.1920.1160" timestamp="1656466631713" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -987,32 +813,32 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-coupon/src/main/java/com/yijia/coupon/controller/CouponIssueController.java</url>
-          <line>250</line>
+          <line>245</line>
           <option name="timeStamp" value="16" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-coupon/src/main/java/com/yijia/coupon/controller/CouponIssueController.java</url>
-          <line>229</line>
+          <line>224</line>
           <option name="timeStamp" value="17" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-coupon/src/main/java/com/yijia/coupon/controller/CouponIssueController.java</url>
-          <line>228</line>
+          <line>223</line>
           <option name="timeStamp" value="18" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-coupon/src/main/java/com/yijia/coupon/controller/CouponIssueController.java</url>
-          <line>137</line>
+          <line>130</line>
           <option name="timeStamp" value="19" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-coupon/src/main/java/com/yijia/coupon/controller/CouponIssueController.java</url>
-          <line>271</line>
+          <line>266</line>
           <option name="timeStamp" value="21" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-coupon/src/main/java/com/yijia/coupon/controller/CouponIssueController.java</url>
-          <line>270</line>
+          <line>265</line>
           <option name="timeStamp" value="27" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
@@ -1187,128 +1013,238 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java</url>
-          <line>769</line>
-          <option name="timeStamp" value="151" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java</url>
-          <line>542</line>
+          <line>862</line>
           <option name="timeStamp" value="152" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java</url>
-          <line>543</line>
+          <line>863</line>
           <option name="timeStamp" value="153" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java</url>
-          <line>541</line>
+          <line>861</line>
           <option name="timeStamp" value="154" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java</url>
-          <line>645</line>
+          <line>965</line>
           <option name="timeStamp" value="155" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java</url>
-          <line>644</line>
+          <line>964</line>
           <option name="timeStamp" value="156" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java</url>
-          <line>977</line>
+          <line>1302</line>
           <option name="timeStamp" value="157" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java</url>
-          <line>983</line>
+          <line>1319</line>
           <option name="timeStamp" value="158" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java</url>
-          <line>990</line>
+          <line>1339</line>
           <option name="timeStamp" value="159" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java</url>
-          <line>991</line>
-          <option name="timeStamp" value="160" />
+          <line>858</line>
+          <option name="timeStamp" value="161" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java</url>
-          <line>538</line>
-          <option name="timeStamp" value="161" />
+          <line>1431</line>
+          <option name="timeStamp" value="170" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java</url>
-          <line>992</line>
-          <option name="timeStamp" value="162" />
+          <line>1432</line>
+          <option name="timeStamp" value="171" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java</url>
-          <line>993</line>
-          <option name="timeStamp" value="163" />
+          <line>826</line>
+          <option name="timeStamp" value="197" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java</url>
-          <line>1050</line>
-          <option name="timeStamp" value="164" />
+          <line>1315</line>
+          <option name="timeStamp" value="199" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java</url>
-          <line>1051</line>
-          <option name="timeStamp" value="165" />
+          <line>1709</line>
+          <option name="timeStamp" value="221" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java</url>
-          <line>1042</line>
-          <option name="timeStamp" value="166" />
+          <line>175</line>
+          <option name="timeStamp" value="226" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java</url>
-          <line>1022</line>
-          <option name="timeStamp" value="167" />
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>516</line>
+          <option name="timeStamp" value="228" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java</url>
-          <line>1235</line>
-          <option name="timeStamp" value="168" />
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>518</line>
+          <option name="timeStamp" value="229" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java</url>
-          <line>1083</line>
-          <option name="timeStamp" value="169" />
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>522</line>
+          <option name="timeStamp" value="230" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java</url>
-          <line>1073</line>
-          <option name="timeStamp" value="170" />
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>523</line>
+          <option name="timeStamp" value="231" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java</url>
-          <line>1074</line>
-          <option name="timeStamp" value="171" />
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>524</line>
+          <option name="timeStamp" value="232" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java</url>
-          <line>1044</line>
-          <option name="timeStamp" value="172" />
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>512</line>
+          <option name="timeStamp" value="233" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java</url>
-          <line>1615</line>
-          <option name="timeStamp" value="174" />
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>513</line>
+          <option name="timeStamp" value="234" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java</url>
-          <line>1592</line>
-          <option name="timeStamp" value="176" />
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>514</line>
+          <option name="timeStamp" value="235" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java</url>
-          <line>1608</line>
-          <option name="timeStamp" value="177" />
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>510</line>
+          <option name="timeStamp" value="236" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>615</line>
+          <option name="timeStamp" value="237" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>616</line>
+          <option name="timeStamp" value="238" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>503</line>
+          <option name="timeStamp" value="239" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>528</line>
+          <option name="timeStamp" value="240" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>527</line>
+          <option name="timeStamp" value="241" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>610</line>
+          <option name="timeStamp" value="243" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>460</line>
+          <option name="timeStamp" value="244" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>461</line>
+          <option name="timeStamp" value="245" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>439</line>
+          <option name="timeStamp" value="246" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>441</line>
+          <option name="timeStamp" value="247" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>458</line>
+          <option name="timeStamp" value="248" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>602</line>
+          <option name="timeStamp" value="249" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>579</line>
+          <option name="timeStamp" value="250" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>578</line>
+          <option name="timeStamp" value="251" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/PayOrderController.java</url>
+          <line>652</line>
+          <option name="timeStamp" value="252" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/PayOrderController.java</url>
+          <line>651</line>
+          <option name="timeStamp" value="253" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/PayOrderController.java</url>
+          <line>656</line>
+          <option name="timeStamp" value="254" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/controller/PayOrderController.java</url>
+          <line>660</line>
+          <option name="timeStamp" value="255" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>550</line>
+          <option name="timeStamp" value="256" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>552</line>
+          <option name="timeStamp" value="257" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>554</line>
+          <option name="timeStamp" value="258" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>553</line>
+          <option name="timeStamp" value="259" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java</url>
+          <line>551</line>
+          <option name="timeStamp" value="260" />
         </line-breakpoint>
         <line-breakpoint type="java-method">
           <url>file://$PROJECT_DIR$/yijia-label/src/main/java/com/yijia/label/mapper/CustomerLabelMapper.java</url>
@@ -1330,6 +1266,7 @@
     <select />
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
+    <SUITE FILE_PATH="coverage/SAAS_AFTEREND2$YiJiaApplication.ic" NAME="YiJiaApplication Coverage Results" MODIFIED="1634628979558" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
     <SUITE FILE_PATH="coverage/SAAS_AFTEREND$YiJiaApplication.ic" NAME="YiJiaApplication Coverage Results" MODIFIED="1625553163132" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
   </component>
 </project>

yijia-admin/src/main/resources/application-druid.yml

@@ -6,14 +6,14 @@ spring:
         druid:
             # 主库数据源
             master:
-                #url: jdbc:mysql://47.105.116.204:3306/jiaduoduo_db_prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://47.105.116.204:3306/jiaduoduo_db_prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 #url: jdbc:mysql://115.28.211.17:3306/jiaduoduo_db_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                url: jdbc:mysql://115.28.211.17:3306/jiaduoduo_db_demo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                #url: jdbc:mysql://115.28.211.17:3306/jiaduoduo_db_demo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: develop
                 password: 1234.Abcd
                 #url: jdbc:mysql://localhost:3306/jiaduoduo_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 # username: zgc
-            #password: 123456
+                #password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

yijia-admin/src/main/resources/application.yml

@@ -10,11 +10,11 @@ yijia:
   demoEnabled: true
   # 文件路径
   #正式服务器
-  #profile: /home/uploadfile/images
-  #imageurl: http://image.huijy.net:8088/images
-  #测试服务器
   profile: /home/uploadfile/images
-  imageurl: http://upload.huijy.net:8088/images
+  imageurl: http://image.huijy.net:8088/images
+  #测试服务器
+  #profile: /home/uploadfile/images
+  #imageurl: http://upload.huijy.net:8088/images
   #本地测试服务
   # profile: D:/img
   #图片地址

yijia-admin/src/main/resources/logback.xml

@@ -2,9 +2,9 @@
 <configuration>
     <!-- 日志存放路径 -->
    <!--<property name="log.path" value="/home/testDemo/logs" />-->
-   <property name="log.path" value="/home/devnote/deBugJar/logs" />
+   <!--<property name="log.path" value="/home/devnote/deBugJar/logs" />-->
     <!--<property name="log.path" value="/home/devnote/demoJar/logs" />-->
-    <!--<property name="log.path" value="/home/prodJar/logs" />-->
+    <property name="log.path" value="/home/prodJar/logs" />
 
      <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />

yijia-admin/target/classes/application-druid.yml

@@ -6,14 +6,14 @@ spring:
         druid:
             # 主库数据源
             master:
-                #url: jdbc:mysql://47.105.116.204:3306/jiaduoduo_db_prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://47.105.116.204:3306/jiaduoduo_db_prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 #url: jdbc:mysql://115.28.211.17:3306/jiaduoduo_db_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                url: jdbc:mysql://115.28.211.17:3306/jiaduoduo_db_demo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                #url: jdbc:mysql://115.28.211.17:3306/jiaduoduo_db_demo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: develop
                 password: 1234.Abcd
                 #url: jdbc:mysql://localhost:3306/jiaduoduo_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 # username: zgc
-            #password: 123456
+                #password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

yijia-admin/target/classes/application.yml

@@ -10,11 +10,11 @@ yijia:
   demoEnabled: true
   # 文件路径
   #正式服务器
-  #profile: /home/uploadfile/images
-  #imageurl: http://image.huijy.net:8088/images
-  #测试服务器
   profile: /home/uploadfile/images
-  imageurl: http://upload.huijy.net:8088/images
+  imageurl: http://image.huijy.net:8088/images
+  #测试服务器
+  #profile: /home/uploadfile/images
+  #imageurl: http://upload.huijy.net:8088/images
   #本地测试服务
   # profile: D:/img
   #图片地址

yijia-admin/target/classes/logback.xml

@@ -2,9 +2,9 @@
 <configuration>
     <!-- 日志存放路径 -->
    <!--<property name="log.path" value="/home/testDemo/logs" />-->
-   <property name="log.path" value="/home/devnote/deBugJar/logs" />
+   <!--<property name="log.path" value="/home/devnote/deBugJar/logs" />-->
     <!--<property name="log.path" value="/home/devnote/demoJar/logs" />-->
-    <!--<property name="log.path" value="/home/prodJar/logs" />-->
+    <property name="log.path" value="/home/prodJar/logs" />
 
      <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />

yijia-admin/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Mon Oct 11 10:34:23 CST 2021
+#Wed Jun 22 17:02:13 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-admin

yijia-admin/yijia-admin.iml

@@ -142,6 +142,7 @@
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.5" level="project" />
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
+    <orderEntry type="library" name="Maven: org.saobei:saobeiopen:1.0" level="project" />
     <orderEntry type="module" module-name="yijia-customer" />
     <orderEntry type="module" module-name="yijia-market" />
     <orderEntry type="module" module-name="yijia-integral" />

yijia-common/src/main/java/com/yijia/common/core/domain/entity/SysDept.java

@@ -256,6 +256,28 @@ public class SysDept extends BaseEntity
     /*退款的审核状态*/
     private String  refundExaminStatus;
 
+    /*退款的审核状态*/
+    private String  isAlipayFlag;
+
+    /*退款的审核状态*/
+    private String  thirdPayment;
+
+    public String getIsAlipayFlag() {
+        return isAlipayFlag;
+    }
+
+    public void setIsAlipayFlag(String isAlipayFlag) {
+        this.isAlipayFlag = isAlipayFlag;
+    }
+
+    public String getThirdPayment() {
+        return thirdPayment;
+    }
+
+    public void setThirdPayment(String thirdPayment) {
+        this.thirdPayment = thirdPayment;
+    }
+
     public String getRefundExaminStatus() {
         return refundExaminStatus;
     }

yijia-common/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Mon Oct 11 10:34:11 CST 2021
+#Wed Jun 22 17:02:03 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-common

yijia-coupon/src/main/java/com/yijia/coupon/controller/CouponIssueController.java

@@ -1,36 +1,29 @@
 package com.yijia.coupon.controller;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Random;
-
+import com.yijia.common.annotation.Log;
+import com.yijia.common.core.controller.BaseController;
+import com.yijia.common.core.domain.AjaxResult;
 import com.yijia.common.core.domain.entity.SysDept;
 import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.core.page.TableDataInfo;
+import com.yijia.common.enums.BusinessType;
 import com.yijia.common.utils.SecurityUtils;
+import com.yijia.common.utils.poi.ExcelUtil;
 import com.yijia.coupon.domain.CouponInfo;
+import com.yijia.coupon.domain.CouponIssue;
 import com.yijia.coupon.domain.CouponIssueRelation;
 import com.yijia.coupon.service.ICouponInfoService;
 import com.yijia.coupon.service.ICouponIssueRelationService;
+import com.yijia.coupon.service.ICouponIssueService;
 import com.yijia.system.service.impl.SysDeptServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.yijia.common.annotation.Log;
-import com.yijia.common.core.controller.BaseController;
-import com.yijia.common.core.domain.AjaxResult;
-import com.yijia.common.enums.BusinessType;
-import com.yijia.coupon.domain.CouponIssue;
-import com.yijia.coupon.service.ICouponIssueService;
-import com.yijia.common.utils.poi.ExcelUtil;
-import com.yijia.common.core.page.TableDataInfo;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
 
 /**
  * 优惠劵发放方式Controller
@@ -177,6 +170,9 @@ public class CouponIssueController extends BaseController
 
         String ordNo = ""+result1+TempTime.substring(5)+result;
         couponIssue.setId(ordNo);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        couponIssue.setCreateBy(String.valueOf(currentUser.getUser().getUserId()));
+        couponIssue.setStationId(currentUser.getUser().getDeptId());
         if(couponIssue!=null &&couponIssue.getShowIdList()!=null && couponIssue.getShowIdList().size()>0){
             String verification= StringUtils.join( couponIssue.getShowIdList(),",");
             couponIssue.setShowId(verification);
@@ -191,14 +187,13 @@ public class CouponIssueController extends BaseController
             CouponIssue couponIssue1=new CouponIssue();
             couponIssue1.setIssueType("3");
             couponIssue1.setStatus("1");
+            couponIssue1.setStationId(currentUser.getUser().getDeptId());
             List<CouponIssue> couponIssues=couponIssueService.selectCouponIssueList(couponIssue1);
             if(couponIssues.size()>0){
                 return AjaxResult.error("支付成功后的展示位，只能设置一个！");
             }
         }
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        couponIssue.setCreateBy(String.valueOf(currentUser.getUser().getUserId()));
-        couponIssue.setStationId(currentUser.getUser().getDeptId());
+
         couponIssue.setStatus("1");
         i=couponIssueService.insertCouponIssue(couponIssue);
         List<Integer> list = couponIssue.getCouponIssueRelationList();

yijia-coupon/src/main/java/com/yijia/coupon/controller/CouponUserController.java

@@ -3,30 +3,22 @@ package com.yijia.coupon.controller;
 import com.yijia.common.annotation.Log;
 import com.yijia.common.core.controller.BaseController;
 import com.yijia.common.core.domain.AjaxResult;
-import com.yijia.common.core.domain.entity.SysDept;
-import com.yijia.common.core.domain.model.LoginUser;
 import com.yijia.common.core.page.TableDataInfo;
 import com.yijia.common.enums.BusinessType;
-import com.yijia.common.utils.SecurityUtils;
 import com.yijia.common.utils.poi.ExcelUtil;
-import com.yijia.coupon.domain.CouponInfo;
-import com.yijia.coupon.domain.CouponIssue;
-import com.yijia.coupon.domain.CouponIssueRelation;
 import com.yijia.coupon.domain.CouponUser;
 import com.yijia.coupon.service.ICouponIssueService;
 import com.yijia.coupon.service.ICouponUserService;
+import com.yijia.system.domain.SysAppUserInfo;
+import com.yijia.system.service.ISysAppUserInfoService;
 import com.yijia.system.service.ISysDeptService;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import java.util.Random;
 
 /**
  * 优惠劵Controller
@@ -45,6 +37,9 @@ public class CouponUserController extends BaseController
     private ICouponUserService couponUserService;
     @Autowired
     private ISysDeptService deptService;
+    @Autowired
+    private ISysAppUserInfoService appUserInfoService;
+
 
     /**
      * 查询人员优惠劵发放方式列表
@@ -60,6 +55,17 @@ public class CouponUserController extends BaseController
         }
         startPage();
         List<CouponUser> couponUserlist = couponUserService.selectCouponUserList(couponUser);
+        for(int m=0;m<couponUserlist.size();m++){
+            SysAppUserInfo sysAppUserInfo=new SysAppUserInfo();
+            sysAppUserInfo.setUnionId(couponUserlist.get(m).getUnionId());
+            List<SysAppUserInfo> appUserInfos=appUserInfoService.selectSysAppUserInfoList(sysAppUserInfo);
+            if(appUserInfos!=null&&appUserInfos.size()>0){
+                couponUserlist.get(m).setUserId( Integer.parseInt(appUserInfos.get(0).getUserId()+""));
+                couponUserlist.get(m).setBlogNickName(appUserInfos.get(0).getBlogNickName() );
+                couponUserlist.get(m).setMobilePhone(appUserInfos.get(0).getMobilePhone());
+            }
+
+        }
         return getDataTable(couponUserlist);
     }
 

yijia-coupon/src/main/resources/mapper/coupon/CouponUserMapper.xml

@@ -31,12 +31,12 @@
            SELECT a.union_id,a.station_id,
             a.issue_id,a.id,a.get_coupon_time,a.coupon_id,
             a.coupon_is_used,a.coupon_is_effective,a.coupon_effective_time,
-            b.coupon_name,c.issue_name,d.user_id,d.mobile_phone,d.blog_nick_name,
+            b.coupon_name,c.issue_name,
             b.coupon_remark,c.issue_remark,b.coupon_type,b.coupon_amt,a.verification_user_phone
             from  coupon_user a
-            left join coupon_info b on a.coupon_id=b.id
-            left join coupon_issue c  on  a.issue_id=c.id
-	        left  join app_user_info d  on a.union_id=d.union_id
+             join coupon_info b on a.coupon_id=b.id
+             join coupon_issue c  on  a.issue_id=c.id
+	         -- join app_user_info d  on a.union_id=d.union_id
     </sql>
 
     <select id="selectCouponUserList" parameterType="CouponUser" resultMap="CouponUserResult">

yijia-coupon/target/classes/mapper/coupon/CouponUserMapper.xml

@@ -31,12 +31,12 @@
            SELECT a.union_id,a.station_id,
             a.issue_id,a.id,a.get_coupon_time,a.coupon_id,
             a.coupon_is_used,a.coupon_is_effective,a.coupon_effective_time,
-            b.coupon_name,c.issue_name,d.user_id,d.mobile_phone,d.blog_nick_name,
+            b.coupon_name,c.issue_name,
             b.coupon_remark,c.issue_remark,b.coupon_type,b.coupon_amt,a.verification_user_phone
             from  coupon_user a
-            left join coupon_info b on a.coupon_id=b.id
-            left join coupon_issue c  on  a.issue_id=c.id
-	        left  join app_user_info d  on a.union_id=d.union_id
+             join coupon_info b on a.coupon_id=b.id
+             join coupon_issue c  on  a.issue_id=c.id
+	         -- join app_user_info d  on a.union_id=d.union_id
     </sql>
 
     <select id="selectCouponUserList" parameterType="CouponUser" resultMap="CouponUserResult">

yijia-coupon/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Mon Oct 11 10:34:16 CST 2021
+#Wed Jun 22 17:02:08 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-coupon

yijia-customer/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Mon Oct 11 10:34:18 CST 2021
+#Wed Jun 22 17:02:09 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-customer

yijia-framework/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Mon Oct 11 10:34:14 CST 2021
+#Wed Jun 22 17:02:06 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-framework

yijia-generator/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Mon Oct 11 10:34:16 CST 2021
+#Wed Jun 22 17:02:07 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-generator

yijia-integral/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Mon Oct 11 10:34:19 CST 2021
+#Wed Jun 22 17:02:10 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-integral

yijia-label/src/main/resources/mapper/label/CustomerLabelDemoMapper.xml

@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join customer_label l on zq.station_id = l.station_id and zq.phone = l.phone and l.del_flag ="0"
         left join label_rule r on r.id = l.label_id and r.del_flag ="0"
         <where>
-            <if test="labelId != null "> and l.label_id >= #{labelId}</if>
+            <if test="labelId != null "> and l.label_id = #{labelId}</if>
             <if test="startCountNum != null "> and zq.count_num >= #{startCountNum}</if>
             <if test="endCountNum != null "> and zq.count_num &lt; #{endCountNum}</if>
             <if test="amtFlag != null and amtFlag=='2'.toString()">

yijia-label/target/classes/mapper/label/CustomerLabelDemoMapper.xml

@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join customer_label l on zq.station_id = l.station_id and zq.phone = l.phone and l.del_flag ="0"
         left join label_rule r on r.id = l.label_id and r.del_flag ="0"
         <where>
-            <if test="labelId != null "> and l.label_id >= #{labelId}</if>
+            <if test="labelId != null "> and l.label_id = #{labelId}</if>
             <if test="startCountNum != null "> and zq.count_num >= #{startCountNum}</if>
             <if test="endCountNum != null "> and zq.count_num &lt; #{endCountNum}</if>
             <if test="amtFlag != null and amtFlag=='2'.toString()">

yijia-label/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Mon Oct 11 10:34:17 CST 2021
+#Wed Jun 22 17:02:08 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-label

yijia-market/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Mon Oct 11 10:34:21 CST 2021
+#Wed Jun 22 17:02:12 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-market

yijia-quartz/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Mon Oct 11 10:34:15 CST 2021
+#Wed Jun 22 17:02:06 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-quartz

yijia-station/pom.xml

@@ -25,6 +25,12 @@
             <artifactId>httpclient</artifactId>
             <version>4.5.5</version>
         </dependency>
+        <dependency>
+            <groupId>org.saobei</groupId>
+            <artifactId>saobeiopen</artifactId>
+            <version>1.0</version>
+        </dependency>
+
         <!-- 通用工具-->
         <dependency>
             <groupId>com.yijia</groupId>

yijia-station/src/main/java/com/yijia/station/controller/PayOrderController.java

@@ -57,6 +57,18 @@ public class PayOrderController extends BaseController
     private IStationBalanceChangeService stationBalanceChangeService;
 
 
+    public static final String PAY_VER = "110";//版本号
+    public static final String KEY = "";//机构秘钥
+    public static final String ACCESS_TOKEN = "23570b46a955484d92038f6a18d2b9d6";//支付秘钥
+    public static final String INST_NO = "";//机构号
+    public static final String MERCHANT_NO = "";//商户号
+    public static final String TERMINAL_ID = "";//终端号
+
+
+
+
+
+
 
     /**
      * 查询订单支付列表
@@ -70,10 +82,27 @@ public class PayOrderController extends BaseController
             payOrder.setStationId(null);
         }
         startPage();
-        payOrder.setStatus("1");
+        //payOrder.setStatus("1");
         List<PayOrder> payOrderList = payOrderService.selectPayOrderList(payOrder);
         return getDataTable(payOrderList);
     }
+
+
+    /**
+     * 查询订单支付列表
+     */
+    @GetMapping("/allList")
+    public TableDataInfo allList(PayOrder payOrder)
+    {
+        List<String> list = deptService.levelDeptList(payOrder.getLevelId());
+        if(list!=null && list.size()>0){
+            payOrder.setStationIdList(list);
+            payOrder.setStationId(null);
+        }
+        startPage();
+        List<PayOrder> payOrderList = payOrderService.selectALlPayOrderList(payOrder);
+        return getDataTable(payOrderList);
+    }
     /**
      * 关联用户查询订单支付列表
      */
@@ -86,7 +115,7 @@ public class PayOrderController extends BaseController
             payOrder.setStationId(null);
         }
         startPage();
-        payOrder.setStatus("1");
+        //payOrder.setStatus("1");
         List<PayOrder> payOrderList = payOrderService.selectUserPayOrderList(payOrder);
         return getDataTable(payOrderList);
     }
@@ -101,7 +130,7 @@ public class PayOrderController extends BaseController
             payOrder.setStationId(null);
         }
         startPage();
-        payOrder.setStatus("1");
+        //payOrder.setStatus("1");
         List<PayOrder> payOrderList = payOrderService.selectPayOrderList(payOrder);
         return getDataTable(payOrderList);
     }
@@ -117,7 +146,7 @@ public class PayOrderController extends BaseController
             payOrder.setStationId(null);
         }
         payOrder.setOrderType("1");
-        payOrder.setStatus("1");
+        //payOrder.setStatus("1");
         List<PayOrder> payOrderList = payOrderService.selectPayOrderList(payOrder);
         return getTable(payOrderList);
     }
@@ -135,7 +164,7 @@ public class PayOrderController extends BaseController
             payOrder.setStationIdList(list);
             payOrder.setStationId(null);
         }
-        payOrder.setStatus("1");
+        //payOrder.setStatus("1");
         payOrder.setOrderType("1");
         PayOrder order = payOrderService.selectDaySources(payOrder);
         return AjaxResult.success(order);
@@ -155,7 +184,7 @@ public class PayOrderController extends BaseController
             payOrder.setStationIdList(list);
             payOrder.setStationId(null);
         }
-        payOrder.setStatus("1");
+        //payOrder.setStatus("1");
         payOrder.setOrderType("1");
         PayOrder order = payOrderService.selectDaySources(payOrder);
         return AjaxResult.success(order);
@@ -191,7 +220,7 @@ public class PayOrderController extends BaseController
             payOrder.setStationIdList(list);
             payOrder.setStationId(null);
         }
-        payOrder.setStatus("1");
+        //payOrder.setStatus("1");
         payOrder.setOrderType("1");
         PayOrder order = payOrderService.selectDaySources(payOrder);
         return AjaxResult.success(order);
@@ -227,7 +256,7 @@ public class PayOrderController extends BaseController
             payOrder.setStationIdList(list);
             payOrder.setStationId(null);
         }
-        //payOrder.setStatus("1");
+        payOrder.setStatus("1");
         payOrder.setOrderType("1");
         List<PayOrder> orderList = payOrderService.selectAllOilTypeSources(payOrder);
         return getTable(orderList);
@@ -267,7 +296,7 @@ public class PayOrderController extends BaseController
             payOrder.setStationIdList(list);
             payOrder.setStationId(null);
         }
-        //payOrder.setStatus("1");
+        payOrder.setStatus("1");
         payOrder.setOrderType("1");
         List<PayOrder> orderList = payOrderService.dayAllOilTypeSources(payOrder);
         return getTable(orderList);
@@ -304,7 +333,7 @@ public class PayOrderController extends BaseController
             payOrder.setStationIdList(list);
             payOrder.setStationId(null);
         }
-        //payOrder.setStatus("1");
+        payOrder.setStatus("1");
         payOrder.setOrderType("1");
         PayOrder order = payOrderService.selectAllOverViewData(payOrder);
         return AjaxResult.success(order);
@@ -323,7 +352,7 @@ public class PayOrderController extends BaseController
         }
         //默认当前登陆人的ID 5冯总油站
         startPage();
-        payOrder.setStatus("1");
+        //payOrder.setStatus("1");
         payOrder.setOrderType("1");
         List<PayOrder>  orderList = payOrderService.selectDayReport(payOrder);
         return getDataTable(orderList);
@@ -361,7 +390,7 @@ public class PayOrderController extends BaseController
             payOrder.setStationIdList(list);
             payOrder.setStationId(null);
         }
-        payOrder.setStatus("1");
+        //payOrder.setStatus("1");
         payOrder.setOrderType("1");
        List<PayOrder>  orderList = payOrderService.selectDayReport(payOrder);
         return getTable(orderList);
@@ -379,7 +408,7 @@ public class PayOrderController extends BaseController
             payOrder.setStationIdList(list);
             payOrder.setStationId(null);
         }
-        payOrder.setStatus("1");
+        //payOrder.setStatus("1");
         payOrder.setOrderType("1");
         List<PayOrder> payOrderList = payOrderService.selectPayOrderExport(payOrder);
         ExcelUtil<PayOrder> util = new ExcelUtil<PayOrder>(PayOrder.class);
@@ -627,6 +656,7 @@ public class PayOrderController extends BaseController
         try {
             payOrderService.sxfRefund(payOrder);
             payOrder.setRefundSuccessDate(new Date());
+            payOrder.setStatus(null);
             i=payOrderService.updatePayOrder(payOrder);
         } catch (Exception e) {
             //设置为退款失败的状态
@@ -912,7 +942,7 @@ public class PayOrderController extends BaseController
             payOrder.setStationId(null);
         }
         startPage();
-        payOrder.setStatus("1");
+        //payOrder.setStatus("1");
         List<PayOrder> payOrderList = payOrderService.selectLNGPayOrderExport(payOrder);
         return getDataTable(payOrderList);
     }
@@ -1109,7 +1139,7 @@ public class PayOrderController extends BaseController
             payOrder.setStationIdList(list);
             payOrder.setStationId(null);
         }
-        payOrder.setStatus("1");
+        //payOrder.setStatus("1");
         List<PayOrder> payOrderList = payOrderService.LNGDeptList(payOrder);
         AjaxResult ss = exportDeptExcel(payOrderList, "导出订单信息");
         return ss;
@@ -1164,6 +1194,9 @@ public class PayOrderController extends BaseController
                     cell = row.createCell(10);
                     cell.setCellValue("手机号");
                     cell.setCellStyle(style);
+                    cell = row.createCell(11);
+                    cell.setCellValue("付款状态(1付款成功，2线下退款，3线上退款)");
+                    cell.setCellStyle(style);
                 }else {
                     row = sheet.createRow(i);
                     int j =i-1;
@@ -1216,6 +1249,9 @@ public class PayOrderController extends BaseController
                     cell = row.createCell(10);
                     cell.setCellValue(payOrderList.get(j).getMobilePhone());
                     cell.setCellStyle(style);
+                    cell = row.createCell(11);
+                    cell.setCellValue(payOrderList.get(j).getStatus());
+                    cell.setCellStyle(style);
                 }
             }
             String filename = encodingFilename(sheetName);

yijia-station/src/main/java/com/yijia/station/controller/SysAppUserInfoController.java

@@ -3,8 +3,8 @@ package com.yijia.station.controller;
 import com.yijia.common.core.controller.BaseController;
 import com.yijia.common.core.domain.AjaxResult;
 import com.yijia.common.core.page.TableDataInfo;
-import com.yijia.station.domain.SysAppUserInfo;
-import com.yijia.station.service.ISysAppUserInfoService;
+import com.yijia.system.domain.SysAppUserInfo;
+import com.yijia.system.service.ISysAppUserInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

yijia-station/src/main/java/com/yijia/station/domain/PayOrder.java

@@ -31,7 +31,7 @@ public class PayOrder extends BaseEntity
     private Long stationId;
     /** 油站名称 */
     private String stationName;
-
+    @Excel(name = "支付状态",readConverterExp="1=支付成功,2=线下退款,3=线上退款")
     /** 状态(0未支付，1，已支付) */
     private String status;
 
@@ -235,6 +235,10 @@ public class PayOrder extends BaseEntity
 
     private Integer countNum;
 
+    private Integer num;
+
+    private Long printNum;
+
 
     //退款人员id
     private Long refundUser;
@@ -253,6 +257,92 @@ public class PayOrder extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date examinDate;
 
+    /** 退款时间*/
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String startDate;
+
+
+    /** 审核时间*/
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String endDate;
+
+    //退款查询状态
+    private String refundSelectFalg;
+
+
+    private String userName;
+
+    //用于班结订单的展示信息
+    private BigDecimal refundAmt ;
+
+    //第三方支付类型，01是随行付，02云闪付
+    private String thirdPayment;
+
+
+    public String getThirdPayment() {
+        return thirdPayment;
+    }
+
+    public void setThirdPayment(String thirdPayment) {
+        this.thirdPayment = thirdPayment;
+    }
+
+    public BigDecimal getRefundAmt() {
+        return refundAmt;
+    }
+
+    public void setRefundAmt(BigDecimal refundAmt) {
+        this.refundAmt = refundAmt;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public Long getPrintNum() {
+        return printNum;
+    }
+
+    public void setPrintNum(Long printNum) {
+        this.printNum = printNum;
+    }
+
+    public Integer getNum() {
+        return num;
+    }
+
+    public void setNum(Integer num) {
+        this.num = num;
+    }
+
+    public String getRefundSelectFalg() {
+        return refundSelectFalg;
+    }
+
+    public void setRefundSelectFalg(String refundSelectFalg) {
+        this.refundSelectFalg = refundSelectFalg;
+    }
+
     public Integer getDzkNum() {
         return dzkNum;
     }

yijia-station/src/main/java/com/yijia/station/mapper/PayOrderMapper.java

@@ -1,8 +1,9 @@
 package com.yijia.station.mapper;
 
-import java.util.List;
 import com.yijia.station.domain.PayOrder;
 
+import java.util.List;
+
 /**
  * 订单支付Mapper接口
  *
@@ -27,6 +28,81 @@ public interface PayOrderMapper
      */
     public List<PayOrder> selectPayOrderList(PayOrder payOrder);
 
+
+    /**
+     * 查询订单支付列表
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public List<PayOrder> selectAllPayOrderList(PayOrder payOrder);
+
+    /**
+     * 按照支付方式查询的订单
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public List<PayOrder> listPayTypeOrder(PayOrder payOrder);
+
+
+    /**
+     * 查询员工的订单信息进行统计
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public List<PayOrder> selectPersonnelPayOrder(PayOrder payOrder);
+
+    /**
+     * 查询班结统计信息
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public PayOrder selectSummyClassPayOrder(PayOrder payOrder);
+
+    /**
+     * 按照油品信息分类统计
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public List<PayOrder> listOilPayOrder(PayOrder payOrder);
+
+
+    /**
+     * 按照油品信息分类合计
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public PayOrder listOilPayOrderSum(PayOrder payOrder);
+
+
+    /**
+     * 按照支付方式进行汇总
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public PayOrder selectPersonnelPayStructureSum(PayOrder payOrder);
+    /**
+     * 按照人员信息，查询班结信息,汇总数据
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public PayOrder listPersonnelPayOrderSum(PayOrder payOrder);
+
+    /**
+     * 按照人员信息，查询班结信息，分组
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public List<PayOrder> listPersonnelPayOrder(PayOrder payOrder);
+
     /**
      * 新增订单支付
      *

yijia-station/src/main/java/com/yijia/station/service/IPayOrderService.java

@@ -30,6 +30,86 @@ public interface IPayOrderService
      */
     public List<PayOrder> selectPayOrderList(PayOrder payOrder);
 
+
+    /**
+     * 查询订单支付列表
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public List<PayOrder> selectALlPayOrderList(PayOrder payOrder);
+
+
+    /**
+     * 查询员工的订单信息进行统计
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public List<PayOrder> selectPersonnelPayOrder(PayOrder payOrder);
+
+    /**
+     * 查询班结统计信息
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public PayOrder selectSummyClassPayOrder(PayOrder payOrder);
+
+
+
+    /**
+     * 按照油品信息分类统计
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public List<PayOrder> listOilPayOrder(PayOrder payOrder);
+
+
+    /**
+     * 按照人员信息进行统计
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public PayOrder listPersonnelPayOrderSum(PayOrder payOrder);
+
+    /**
+     * 按照油品信息分类合计
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public PayOrder listOilPayOrderSum(PayOrder payOrder);
+
+
+    /**
+     * 按照支付方式进行汇总
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public PayOrder selectPersonnelPayStructureSum(PayOrder payOrder);
+
+    /**
+     * 按照人员信息，查询班结信息，分组
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public List<PayOrder> listPersonnelPayOrder(PayOrder payOrder);
+
+
+
+    /**
+     * 按照支付方式查询的订单
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public List<PayOrder> listPayTypeOrder(PayOrder payOrder);
+
     /**
      * 新增订单支付
      *

yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java

@@ -3,6 +3,9 @@ package com.yijia.station.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.parser.Feature;
+import com.saobei.open.sdk.DefaultSaobeiApiClient;
+import com.saobei.open.sdk.model.requst.trade.SaobeiTradeRefundRequest;
+import com.saobei.open.sdk.model.response.trade.SaobeiTradeRefundResponse;
 import com.yijia.common.core.domain.AjaxResult;
 import com.yijia.common.core.domain.entity.SysDept;
 import com.yijia.customer.domain.CustomerGradeSetting;
@@ -17,9 +20,9 @@ import com.yijia.station.controller.HttpUtils;
 import com.yijia.station.controller.RSASignature;
 import com.yijia.station.controller.SXFPaySign;
 import com.yijia.station.domain.PayOrder;
-import com.yijia.station.domain.SysAppUserInfo;
+import com.yijia.system.domain.SysAppUserInfo;
 import com.yijia.station.mapper.PayOrderMapper;
-import com.yijia.station.mapper.SysAppUserInfoMapper;
+import com.yijia.system.mapper.SysAppUserInfoMapper;
 import com.yijia.station.service.IPayOrderService;
 import com.yijia.system.domain.SysRespon;
 import com.yijia.system.service.ISysDeptService;
@@ -27,7 +30,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.sql.SQLException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -86,6 +91,98 @@ public class PayOrderServiceImpl implements IPayOrderService
     }
 
     /**
+     * 查询订单支付列表
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付
+     */
+    @Override
+    public List<PayOrder> selectALlPayOrderList(PayOrder payOrder)
+    {
+        return payOrderMapper.selectAllPayOrderList(payOrder);
+    }
+
+    /**
+     * 查询员工的订单信息进行统计
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public List<PayOrder> selectPersonnelPayOrder(PayOrder payOrder){
+        return  payOrderMapper.selectPersonnelPayOrder(payOrder);
+    }
+
+    /**
+     * 查询班结统计信息
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public PayOrder selectSummyClassPayOrder(PayOrder payOrder){
+        return  payOrderMapper.selectSummyClassPayOrder(payOrder);
+    }
+
+
+    /**
+     * 按照油品信息分类统计
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public List<PayOrder> listOilPayOrder(PayOrder payOrder){
+        return payOrderMapper.listOilPayOrder(payOrder);
+    }
+
+    /**
+     * 按照人员信息进行分类，合计结果
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public PayOrder listPersonnelPayOrderSum(PayOrder payOrder){
+        return payOrderMapper.listPersonnelPayOrderSum(payOrder);
+    }
+
+    /**
+     * 按照油品信息分类合计
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public PayOrder listOilPayOrderSum(PayOrder payOrder){
+        return  payOrderMapper.listOilPayOrderSum(payOrder);
+    }
+
+
+    /**
+     * 按照支付方式进行汇总
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public PayOrder selectPersonnelPayStructureSum(PayOrder payOrder){
+        return  payOrderMapper.selectPersonnelPayStructureSum(payOrder);
+    }
+    /**
+     * 按照人员信息进行分类
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public List<PayOrder> listPersonnelPayOrder(PayOrder payOrder){
+        return payOrderMapper.listPersonnelPayOrder(payOrder);
+    }
+
+    /**
+     * 按照支付方式查询的订单
+     *
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public List<PayOrder> listPayTypeOrder(PayOrder payOrder){
+        return  payOrderMapper.listPayTypeOrder(payOrder);
+    }
+    /**
      * 新增订单支付
      *
      * @param payOrder 订单支付
@@ -401,11 +498,57 @@ public class PayOrderServiceImpl implements IPayOrderService
         return respon;
     }
 
+
+    private  SysRespon saoBeiRefund( String token,String mno,String termialId,String oldOrderNo,String amt) throws Exception  {
+        //创建client
+        DefaultSaobeiApiClient<SaobeiTradeRefundRequest, SaobeiTradeRefundResponse> client = new DefaultSaobeiApiClient<>(token);//令牌的token
+        //创建requst
+        SaobeiTradeRefundRequest requst = new SaobeiTradeRefundRequest();
+        Random random=new Random();
+        String result1 = "";
+        for (int i = 0; i < 6; i++) {
+            result1 += random.nextInt(10);
+        }
+        String ordNo = System.nanoTime() + result1;
+        requst.setPay_ver("110");//
+        requst.setPay_type("000");
+        requst.setService_id("030");
+        requst.setMerchant_no(mno);//商户号
+        requst.setTerminal_id(termialId);//终端号
+        requst.setTerminal_trace(ordNo);//退款时生成的终端流水号
+        requst.setTerminal_time(new SimpleDateFormat("yyyyMMddhhmmss").format(new Date()));//退款时间
+        requst.setOut_trade_no(oldOrderNo);//订单号
+        requst.setRefund_fee(amt);//退款金额，单位是分
+        //发送请求
+        System.out.println("请求报文:"+ JSON.toJSONString(requst));
+        SaobeiTradeRefundResponse response = client.execute(requst);
+        System.out.println("返回报文:"+JSON.toJSONString(response));
+
+        SysRespon sysRespon=new SysRespon();
+        HashMap<String, Object> result = JSON.parseObject(JSON.toJSONString(response), LinkedHashMap.class, Feature.OrderedField);
+        if("01".equals(result.get("return_code"))){
+            if("退款成功".equals(result.get("return_msg"))){
+                sysRespon.setResponCode("0000");
+                sysRespon.setResponMessage("退款成功");
+            }else{
+                sysRespon.setResponCode("0001");
+                sysRespon.setResponMessage(result.get("return_msg")+"");
+            }
+        }else {
+            sysRespon.setResponCode("0002");
+            sysRespon.setResponMessage("网络请求失败");
+
+        }
+        return  sysRespon;
+
+    }
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public AjaxResult sxfRefund( PayOrder payOrder) throws  Exception
+    public AjaxResult sxfRefund( PayOrder payOrder1) throws  Exception
     {
         int i=0;
+           PayOrder payOrder=payOrderMapper.selectPayOrderById(payOrder1.getOrderId());
+             SysDept sysDept=deptService.selectDeptById(payOrder.getStationId());
             CustomerPointsRecord customerPointsRecord=new CustomerPointsRecord();
             customerPointsRecord.setOrderNo(payOrder.getOrderNo());
             List<CustomerPointsRecord> customerPointsRecordList= customerPointsRecordService.selectCustomerPointsRecordList(customerPointsRecord);
@@ -461,9 +604,19 @@ public class PayOrderServiceImpl implements IPayOrderService
             if(i==0){
              throw  new SQLException("订单更新失败");
             }
-            SysRespon respon= sendSxfRefund(payOrder);
-            if(!"0000".equals(respon.getResponCode())){
-                throw  new SQLException(respon.getResponMessage());
+            SysRespon respon= new SysRespon();
+            if("02".equals(payOrder.getThirdPayment())){
+                String  amt= payOrder.getAmt().multiply(BigDecimal.valueOf(100))+"";
+                amt=amt.substring(0,amt.length()-3);
+                respon= saoBeiRefund(sysDept.getYunKey(),sysDept.getMerchantNo(),sysDept.getTerminalId(),payOrder.getOrderNo(),amt);
+                if (!"0000".equals(respon.getResponCode())) {
+                    throw new SQLException(respon.getResponMessage());
+                }
+            }else {
+                respon= sendSxfRefund(payOrder);
+                if (!"0000".equals(respon.getResponCode())) {
+                    throw new SQLException(respon.getResponMessage());
+                }
             }
         return AjaxResult.success(1);
     }

yijia-station/src/main/resources/mapper/station/PayOrderMapper.xml

@@ -64,6 +64,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="examinStatus"    column="examin_status"  />
         <result property="refundSuccessDate"    column="refund_success_date"  />
         <result property="dzkNum"    column="dzk_num"  />
+        <result property="num"    column="num"  />
+        <result property="printNum"    column="print_num"  />
+        <result property="userName"    column="user_name"  />
+        <result property="thirdPayment"    column="third_payment"  />
     </resultMap>
 
 
@@ -73,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           discount_coupon_amt, discount_coupon, wx_amt, zfb_amt, pos_amt, xj_amt, didi_app_amt, ty_app_amt,
            other_amt, dzk_amt, score, member_no, member_amt, print_count, pay_type, pay_way, oil_personnel,
             pay_date, created_date, order_type, car_no, customer_phone, customer_grade,sell_amt,sell_discount_amt,driver_discount_amt,
-            examin_user,examin_date,refund_user,refund_date,examin_status,refund_success_date
+            examin_user,examin_date,refund_user,refund_date,examin_status,refund_success_date,p.third_payment
             from pay_order p join sys_dept d on p.station_id =d.dept_id
     </sql>
 
@@ -83,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderNo != null  and orderNo != ''"> and order_no like concat('%', #{orderNo}, '%')</if>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="status != null  and status != ''"> and p.status = #{status}</if>
-            <if test="status == null  or status == ''"> and p.status != 0</if>
+            <if test="status == null  or status == ''"> and p.status != 0  and p.status != 5 </if>
             <if test="consumerId != null "> and consumer_id = #{consumerId}</if>
             <if test="consumer != null  and consumer != ''"> and consumer like concat('%', #{consumer}, '%')</if>
             <if test="oilGun != null  and oilGun != ''"> and oil_gun = #{oilGun}</if>
@@ -121,16 +125,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="customerGrade != null  and customerGrade != ''"> and customer_grade = #{customerGrade}</if>
             <if test="refundUser != null  and refundUser != ''"> and refund_user = #{refundUser}</if>
             <if test="refundDate != null  and refundDate != ''"> and refund_date = #{refundDate}</if>
+            <if test="thirdPayment != null  and thirdPayment != ''"> and p.third_payment = #{thirdPayment}</if>
             <if test="examinUser != null  and examinUser != ''"> and examin_user = #{examinUser}</if>
             <if test="examinDate != null  and examinDate != ''"> and examin_date = #{examinDate}</if>
             <if test="examinStatus != null  and examinStatus != ''">
             <if test="examinStatus == '-1'">
-                and examin_status !=0 and examin_status !=null
+                and examin_status !=0 and examin_status is not NULL
             </if>
              <if test="examinStatus != '-1'">
                  and examin_status = #{examinStatus}
               </if>
-
              </if>
             <if test="likeConsumer != null  and likeConsumer != ''"> and consumer  like concat('%',#{likeConsumer}, '%')</if>
             <if test="likeCarNo != null  and likeCarNo != ''"> and car_no  like concat('%',#{likeCarNo}, '%') </if>
@@ -162,15 +166,159 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by order_id desc
     </select>
 
+
+
+
+    <select id="selectAllPayOrderList" parameterType="PayOrder" resultMap="PayOrderResult">
+        SELECT
+        p.order_id,
+        p.order_no,
+        p.station_id,
+        d.dept_name AS station_name,
+        p.STATUS,
+        p.consumer_id,
+        p.consumer,
+        p.oil_gun,
+        p.oil_name,
+        p.oil_pirce,
+        p.oil_type,
+        p.order_liters,
+        p.amt,
+        p.receivable_amt,
+        p.received_amt,
+        p.discount_amt,
+        p.sell_oil_price,
+        p.driver_oil_price,
+        p.oil_personnel_id,
+        p.discount_coupon_amt,
+        p.discount_coupon,
+        p.wx_amt,
+        p.zfb_amt,
+        p.pos_amt,
+        p.xj_amt,
+        p.didi_app_amt,
+        p.ty_app_amt,
+        p.other_amt,
+        p.dzk_amt,
+        p.score,
+        p.member_no,
+        p.member_amt,
+        p.print_count,
+        p.pay_type,
+        p.pay_way,
+        p.oil_personnel,
+        p.pay_date,
+        p.created_date,
+        p.order_type,
+        p.car_no,
+        p.customer_phone,
+        p.customer_grade,
+        p.sell_amt,
+        p.sell_discount_amt,
+        p.driver_discount_amt,
+        p.examin_user,
+        p.examin_date,
+        p.refund_user,
+        p.refund_date,
+        p.examin_status,
+        p.refund_success_date,
+        p.third_payment
+        FROM
+        pay_order p
+        JOIN sys_dept d ON p.station_id = d.dept_id
+        left  join  app_user_info  a  on p.consumer_id=a.user_id
+        <where>
+            <if test="orderNo != null  and orderNo != ''"> and p.order_no like concat('%', #{orderNo}, '%')</if>
+            <if test="stationId != null "> and p.station_id = #{stationId}</if>
+            <if test="status != null  and status != ''"> and p.status = #{status}</if>
+            <if test="status == null  or status == ''"> and p.status != 5 </if>
+            <if test="consumerId != null "> and p.consumer_id = #{consumerId}</if>
+            <if test="consumer != null  and consumer != ''"> and p.consumer like concat('%', #{consumer}, '%')</if>
+            <if test="oilGun != null  and oilGun != ''"> and p.oil_gun = #{oilGun}</if>
+            <if test="oilName != null  and oilName != ''"> and p.oil_name like concat('%', #{oilName}, '%')</if>
+            <if test="oilPirce != null "> and p.oil_pirce = #{oilPirce}</if>
+            <if test="oilType != null  and oilType != ''"> and p.oil_type = #{oilType}</if>
+            <if test="orderLiters != null "> and p.order_liters = #{orderLiters}</if>
+            <if test="amt != null "> and p.amt = #{amt}</if>
+            <if test="receivableAmt != null "> and p.receivable_amt = #{receivableAmt}</if>
+            <if test="receivedAmt != null "> and p.received_amt = #{receivedAmt}</if>
+            <if test="discountAmt != null "> and p.discount_amt = #{discountAmt}</if>
+            <if test="discountCouponAmt != null "> and p.discount_coupon_amt = #{discountCouponAmt}</if>
+            <if test="discountCoupon != null  and discountCoupon != ''"> and p.discount_coupon = #{discountCoupon}</if>
+            <if test="wxAmt != null "> and p.wx_amt = #{wxAmt}</if>
+            <if test="zfbAmt != null "> and p.zfb_amt = #{zfbAmt}</if>
+            <if test="posAmt != null "> and p.pos_amt = #{posAmt}</if>
+            <if test="xjAmt != null "> and p.xj_amt = #{xjAmt}</if>
+            <if test="didiAppAmt != null "> and p.didi_app_amt = #{didiAppAmt}</if>
+            <if test="tyAppAmt != null "> and p.ty_app_amt = #{tyAppAmt}</if>
+            <if test="otherAmt != null "> and p.other_amt = #{otherAmt}</if>
+            <if test="dzkAmt != null "> and p.dzk_amt = #{dzkAmt}</if>
+            <if test="score != null "> and p.score = #{score}</if>
+            <if test="memberNo != null  and memberNo != ''"> and p.member_no = #{memberNo}</if>
+            <if test="memberAmt != null "> and p.member_amt = #{memberAmt}</if>
+            <if test="printCount != null "> and p.print_count = #{printCount}</if>
+            <if test="payType != null  and payType != ''"> and p.pay_type = #{payType}</if>
+            <if test="payWay != null  and payWay != ''"> and p.pay_way = #{payWay}</if>
+            <if test="oilPersonnel != null  and oilPersonnel != ''"> and p.oil_personnel = #{oilPersonnel}</if>
+            <if test="oilPersonnelId != null  and oilPersonnelId != ''"> and p.oil_personnel_id = #{oilPersonnelId}</if>
+            <if test="payDate != null "> and p.pay_date = #{payDate}</if>
+            <if test="createdDate != null "> and p.created_date = #{createdDate}</if>
+            <if test="orderType != null  and orderType != ''"> and p.order_type = #{orderType}</if>
+            <if test="carNo != null  and carNo != ''"> and p.car_no = #{carNo}</if>
+            <if test="customerPhone != null  and customerPhone != ''"> and p.customer_phone = #{customerPhone}</if>
+            <if test="customerGrade != null  and customerGrade != ''"> and p.customer_grade = #{customerGrade}</if>
+            <if test="refundUser != null  and refundUser != ''"> and p.refund_user = #{refundUser}</if>
+            <if test="refundDate != null  and refundDate != ''"> and p.refund_date = #{refundDate}</if>
+            <if test="thirdPayment != null  and thirdPayment != ''"> and p.third_payment = #{thirdPayment}</if>
+            <if test="examinUser != null  and examinUser != ''"> and p.examin_user = #{examinUser}</if>
+            <if test="examinDate != null  and examinDate != ''"> and p.examin_date = #{examinDate}</if>
+            <if test="examinStatus != null  and examinStatus != ''">
+                <if test="examinStatus == '-1'">
+                    and p.examin_status !=0 and p.examin_status is not NULL
+                </if>
+                <if test="examinStatus != '-1'">
+                    and p.examin_status = #{examinStatus}
+                </if>
+            </if>
+            <if test="likeConsumer != null  and likeConsumer != ''"> and p.consumer  like concat('%',#{likeConsumer}, '%')</if>
+            <if test="likeCarNo != null  and likeCarNo != ''"> and p.car_no  like concat('%',#{likeCarNo}, '%') </if>
+            <if test="likeCustomerPhone != null  and likeCustomerPhone != ''"> and p.customer_phone  like concat('%',#{likeCustomerPhone}, '%') </if>
+            <if test="refundSuccessStatus == '1'.toString()  ">
+                <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                    AND date_format(p.refund_success_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
+                </if>
+                <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                    AND date_format(p.refund_success_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
+                </if>
+            </if>
+            <if test="refundSuccessStatus != '1'.toString() ">
+                <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                    AND date_format(p.created_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
+                </if>
+                <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                    AND date_format(p.created_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
+                </if>
+            </if>
+            <if test="stationIdList != null ">
+                and p.station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        order by p.created_date desc
+    </select>
+
     <!--查询导出数据-->
     <select id="selectPayOrderExport" parameterType="PayOrder" resultMap="PayOrderResult">
-        select order_no,oil_name,oil_pirce,order_liters, amt,consumer,oil_personnel,oil_gun,pay_type,pay_way,sell_oil_price,driver_oil_price
+        select order_no,oil_name,oil_pirce,order_liters, amt,consumer,oil_personnel,oil_gun,pay_type,pay_way,sell_oil_price,driver_oil_price,status
         from pay_order
         <where>
             <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="status == null  or status == ''"> and p.status != 0</if>
+            <if test="status == null  or status == ''"> and status != 0 and status != 5</if>
             <if test="consumerId != null "> and consumer_id = #{consumerId}</if>
             <if test="consumer != null  and consumer != ''"> and consumer = #{consumer}</if>
             <if test="oilGun != null  and oilGun != ''"> and oil_gun = #{oilGun}</if>
@@ -236,7 +384,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderNo != null  and orderNo != ''"> and p.order_no = #{orderNo}</if>
             <if test="stationId != null "> and p.station_id = #{stationId}</if>
             <if test="status != null  and status != ''"> and p.status = #{status}</if>
-            <if test="status == null  or status == ''"> and p.status != 0</if>
+            <if test="status == null  or status == ''"> and p.status != 0  and p.status != 5 </if>
             <if test="consumerId != null "> and consumer_id = #{consumerId}</if>
             <if test="consumer != null  and consumer != ''"> and consumer = #{consumer}</if>
             <if test="oilGun != null  and oilGun != ''"> and oil_gun = #{oilGun}</if>
@@ -298,12 +446,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT order_id,dept_name as station_name,oil_name,order_no,p.oil_pirce,order_liters,receivable_amt,amt,sell_amt,sell_discount_amt,discount_amt,pay_date,mobile_phone,sell_oil_price,driver_oil_price,driver_discount_amt,p.status
         from pay_order p
         left join sys_dept d on d.dept_id =p.station_id
-        join app_user_info a on a.user_id=p.consumer_id
+        left  join app_user_info a on a.user_id=p.consumer_id
         <where>
             <if test="orderNo != null  and orderNo != ''"> and p.order_no = #{orderNo}</if>
             <if test="stationId != null "> and p.station_id = #{stationId}</if>
-            <if test="status != null  and status != ''"> and (p.status = #{status} or p.status=2)</if>
-            <if test="status == null  or status == ''"> and p.status != 0</if>
+            <if test="status != null  and status != ''"> and p.status = #{status} </if>
+            <if test="status == null  or status == ''"> and p.status != 0 and p.status != 5 </if>
             <if test="consumerId != null "> and consumer_id = #{consumerId}</if>
             <if test="consumer != null  and consumer != ''"> and consumer = #{consumer}</if>
             <if test="oilGun != null  and oilGun != ''"> and oil_gun = #{oilGun}</if>
@@ -366,12 +514,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         concat(LEFT (mobile_phone, 3), '****', RIGHT (mobile_phone, 4))  mobile_phone,p.status
         from pay_order p
         left join sys_dept d on d.dept_id =p.station_id
-        join app_user_info a on a.user_id=p.consumer_id
+        left join app_user_info a on a.user_id=p.consumer_id
         <where>
             <if test="orderNo != null  and orderNo != ''"> and p.order_no = #{orderNo}</if>
             <if test="stationId != null "> and p.station_id = #{stationId}</if>
-            <if test="status != null  and status != ''"> and (p.status = #{status} or p.status=2)</if>
-            <if test="status == null  or status == ''"> and p.status != 0</if>
+            <if test="status != null  and status != ''"> and p.status = #{status} </if>
+            <if test="status == null  or status == ''"> and p.status != 0   and p.status != 5 </if>
             <if test="consumerId != null "> and p.consumer_id = #{consumerId}</if>
             <if test="consumer != null  and consumer != ''"> and consumer = #{consumer}</if>
             <if test="oilGun != null  and oilGun != ''"> and oil_gun = #{oilGun}</if>
@@ -434,12 +582,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         concat(LEFT (mobile_phone, 3), '****', RIGHT (mobile_phone, 4))  mobile_phone,p.status
         from pay_order p
         left join sys_dept d on d.dept_id =p.station_id
-        join app_user_info a on a.user_id=p.consumer_id
+        left  join app_user_info a on a.user_id=p.consumer_id
         <where>
             <if test="orderNo != null  and orderNo != ''"> and p.order_no = #{orderNo}</if>
             <if test="stationId != null "> and p.station_id = #{stationId}</if>
             <if test="status != null  and status != ''"> and p.status = #{status}</if>
-            <if test="status == null  or status == ''"> and p.status != 0</if>
+            <if test="status == null  or status == ''"> and p.status != 0 and p.status != 5 </if>
             <if test="consumerId != null "> and p.consumer_id = #{consumerId}</if>
             <if test="consumer != null  and consumer != ''"> and consumer = #{consumer}</if>
             <if test="oilGun != null  and oilGun != ''"> and oil_gun = #{oilGun}</if>
@@ -495,9 +643,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         oil_name, oil_pirce, oil_type, order_liters, amt, receivable_amt, received_amt, discount_amt,sell_oil_price,driver_oil_price,
         discount_coupon_amt, discount_coupon, wx_amt, zfb_amt, pos_amt, xj_amt, didi_app_amt, ty_app_amt,
         other_amt, dzk_amt, score, member_no, member_amt, print_count, pay_type, pay_way, oil_personnel,oil_personnel_id,
-        pay_date, created_date, order_type, car_no,customer_grade,sell_amt,sell_discount_amt,d.mobile_phone as customer_phone,
-        examin_user,examin_date,refund_user,refund_date,examin_status
-        from pay_order p join app_user_info d on p.consumer_id =d.user_id
+        pay_date, created_date, order_type, car_no,customer_grade,sell_amt,sell_discount_amt,
+        examin_user,examin_date,refund_user,refund_date,examin_status,refund_success_date,p.third_payment
+        from pay_order p
         where order_id = #{orderId}
     </select>
     <select id="selectDaySources" parameterType="PayOrder" resultMap="PayOrderResult">
@@ -505,8 +653,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from pay_order
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
-            <if test="status != null "> and status = #{status}</if>
-            <if test="status == null  or status == ''"> and status != 0</if>
+            <if test="status != null "> and (status = #{status} or status=2 )</if>
+            <if test="status == null  or status == ''"> and status != 0 and status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="createdDate != null "> and created_date like concat(#{createdDate}, '%') </if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
@@ -530,7 +678,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="status != null "> and (status = #{status} or status=2)</if>
-            <if test="status == null  or status == ''"> and status != 0</if>
+            <if test="status == null  or status == ''"> and status != 0 and status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="createdDate != null "> and created_date like concat(#{createdDate}, '%') </if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
@@ -556,7 +704,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="status != null "> and status = #{status}</if>
-            <if test="status == null  or status == ''"> and status != 0</if>
+            <if test="status == null  or status == ''"> and status != 0 and status != 5</if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="createdDate != null "> and created_date = #{createdDate}</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
@@ -582,7 +730,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="status != null "> and (status = #{status} or status=2)</if>
-            <if test="status == null  or status == ''"> and status != 0</if>
+            <if test="status == null  or status == ''"> and status != 0 and status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="createdDate != null "> and created_date = #{createdDate}</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
@@ -609,7 +757,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="status != null "> and status = #{status}</if>
-            <if test="status == null  or status == ''"> and status != 0</if>
+            <if test="status == null  or status == ''"> and status != 0  and status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="createdDate != null "> and created_date = #{createdDate}</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
@@ -636,7 +784,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="status != null "> and (status = #{status} or status=2)</if>
-            <if test="status == null  or status == ''"> and status != 0</if>
+            <if test="status == null  or status == ''"> and status != 0 and status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="createdDate != null "> and created_date = #{createdDate}</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
@@ -661,7 +809,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="status != null "> and status = #{status}</if>
-            <if test="status == null  or status == ''"> and status != 0</if>
+            <if test="status == null  or status == ''"> and status != 0 and status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="createdDate != null "> and created_date = #{createdDate}</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
@@ -686,7 +834,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="status != null "> and (status = #{status} or status=2)</if>
-            <if test="status == null  or status == ''"> and status != 0</if>
+            <if test="status == null  or status == ''"> and status != 0 and status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="createdDate != null "> and created_date = #{createdDate}</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
@@ -733,7 +881,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and a.station_id = #{stationId}</if>
             <if test="status != null "> and a.status = #{status}</if>
-            <if test="status == null  or status == ''"> and a.status != 0</if>
+            <if test="status == null  or status == ''"> and a.status != 0 and a.status != 5</if>
             <if test="orderType != null  and orderType != ''"> and a.order_type = #{orderType}</if>
             <if test="stationIdList != null ">
                 and a.station_id in
@@ -777,7 +925,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and a.station_id = #{stationId}</if>
             <if test="status != null "> and (a.status = #{status} or a.status=2)</if>
-            <if test="status == null  or status == ''"> and a.status != 0</if>
+            <if test="status == null  or status == ''"> and a.status != 0 and a.status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and a.order_type = #{orderType}</if>
             <if test="stationIdList != null ">
                 and a.station_id in
@@ -801,6 +949,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="status == null  or status == ''"> and status != 0 and status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="oilName != null "> and oil_name = #{oilName}</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
@@ -826,6 +975,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="status == null  or status == ''"> and status != 0 and status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
                 AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
@@ -845,18 +995,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <!--查询数据，根据员工汇总数据-->
-    <select id="selectPersonnelStructure" parameterType="Long" resultMap="PayOrderResult">
+    <select id="selectPersonnelPayOrder" parameterType="PayOrder" resultMap="PayOrderResult">
         SELECT a.oil_personnel,GROUP_CONCAT(DISTINCT a.oil_gun) as oil_gun,ROUND(SUM(a.amt),2) as amt,ROUND(SUM(order_liters),2) as order_liters,COUNT(order_no) as order_no
         from pay_order a
         <where>
             <if test="stationId != null "> and a.station_id = #{stationId}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="status == null  or status == ''"> and status != 0 and status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
-            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
-                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
+            <if test="startDate != null and startDate != ''"><!-- 开始时间检索 -->
+                AND date_format(pay_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{startDate},'%Y-%m-%d %H:%i:%s')
             </if>
-            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
-                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
+            <if test="endDate != null and endDate != ''"><!-- 结束时间检索 -->
+                AND date_format(pay_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endDate},'%Y-%m-%d %H:%i:%s')
             </if>
             <if test="stationIdList != null ">
                 and station_id in
@@ -868,6 +1019,186 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         GROUP BY a.oil_personnel
     </select>
+
+
+
+     <!--按照人员下统计信息-->
+    <select id="listPersonnelPayOrderSum" parameterType="PayOrder" resultMap="PayOrderResult">
+        SELECT
+        SUM( amt ) AS amt,
+        SUM( order_liters ) AS order_liters,
+        SUM( order_no ) AS order_no
+        FROM
+        (
+        SELECT
+        a.oil_personnel,
+        GROUP_CONCAT( DISTINCT a.oil_gun ) AS oil_gun,
+        ROUND( SUM( a.amt ), 2 ) AS amt,
+        ROUND( SUM( order_liters ), 2 ) AS order_liters,
+        COUNT( order_no ) AS order_no
+        FROM
+        pay_order a
+        <where>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+            <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+            <if test="status != null and status != ''"> and status = #{status}</if>
+            <if test="status == null or status == ''"> and status !=0 and status != 5 </if>
+            <if test="startDate != null and startDate != ''"><!-- 开始时间检索 -->
+                AND date_format(pay_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{startDate},'%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endDate != null and endDate != ''"><!-- 结束时间检索 -->
+                AND date_format(pay_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endDate},'%Y-%m-%d %H:%i:%s')
+            </if>
+        </where>
+        GROUP BY a.oil_personnel ) b
+    </select>
+    <select id="listPersonnelPayOrder" parameterType="PayOrder" resultMap="PayOrderResult">
+        SELECT
+        a.oil_personnel,
+        GROUP_CONCAT( DISTINCT a.oil_gun ) AS oil_gun,
+        ROUND( SUM( a.amt ), 2 ) AS amt,
+        ROUND( SUM( order_liters ), 2 ) AS order_liters,
+        COUNT( order_no ) AS order_no
+        FROM
+        pay_order a
+        <where>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+            <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+            <if test="status != null and status != ''"> and status = #{status}</if>
+            <if test="status == null or status == ''"> and status !=0 and status != 5 </if>
+            <if test="startDate != null and startDate != ''"><!-- 开始时间检索 -->
+                AND date_format(pay_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{startDate},'%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endDate != null and endDate != ''"><!-- 结束时间检索 -->
+                AND date_format(pay_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endDate},'%Y-%m-%d %H:%i:%s')
+            </if>
+        </where>
+        GROUP BY a.oil_personnel
+    </select>
+
+    <select id="listPayTypeOrder" parameterType="PayOrder" resultMap="PayOrderResult">
+        SELECT
+        a.pay_type,
+        GROUP_CONCAT( DISTINCT a.oil_gun ) AS oil_gun,
+        ROUND( SUM( a.amt ), 2 ) AS amt,
+        ROUND( SUM( order_liters ), 2 ) AS order_liters,
+        COUNT( order_no ) AS order_no
+        FROM
+        pay_order a
+        <where>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+            <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+            <if test="status != null and status != ''"> and status = #{status}</if>
+            <if test="status == null or status == ''"> and status !=0 and status != 5 </if>
+            <if test="startDate != null and startDate != ''"><!-- 开始时间检索 -->
+                AND date_format(pay_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{startDate},'%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endDate != null and endDate != ''"><!-- 结束时间检索 -->
+                AND date_format(pay_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endDate},'%Y-%m-%d %H:%i:%s')
+            </if>
+        </where>
+        GROUP BY a.pay_type
+    </select>
+
+    <!--查询班结的合计数据值-->
+    <select id="selectSummyClassPayOrder" parameterType="PayOrder" resultMap="PayOrderResult">
+        SELECT
+        s.station_id,
+        d.dept_name as station_name,
+        count( order_no ) AS num,
+        sum( order_liters ) AS order_liters,
+        sum( receivable_amt ) AS receivable_amt,
+        sum( amt ) AS amt,
+        sum( print_count ) AS print_num,
+        sum( wx_amt ) AS wx_amt,
+        sum( zfb_amt ) AS zfb_amt,
+        sum( dzk_amt ) AS dzk_amt,
+        sum( discount_amt ) AS discount_amt,
+        SUM( pos_amt ) AS pos_amt,
+        sum( xj_amt ) AS xj_amt
+        FROM
+        pay_order s left  join  sys_dept d on s.station_id=d.dept_id
+        <where>
+            <if test="stationId != null and stationId != ''"> and s.station_id = #{stationId}</if>
+            <if test="orderType != null  and orderType != ''"> and s.order_type = #{orderType}</if>
+            <if test="status != null  and status != ''"> and s.status = #{status}</if>
+            <if test="status == null  or status == ''"> and s.status !=0  and s.status != 5 </if>
+            <if test="refundSelectFalg != 1 ">
+                <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                    AND date_format(s.pay_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
+                </if>
+                <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                    AND date_format(s.pay_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
+                </if>
+            </if>
+            <if test="refundSelectFalg == 1 ">
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(s.refund_success_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(s.refund_success_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
+            </if>
+            </if>
+        </where>
+        GROUP BY station_id,d.dept_name
+    </select>
+    <!--按照油品信息获取分类当前班结的订单-->
+    <select id="listOilPayOrder" parameterType="PayOrder" resultMap="PayOrderResult">
+        SELECT
+        a.station_id,
+        a.oil_name,
+        GROUP_CONCAT( DISTINCT oil_gun ) AS oil_gun,
+        ROUND( SUM( a.amt ), 2 ) AS amt,
+        ROUND( SUM( a.receivable_amt ), 2 ) AS receivable_amt,
+        ROUND( SUM( a.received_amt ), 2 ) AS received_amt,
+        ROUND( SUM( order_liters ), 2 ) AS order_liters,
+        ROUND( SUM( a.discount_amt ), 2 ) AS discount_amt,
+        COUNT( order_no ) AS order_no,
+        sum( a.print_count) print_num
+        FROM
+        pay_order a
+        <where>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+            <if test="status != null and status != ''"> and status = #{status}</if>
+            <if test="status == null  or status == ''"> and status !=0  and status != 5 </if>
+            <if test="startDate != null and startDate != ''"><!-- 开始时间检索 -->
+                AND date_format(a.pay_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{startDate},'%y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endDate != null and endDate != ''"><!-- 结束时间检索 -->
+                AND date_format(a.pay_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endDate},'%y-%m-%d %H:%i:%s')
+            </if>
+        </where>
+        GROUP BY a.oil_name,a.station_id
+    </select>
+    <select id="listOilPayOrderSum" parameterType="PayOrder" resultMap="PayOrderResult">
+        SELECT SUM(amt) as amt,SUM(amt) as amt,SUM(order_liters)  as order_liters,sum(order_no) as order_no
+        from
+   (   SELECT
+        a.station_id,
+        a.oil_name,
+        GROUP_CONCAT( DISTINCT oil_gun ) AS oil_gun,
+        ROUND( SUM( a.amt ), 2 ) AS amt,
+        ROUND( SUM( a.receivable_amt ), 2 ) AS receivable_amt,
+        ROUND( SUM( a.received_amt ), 2 ) AS received_amt,
+        ROUND( SUM( order_liters ), 2 ) AS order_liters,
+        ROUND( SUM( a.discount_amt ), 2 ) AS discount_amt,
+        COUNT( order_no ) AS order_no,
+        sum( a.print_count) print_num
+        FROM
+        pay_order a
+        <where>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+            <if test="status != null and status != ''"> and status = #{status}</if>
+            <if test="status == null  or status == ''"> and status !=0  and status != 5 </if>
+            <if test="startDate != null and startDate != ''"><!-- 开始时间检索 -->
+                AND date_format(a.pay_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{startDate},'%y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endDate != null and endDate != ''"><!-- 结束时间检索 -->
+                AND date_format(a.pay_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endDate},'%y-%m-%d %H:%i:%s')
+            </if>
+        </where>
+        GROUP BY a.oil_name,a.station_id)c
+    </select>
     <!--初始化数据班结数据，根据油品汇总 -->
     <select id="selectOilStructure" parameterType="Long" resultMap="PayOrderResult">
         SELECT  a.oil_name,GROUP_CONCAT(DISTINCT oil_gun) as oil_gun,ROUND(SUM(a.amt),2) as amt,ROUND(SUM(order_liters),2) as order_liters,COUNT(order_no) as order_no
@@ -875,35 +1206,110 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and a.station_id = #{stationId}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="status == null or status == ''"> and status !=0 and status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
-                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
+                AND date_format(pay_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
             </if>
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
-                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
+                AND date_format(pay_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
             </if>
         </where>
         GROUP BY a.oil_name
     </select>
     <!--初始化数据班结数据，根据员工/支付方式汇总 -->
     <select id="selectPersonnelPayStructure" parameterType="Long" resultMap="PayOrderResult">
-        SELECT oil_personnel,GROUP_CONCAT(DISTINCT oil_gun) oil_gun,count(wx_amt) wx_num,count(zfb_amt) zfb_num,count(xj_amt) xj_num,
-        sum(discount_amt) discount_amt,SUM(discount_coupon_amt) discount_coupon_amt,SUM(wx_amt) wx_amt,SUM(zfb_amt) zfb_amt,
-        SUM(xj_amt) xj_amt,sum(member_amt) member_amt,sum(dzk_amt) dzk_amt,count(dzk_amt) dzk_num
-        from  pay_order a
+        SELECT
+        oil_personnel,
+        GROUP_CONCAT( DISTINCT oil_gun ) oil_gun,
+        count( wx_amt ) wx_num,
+        count( zfb_amt ) zfb_num,
+        count( xj_amt ) xj_num,
+        sum( discount_amt ) discount_amt,
+        SUM( discount_coupon_amt ) discount_coupon_amt,
+        SUM( wx_amt ) wx_amt,
+        SUM( zfb_amt ) zfb_amt,
+        SUM( xj_amt ) xj_amt,
+        sum( member_amt ) member_amt,
+        sum( dzk_amt ) dzk_amt,
+        count( dzk_amt ) dzk_num ,
+        user_name,
+        sum(amt) amt
+        FROM
+        pay_order a  left  join sys_user b  on a.refund_user=b.user_id
         <where>
             <if test="stationId != null "> and a.station_id = #{stationId}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="status == null  or status == ''"> and status !=0 </if>
+            <if test="status != null  and status != ''"> and a.status = #{status}</if>
+            <if test="status == null  or status == ''"> and a.status !=0  and a.status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
-            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
-                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
+            <if test="refundSelectFalg != 1">
+            <if test="startDate != null and startDate != ''"><!-- 开始时间检索 -->
+                AND date_format(a.pay_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{startDate},'%Y-%m-%d %H:%i:%s')
             </if>
-            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
-                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
+            <if test="endDate != null and endDate != ''"><!-- 结束时间检索 -->
+                AND date_format(a.pay_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endDate},'%Y-%m-%d %H:%i:%s')
+            </if>
+            </if>
+            <if test="refundSelectFalg == 1">
+                <if test="startDate != null and startDate != ''"><!-- 开始时间检索 -->
+                    AND date_format(a.refund_success_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{startDate},'%Y-%m-%d %H:%i:%s')
+                </if>
+                <if test="endDate != null and endDate != ''"><!-- 结束时间检索 -->
+                    AND date_format(a.refund_success_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endDate},'%Y-%m-%d %H:%i:%s')
+                </if>
             </if>
         </where>
-        GROUP BY a.oil_personnel
+        GROUP BY a.oil_personnel,b.user_name
+    </select>
+   <!--按照支付方式进行求和操作-->
+    <select id="selectPersonnelPayStructureSum" parameterType="Long" resultMap="PayOrderResult">
+        SELECT GROUP_CONCAT(DISTINCT oil_gun) oil_gun,
+        sum(discount_amt) discount_amt,
+        SUM(discount_coupon_amt) discount_coupon_amt,SUM(wx_amt) wx_amt,SUM(zfb_amt) zfb_amt,sum(dzk_amt) dzk_amt,
+        SUM(xj_amt) xj_amt,sum(dzk_amt) dzk_amt,
+        sum(e.xj_num)	xj_num,sum(e.zfb_num)	zfb_num,sum(e.wx_num)	wx_num,sum(e.dzk_num) dzk_num
+        from (
+        SELECT
+        oil_personnel,
+        GROUP_CONCAT( DISTINCT oil_gun ) oil_gun,
+        count( wx_amt ) wx_num,
+        count( zfb_amt ) zfb_num,
+        count( xj_amt ) xj_num,
+        sum( discount_amt ) discount_amt,
+        SUM( discount_coupon_amt ) discount_coupon_amt,
+        SUM( wx_amt ) wx_amt,
+        SUM( zfb_amt ) zfb_amt,
+        SUM( xj_amt ) xj_amt,
+        sum( member_amt ) member_amt,
+        sum( dzk_amt ) dzk_amt,
+        count( dzk_amt ) dzk_num ,
+        user_name,
+        sum(amt) amt
+        FROM
+        pay_order a  left  join sys_user b  on a.refund_user=b.user_id
+        <where>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+            <if test="status != null  and status != ''"> and a.status = #{status}</if>
+            <if test="status == null  or status == ''"> and a.status !=0 and a.status != 5 </if>
+            <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+            <if test="refundSelectFalg != 1">
+                <if test="startDate != null and startDate != ''"><!-- 开始时间检索 -->
+                    AND date_format(a.pay_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{startDate},'%Y-%m-%d %H:%i:%s')
+                </if>
+                <if test="endDate != null and endDate != ''"><!-- 结束时间检索 -->
+                    AND date_format(a.pay_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endDate},'%Y-%m-%d %H:%i:%s')
+                </if>
+            </if>
+            <if test="refundSelectFalg == 1">
+                <if test="startDate != null and startDate != ''"><!-- 开始时间检索 -->
+                    AND date_format(a.refund_success_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{startDate},'%Y-%m-%d %H:%i:%s')
+                </if>
+                <if test="endDate != null and endDate != ''"><!-- 结束时间检索 -->
+                    AND date_format(a.refund_success_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endDate},'%Y-%m-%d %H:%i:%s')
+                </if>
+            </if>
+        </where>
+        GROUP BY a.oil_personnel,b.user_name) e
     </select>
 <!--查询本站第一笔数据-->
     <select id="getPayOrderInfoMin" parameterType="Long" resultMap="PayOrderResult">
@@ -914,6 +1320,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
                 <if test="stationId != null "> and station_id = #{stationId}</if>
                 <if test="status != null  and status != ''"> and status = #{status}</if>
+                <if test="status == null  or status == ''"> and status !=0  and status != 5 </if>
                 <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             </where>
         )

yijia-station/src/main/resources/mapper/station/StationBalanceChangeMapper.xml

@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectStationBalanceChangeVo">
-        select c.id, c.station_id, c.order_no, c.type, c.amt, c.create_time, c.create_by,dept_name as station_name,u.nick_name as create_name
+        select c.id, c.station_id, c.order_no, c.type, c.amt, c.create_time, c.create_by,dept_name as station_name,u.nick_name as create_name,c.now_amt
 		from station_balance_change c
 		left join sys_dept d on c.station_id = d.dept_id
 		left join sys_user u on c.create_by =u.user_id

yijia-station/src/main/resources/mapper/station/StationClassesSummaryMapper.xml

@@ -61,10 +61,10 @@
                 and a.classes_no like concat('%', #{likeClassesNo}, '%')
             </if>
             <if test="beginTime != null and beginTime != ''"><!-- 查询班结开始时间检索 -->
-                AND a.date_format(end_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
+                AND date_format(a.end_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
             </if>
             <if test="endTime != null and endTime != ''"><!--  查询班结结束时间检索 -->
-                AND a.date_format(end_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
+                AND date_format(a.end_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
             </if>
         </where>
         order by a.id desc
@@ -116,6 +116,20 @@
         where id = #{id}
     </select>
 
+    <select id="selectStationClassSummaryMax" parameterType="StationClassesSummary" resultMap="StationClassesSummaryResult">
+        select a.id, a.classes_no, a.start_date, a.end_date, a.station_id, (b.dept_name) station_name , a.order_num, a.print_num, a.sale_liters,
+        a.sale_amt, a.amt, a.discount_amt, a.wx_amt, zfb_amt, a.dzk_amt, a.classes_man,a.refund_amt from station_classes_summary a
+        left  join sys_dept b on a.station_id=b.dept_id
+        where id = (
+        SELECT MAX(id) from station_classes_summary
+        <where>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+            <if test="status != null and status != ''"> and status = #{status}</if>
+        </where>
+        )
+    </select>
+
     <insert id="insertStationClassesSummary" parameterType="StationClassesSummary" useGeneratedKeys="true" keyProperty="id">
         insert into station_classes_summary
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -190,4 +204,10 @@
         </foreach>
     </delete>
 
+
+
+
+
+
+
 </mapper>

yijia-station/target/classes/mapper/station/PayOrderMapper.xml

@@ -64,6 +64,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="examinStatus"    column="examin_status"  />
         <result property="refundSuccessDate"    column="refund_success_date"  />
         <result property="dzkNum"    column="dzk_num"  />
+        <result property="num"    column="num"  />
+        <result property="printNum"    column="print_num"  />
+        <result property="userName"    column="user_name"  />
+        <result property="thirdPayment"    column="third_payment"  />
     </resultMap>
 
 
@@ -73,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           discount_coupon_amt, discount_coupon, wx_amt, zfb_amt, pos_amt, xj_amt, didi_app_amt, ty_app_amt,
            other_amt, dzk_amt, score, member_no, member_amt, print_count, pay_type, pay_way, oil_personnel,
             pay_date, created_date, order_type, car_no, customer_phone, customer_grade,sell_amt,sell_discount_amt,driver_discount_amt,
-            examin_user,examin_date,refund_user,refund_date,examin_status,refund_success_date
+            examin_user,examin_date,refund_user,refund_date,examin_status,refund_success_date,p.third_payment
             from pay_order p join sys_dept d on p.station_id =d.dept_id
     </sql>
 
@@ -83,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderNo != null  and orderNo != ''"> and order_no like concat('%', #{orderNo}, '%')</if>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="status != null  and status != ''"> and p.status = #{status}</if>
-            <if test="status == null  or status == ''"> and p.status != 0</if>
+            <if test="status == null  or status == ''"> and p.status != 0  and p.status != 5 </if>
             <if test="consumerId != null "> and consumer_id = #{consumerId}</if>
             <if test="consumer != null  and consumer != ''"> and consumer like concat('%', #{consumer}, '%')</if>
             <if test="oilGun != null  and oilGun != ''"> and oil_gun = #{oilGun}</if>
@@ -121,16 +125,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="customerGrade != null  and customerGrade != ''"> and customer_grade = #{customerGrade}</if>
             <if test="refundUser != null  and refundUser != ''"> and refund_user = #{refundUser}</if>
             <if test="refundDate != null  and refundDate != ''"> and refund_date = #{refundDate}</if>
+            <if test="thirdPayment != null  and thirdPayment != ''"> and p.third_payment = #{thirdPayment}</if>
             <if test="examinUser != null  and examinUser != ''"> and examin_user = #{examinUser}</if>
             <if test="examinDate != null  and examinDate != ''"> and examin_date = #{examinDate}</if>
             <if test="examinStatus != null  and examinStatus != ''">
             <if test="examinStatus == '-1'">
-                and examin_status !=0 and examin_status !=null
+                and examin_status !=0 and examin_status is not NULL
             </if>
              <if test="examinStatus != '-1'">
                  and examin_status = #{examinStatus}
               </if>
-
              </if>
             <if test="likeConsumer != null  and likeConsumer != ''"> and consumer  like concat('%',#{likeConsumer}, '%')</if>
             <if test="likeCarNo != null  and likeCarNo != ''"> and car_no  like concat('%',#{likeCarNo}, '%') </if>
@@ -162,15 +166,159 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by order_id desc
     </select>
 
+
+
+
+    <select id="selectAllPayOrderList" parameterType="PayOrder" resultMap="PayOrderResult">
+        SELECT
+        p.order_id,
+        p.order_no,
+        p.station_id,
+        d.dept_name AS station_name,
+        p.STATUS,
+        p.consumer_id,
+        p.consumer,
+        p.oil_gun,
+        p.oil_name,
+        p.oil_pirce,
+        p.oil_type,
+        p.order_liters,
+        p.amt,
+        p.receivable_amt,
+        p.received_amt,
+        p.discount_amt,
+        p.sell_oil_price,
+        p.driver_oil_price,
+        p.oil_personnel_id,
+        p.discount_coupon_amt,
+        p.discount_coupon,
+        p.wx_amt,
+        p.zfb_amt,
+        p.pos_amt,
+        p.xj_amt,
+        p.didi_app_amt,
+        p.ty_app_amt,
+        p.other_amt,
+        p.dzk_amt,
+        p.score,
+        p.member_no,
+        p.member_amt,
+        p.print_count,
+        p.pay_type,
+        p.pay_way,
+        p.oil_personnel,
+        p.pay_date,
+        p.created_date,
+        p.order_type,
+        p.car_no,
+        p.customer_phone,
+        p.customer_grade,
+        p.sell_amt,
+        p.sell_discount_amt,
+        p.driver_discount_amt,
+        p.examin_user,
+        p.examin_date,
+        p.refund_user,
+        p.refund_date,
+        p.examin_status,
+        p.refund_success_date,
+        p.third_payment
+        FROM
+        pay_order p
+        JOIN sys_dept d ON p.station_id = d.dept_id
+        left  join  app_user_info  a  on p.consumer_id=a.user_id
+        <where>
+            <if test="orderNo != null  and orderNo != ''"> and p.order_no like concat('%', #{orderNo}, '%')</if>
+            <if test="stationId != null "> and p.station_id = #{stationId}</if>
+            <if test="status != null  and status != ''"> and p.status = #{status}</if>
+            <if test="status == null  or status == ''"> and p.status != 5 </if>
+            <if test="consumerId != null "> and p.consumer_id = #{consumerId}</if>
+            <if test="consumer != null  and consumer != ''"> and p.consumer like concat('%', #{consumer}, '%')</if>
+            <if test="oilGun != null  and oilGun != ''"> and p.oil_gun = #{oilGun}</if>
+            <if test="oilName != null  and oilName != ''"> and p.oil_name like concat('%', #{oilName}, '%')</if>
+            <if test="oilPirce != null "> and p.oil_pirce = #{oilPirce}</if>
+            <if test="oilType != null  and oilType != ''"> and p.oil_type = #{oilType}</if>
+            <if test="orderLiters != null "> and p.order_liters = #{orderLiters}</if>
+            <if test="amt != null "> and p.amt = #{amt}</if>
+            <if test="receivableAmt != null "> and p.receivable_amt = #{receivableAmt}</if>
+            <if test="receivedAmt != null "> and p.received_amt = #{receivedAmt}</if>
+            <if test="discountAmt != null "> and p.discount_amt = #{discountAmt}</if>
+            <if test="discountCouponAmt != null "> and p.discount_coupon_amt = #{discountCouponAmt}</if>
+            <if test="discountCoupon != null  and discountCoupon != ''"> and p.discount_coupon = #{discountCoupon}</if>
+            <if test="wxAmt != null "> and p.wx_amt = #{wxAmt}</if>
+            <if test="zfbAmt != null "> and p.zfb_amt = #{zfbAmt}</if>
+            <if test="posAmt != null "> and p.pos_amt = #{posAmt}</if>
+            <if test="xjAmt != null "> and p.xj_amt = #{xjAmt}</if>
+            <if test="didiAppAmt != null "> and p.didi_app_amt = #{didiAppAmt}</if>
+            <if test="tyAppAmt != null "> and p.ty_app_amt = #{tyAppAmt}</if>
+            <if test="otherAmt != null "> and p.other_amt = #{otherAmt}</if>
+            <if test="dzkAmt != null "> and p.dzk_amt = #{dzkAmt}</if>
+            <if test="score != null "> and p.score = #{score}</if>
+            <if test="memberNo != null  and memberNo != ''"> and p.member_no = #{memberNo}</if>
+            <if test="memberAmt != null "> and p.member_amt = #{memberAmt}</if>
+            <if test="printCount != null "> and p.print_count = #{printCount}</if>
+            <if test="payType != null  and payType != ''"> and p.pay_type = #{payType}</if>
+            <if test="payWay != null  and payWay != ''"> and p.pay_way = #{payWay}</if>
+            <if test="oilPersonnel != null  and oilPersonnel != ''"> and p.oil_personnel = #{oilPersonnel}</if>
+            <if test="oilPersonnelId != null  and oilPersonnelId != ''"> and p.oil_personnel_id = #{oilPersonnelId}</if>
+            <if test="payDate != null "> and p.pay_date = #{payDate}</if>
+            <if test="createdDate != null "> and p.created_date = #{createdDate}</if>
+            <if test="orderType != null  and orderType != ''"> and p.order_type = #{orderType}</if>
+            <if test="carNo != null  and carNo != ''"> and p.car_no = #{carNo}</if>
+            <if test="customerPhone != null  and customerPhone != ''"> and p.customer_phone = #{customerPhone}</if>
+            <if test="customerGrade != null  and customerGrade != ''"> and p.customer_grade = #{customerGrade}</if>
+            <if test="refundUser != null  and refundUser != ''"> and p.refund_user = #{refundUser}</if>
+            <if test="refundDate != null  and refundDate != ''"> and p.refund_date = #{refundDate}</if>
+            <if test="thirdPayment != null  and thirdPayment != ''"> and p.third_payment = #{thirdPayment}</if>
+            <if test="examinUser != null  and examinUser != ''"> and p.examin_user = #{examinUser}</if>
+            <if test="examinDate != null  and examinDate != ''"> and p.examin_date = #{examinDate}</if>
+            <if test="examinStatus != null  and examinStatus != ''">
+                <if test="examinStatus == '-1'">
+                    and p.examin_status !=0 and p.examin_status is not NULL
+                </if>
+                <if test="examinStatus != '-1'">
+                    and p.examin_status = #{examinStatus}
+                </if>
+            </if>
+            <if test="likeConsumer != null  and likeConsumer != ''"> and p.consumer  like concat('%',#{likeConsumer}, '%')</if>
+            <if test="likeCarNo != null  and likeCarNo != ''"> and p.car_no  like concat('%',#{likeCarNo}, '%') </if>
+            <if test="likeCustomerPhone != null  and likeCustomerPhone != ''"> and p.customer_phone  like concat('%',#{likeCustomerPhone}, '%') </if>
+            <if test="refundSuccessStatus == '1'.toString()  ">
+                <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                    AND date_format(p.refund_success_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
+                </if>
+                <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                    AND date_format(p.refund_success_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
+                </if>
+            </if>
+            <if test="refundSuccessStatus != '1'.toString() ">
+                <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                    AND date_format(p.created_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
+                </if>
+                <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                    AND date_format(p.created_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
+                </if>
+            </if>
+            <if test="stationIdList != null ">
+                and p.station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        order by p.created_date desc
+    </select>
+
     <!--查询导出数据-->
     <select id="selectPayOrderExport" parameterType="PayOrder" resultMap="PayOrderResult">
-        select order_no,oil_name,oil_pirce,order_liters, amt,consumer,oil_personnel,oil_gun,pay_type,pay_way,sell_oil_price,driver_oil_price
+        select order_no,oil_name,oil_pirce,order_liters, amt,consumer,oil_personnel,oil_gun,pay_type,pay_way,sell_oil_price,driver_oil_price,status
         from pay_order
         <where>
             <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="status == null  or status == ''"> and p.status != 0</if>
+            <if test="status == null  or status == ''"> and status != 0 and status != 5</if>
             <if test="consumerId != null "> and consumer_id = #{consumerId}</if>
             <if test="consumer != null  and consumer != ''"> and consumer = #{consumer}</if>
             <if test="oilGun != null  and oilGun != ''"> and oil_gun = #{oilGun}</if>
@@ -236,7 +384,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderNo != null  and orderNo != ''"> and p.order_no = #{orderNo}</if>
             <if test="stationId != null "> and p.station_id = #{stationId}</if>
             <if test="status != null  and status != ''"> and p.status = #{status}</if>
-            <if test="status == null  or status == ''"> and p.status != 0</if>
+            <if test="status == null  or status == ''"> and p.status != 0  and p.status != 5 </if>
             <if test="consumerId != null "> and consumer_id = #{consumerId}</if>
             <if test="consumer != null  and consumer != ''"> and consumer = #{consumer}</if>
             <if test="oilGun != null  and oilGun != ''"> and oil_gun = #{oilGun}</if>
@@ -298,12 +446,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT order_id,dept_name as station_name,oil_name,order_no,p.oil_pirce,order_liters,receivable_amt,amt,sell_amt,sell_discount_amt,discount_amt,pay_date,mobile_phone,sell_oil_price,driver_oil_price,driver_discount_amt,p.status
         from pay_order p
         left join sys_dept d on d.dept_id =p.station_id
-        join app_user_info a on a.user_id=p.consumer_id
+        left  join app_user_info a on a.user_id=p.consumer_id
         <where>
             <if test="orderNo != null  and orderNo != ''"> and p.order_no = #{orderNo}</if>
             <if test="stationId != null "> and p.station_id = #{stationId}</if>
-            <if test="status != null  and status != ''"> and (p.status = #{status} or p.status=2)</if>
-            <if test="status == null  or status == ''"> and p.status != 0</if>
+            <if test="status != null  and status != ''"> and p.status = #{status} </if>
+            <if test="status == null  or status == ''"> and p.status != 0 and p.status != 5 </if>
             <if test="consumerId != null "> and consumer_id = #{consumerId}</if>
             <if test="consumer != null  and consumer != ''"> and consumer = #{consumer}</if>
             <if test="oilGun != null  and oilGun != ''"> and oil_gun = #{oilGun}</if>
@@ -366,12 +514,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         concat(LEFT (mobile_phone, 3), '****', RIGHT (mobile_phone, 4))  mobile_phone,p.status
         from pay_order p
         left join sys_dept d on d.dept_id =p.station_id
-        join app_user_info a on a.user_id=p.consumer_id
+        left join app_user_info a on a.user_id=p.consumer_id
         <where>
             <if test="orderNo != null  and orderNo != ''"> and p.order_no = #{orderNo}</if>
             <if test="stationId != null "> and p.station_id = #{stationId}</if>
-            <if test="status != null  and status != ''"> and (p.status = #{status} or p.status=2)</if>
-            <if test="status == null  or status == ''"> and p.status != 0</if>
+            <if test="status != null  and status != ''"> and p.status = #{status} </if>
+            <if test="status == null  or status == ''"> and p.status != 0   and p.status != 5 </if>
             <if test="consumerId != null "> and p.consumer_id = #{consumerId}</if>
             <if test="consumer != null  and consumer != ''"> and consumer = #{consumer}</if>
             <if test="oilGun != null  and oilGun != ''"> and oil_gun = #{oilGun}</if>
@@ -434,12 +582,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         concat(LEFT (mobile_phone, 3), '****', RIGHT (mobile_phone, 4))  mobile_phone,p.status
         from pay_order p
         left join sys_dept d on d.dept_id =p.station_id
-        join app_user_info a on a.user_id=p.consumer_id
+        left  join app_user_info a on a.user_id=p.consumer_id
         <where>
             <if test="orderNo != null  and orderNo != ''"> and p.order_no = #{orderNo}</if>
             <if test="stationId != null "> and p.station_id = #{stationId}</if>
             <if test="status != null  and status != ''"> and p.status = #{status}</if>
-            <if test="status == null  or status == ''"> and p.status != 0</if>
+            <if test="status == null  or status == ''"> and p.status != 0 and p.status != 5 </if>
             <if test="consumerId != null "> and p.consumer_id = #{consumerId}</if>
             <if test="consumer != null  and consumer != ''"> and consumer = #{consumer}</if>
             <if test="oilGun != null  and oilGun != ''"> and oil_gun = #{oilGun}</if>
@@ -495,9 +643,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         oil_name, oil_pirce, oil_type, order_liters, amt, receivable_amt, received_amt, discount_amt,sell_oil_price,driver_oil_price,
         discount_coupon_amt, discount_coupon, wx_amt, zfb_amt, pos_amt, xj_amt, didi_app_amt, ty_app_amt,
         other_amt, dzk_amt, score, member_no, member_amt, print_count, pay_type, pay_way, oil_personnel,oil_personnel_id,
-        pay_date, created_date, order_type, car_no,customer_grade,sell_amt,sell_discount_amt,d.mobile_phone as customer_phone,
-        examin_user,examin_date,refund_user,refund_date,examin_status
-        from pay_order p join app_user_info d on p.consumer_id =d.user_id
+        pay_date, created_date, order_type, car_no,customer_grade,sell_amt,sell_discount_amt,
+        examin_user,examin_date,refund_user,refund_date,examin_status,refund_success_date,p.third_payment
+        from pay_order p
         where order_id = #{orderId}
     </select>
     <select id="selectDaySources" parameterType="PayOrder" resultMap="PayOrderResult">
@@ -505,8 +653,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from pay_order
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
-            <if test="status != null "> and status = #{status}</if>
-            <if test="status == null  or status == ''"> and status != 0</if>
+            <if test="status != null "> and (status = #{status} or status=2 )</if>
+            <if test="status == null  or status == ''"> and status != 0 and status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="createdDate != null "> and created_date like concat(#{createdDate}, '%') </if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
@@ -530,7 +678,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="status != null "> and (status = #{status} or status=2)</if>
-            <if test="status == null  or status == ''"> and status != 0</if>
+            <if test="status == null  or status == ''"> and status != 0 and status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="createdDate != null "> and created_date like concat(#{createdDate}, '%') </if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
@@ -556,7 +704,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="status != null "> and status = #{status}</if>
-            <if test="status == null  or status == ''"> and status != 0</if>
+            <if test="status == null  or status == ''"> and status != 0 and status != 5</if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="createdDate != null "> and created_date = #{createdDate}</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
@@ -582,7 +730,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="status != null "> and (status = #{status} or status=2)</if>
-            <if test="status == null  or status == ''"> and status != 0</if>
+            <if test="status == null  or status == ''"> and status != 0 and status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="createdDate != null "> and created_date = #{createdDate}</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
@@ -609,7 +757,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="status != null "> and status = #{status}</if>
-            <if test="status == null  or status == ''"> and status != 0</if>
+            <if test="status == null  or status == ''"> and status != 0  and status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="createdDate != null "> and created_date = #{createdDate}</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
@@ -636,7 +784,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="status != null "> and (status = #{status} or status=2)</if>
-            <if test="status == null  or status == ''"> and status != 0</if>
+            <if test="status == null  or status == ''"> and status != 0 and status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="createdDate != null "> and created_date = #{createdDate}</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
@@ -661,7 +809,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="status != null "> and status = #{status}</if>
-            <if test="status == null  or status == ''"> and status != 0</if>
+            <if test="status == null  or status == ''"> and status != 0 and status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="createdDate != null "> and created_date = #{createdDate}</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
@@ -686,7 +834,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="status != null "> and (status = #{status} or status=2)</if>
-            <if test="status == null  or status == ''"> and status != 0</if>
+            <if test="status == null  or status == ''"> and status != 0 and status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="createdDate != null "> and created_date = #{createdDate}</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
@@ -733,7 +881,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and a.station_id = #{stationId}</if>
             <if test="status != null "> and a.status = #{status}</if>
-            <if test="status == null  or status == ''"> and a.status != 0</if>
+            <if test="status == null  or status == ''"> and a.status != 0 and a.status != 5</if>
             <if test="orderType != null  and orderType != ''"> and a.order_type = #{orderType}</if>
             <if test="stationIdList != null ">
                 and a.station_id in
@@ -777,7 +925,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and a.station_id = #{stationId}</if>
             <if test="status != null "> and (a.status = #{status} or a.status=2)</if>
-            <if test="status == null  or status == ''"> and a.status != 0</if>
+            <if test="status == null  or status == ''"> and a.status != 0 and a.status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and a.order_type = #{orderType}</if>
             <if test="stationIdList != null ">
                 and a.station_id in
@@ -801,6 +949,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="status == null  or status == ''"> and status != 0 and status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="oilName != null "> and oil_name = #{oilName}</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
@@ -826,6 +975,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="status == null  or status == ''"> and status != 0 and status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
                 AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
@@ -845,18 +995,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <!--查询数据，根据员工汇总数据-->
-    <select id="selectPersonnelStructure" parameterType="Long" resultMap="PayOrderResult">
+    <select id="selectPersonnelPayOrder" parameterType="PayOrder" resultMap="PayOrderResult">
         SELECT a.oil_personnel,GROUP_CONCAT(DISTINCT a.oil_gun) as oil_gun,ROUND(SUM(a.amt),2) as amt,ROUND(SUM(order_liters),2) as order_liters,COUNT(order_no) as order_no
         from pay_order a
         <where>
             <if test="stationId != null "> and a.station_id = #{stationId}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="status == null  or status == ''"> and status != 0 and status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
-            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
-                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
+            <if test="startDate != null and startDate != ''"><!-- 开始时间检索 -->
+                AND date_format(pay_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{startDate},'%Y-%m-%d %H:%i:%s')
             </if>
-            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
-                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
+            <if test="endDate != null and endDate != ''"><!-- 结束时间检索 -->
+                AND date_format(pay_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endDate},'%Y-%m-%d %H:%i:%s')
             </if>
             <if test="stationIdList != null ">
                 and station_id in
@@ -868,6 +1019,186 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         GROUP BY a.oil_personnel
     </select>
+
+
+
+     <!--按照人员下统计信息-->
+    <select id="listPersonnelPayOrderSum" parameterType="PayOrder" resultMap="PayOrderResult">
+        SELECT
+        SUM( amt ) AS amt,
+        SUM( order_liters ) AS order_liters,
+        SUM( order_no ) AS order_no
+        FROM
+        (
+        SELECT
+        a.oil_personnel,
+        GROUP_CONCAT( DISTINCT a.oil_gun ) AS oil_gun,
+        ROUND( SUM( a.amt ), 2 ) AS amt,
+        ROUND( SUM( order_liters ), 2 ) AS order_liters,
+        COUNT( order_no ) AS order_no
+        FROM
+        pay_order a
+        <where>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+            <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+            <if test="status != null and status != ''"> and status = #{status}</if>
+            <if test="status == null or status == ''"> and status !=0 and status != 5 </if>
+            <if test="startDate != null and startDate != ''"><!-- 开始时间检索 -->
+                AND date_format(pay_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{startDate},'%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endDate != null and endDate != ''"><!-- 结束时间检索 -->
+                AND date_format(pay_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endDate},'%Y-%m-%d %H:%i:%s')
+            </if>
+        </where>
+        GROUP BY a.oil_personnel ) b
+    </select>
+    <select id="listPersonnelPayOrder" parameterType="PayOrder" resultMap="PayOrderResult">
+        SELECT
+        a.oil_personnel,
+        GROUP_CONCAT( DISTINCT a.oil_gun ) AS oil_gun,
+        ROUND( SUM( a.amt ), 2 ) AS amt,
+        ROUND( SUM( order_liters ), 2 ) AS order_liters,
+        COUNT( order_no ) AS order_no
+        FROM
+        pay_order a
+        <where>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+            <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+            <if test="status != null and status != ''"> and status = #{status}</if>
+            <if test="status == null or status == ''"> and status !=0 and status != 5 </if>
+            <if test="startDate != null and startDate != ''"><!-- 开始时间检索 -->
+                AND date_format(pay_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{startDate},'%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endDate != null and endDate != ''"><!-- 结束时间检索 -->
+                AND date_format(pay_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endDate},'%Y-%m-%d %H:%i:%s')
+            </if>
+        </where>
+        GROUP BY a.oil_personnel
+    </select>
+
+    <select id="listPayTypeOrder" parameterType="PayOrder" resultMap="PayOrderResult">
+        SELECT
+        a.pay_type,
+        GROUP_CONCAT( DISTINCT a.oil_gun ) AS oil_gun,
+        ROUND( SUM( a.amt ), 2 ) AS amt,
+        ROUND( SUM( order_liters ), 2 ) AS order_liters,
+        COUNT( order_no ) AS order_no
+        FROM
+        pay_order a
+        <where>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+            <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+            <if test="status != null and status != ''"> and status = #{status}</if>
+            <if test="status == null or status == ''"> and status !=0 and status != 5 </if>
+            <if test="startDate != null and startDate != ''"><!-- 开始时间检索 -->
+                AND date_format(pay_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{startDate},'%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endDate != null and endDate != ''"><!-- 结束时间检索 -->
+                AND date_format(pay_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endDate},'%Y-%m-%d %H:%i:%s')
+            </if>
+        </where>
+        GROUP BY a.pay_type
+    </select>
+
+    <!--查询班结的合计数据值-->
+    <select id="selectSummyClassPayOrder" parameterType="PayOrder" resultMap="PayOrderResult">
+        SELECT
+        s.station_id,
+        d.dept_name as station_name,
+        count( order_no ) AS num,
+        sum( order_liters ) AS order_liters,
+        sum( receivable_amt ) AS receivable_amt,
+        sum( amt ) AS amt,
+        sum( print_count ) AS print_num,
+        sum( wx_amt ) AS wx_amt,
+        sum( zfb_amt ) AS zfb_amt,
+        sum( dzk_amt ) AS dzk_amt,
+        sum( discount_amt ) AS discount_amt,
+        SUM( pos_amt ) AS pos_amt,
+        sum( xj_amt ) AS xj_amt
+        FROM
+        pay_order s left  join  sys_dept d on s.station_id=d.dept_id
+        <where>
+            <if test="stationId != null and stationId != ''"> and s.station_id = #{stationId}</if>
+            <if test="orderType != null  and orderType != ''"> and s.order_type = #{orderType}</if>
+            <if test="status != null  and status != ''"> and s.status = #{status}</if>
+            <if test="status == null  or status == ''"> and s.status !=0  and s.status != 5 </if>
+            <if test="refundSelectFalg != 1 ">
+                <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                    AND date_format(s.pay_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
+                </if>
+                <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                    AND date_format(s.pay_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
+                </if>
+            </if>
+            <if test="refundSelectFalg == 1 ">
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(s.refund_success_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(s.refund_success_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
+            </if>
+            </if>
+        </where>
+        GROUP BY station_id,d.dept_name
+    </select>
+    <!--按照油品信息获取分类当前班结的订单-->
+    <select id="listOilPayOrder" parameterType="PayOrder" resultMap="PayOrderResult">
+        SELECT
+        a.station_id,
+        a.oil_name,
+        GROUP_CONCAT( DISTINCT oil_gun ) AS oil_gun,
+        ROUND( SUM( a.amt ), 2 ) AS amt,
+        ROUND( SUM( a.receivable_amt ), 2 ) AS receivable_amt,
+        ROUND( SUM( a.received_amt ), 2 ) AS received_amt,
+        ROUND( SUM( order_liters ), 2 ) AS order_liters,
+        ROUND( SUM( a.discount_amt ), 2 ) AS discount_amt,
+        COUNT( order_no ) AS order_no,
+        sum( a.print_count) print_num
+        FROM
+        pay_order a
+        <where>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+            <if test="status != null and status != ''"> and status = #{status}</if>
+            <if test="status == null  or status == ''"> and status !=0  and status != 5 </if>
+            <if test="startDate != null and startDate != ''"><!-- 开始时间检索 -->
+                AND date_format(a.pay_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{startDate},'%y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endDate != null and endDate != ''"><!-- 结束时间检索 -->
+                AND date_format(a.pay_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endDate},'%y-%m-%d %H:%i:%s')
+            </if>
+        </where>
+        GROUP BY a.oil_name,a.station_id
+    </select>
+    <select id="listOilPayOrderSum" parameterType="PayOrder" resultMap="PayOrderResult">
+        SELECT SUM(amt) as amt,SUM(amt) as amt,SUM(order_liters)  as order_liters,sum(order_no) as order_no
+        from
+   (   SELECT
+        a.station_id,
+        a.oil_name,
+        GROUP_CONCAT( DISTINCT oil_gun ) AS oil_gun,
+        ROUND( SUM( a.amt ), 2 ) AS amt,
+        ROUND( SUM( a.receivable_amt ), 2 ) AS receivable_amt,
+        ROUND( SUM( a.received_amt ), 2 ) AS received_amt,
+        ROUND( SUM( order_liters ), 2 ) AS order_liters,
+        ROUND( SUM( a.discount_amt ), 2 ) AS discount_amt,
+        COUNT( order_no ) AS order_no,
+        sum( a.print_count) print_num
+        FROM
+        pay_order a
+        <where>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+            <if test="status != null and status != ''"> and status = #{status}</if>
+            <if test="status == null  or status == ''"> and status !=0  and status != 5 </if>
+            <if test="startDate != null and startDate != ''"><!-- 开始时间检索 -->
+                AND date_format(a.pay_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{startDate},'%y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endDate != null and endDate != ''"><!-- 结束时间检索 -->
+                AND date_format(a.pay_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endDate},'%y-%m-%d %H:%i:%s')
+            </if>
+        </where>
+        GROUP BY a.oil_name,a.station_id)c
+    </select>
     <!--初始化数据班结数据，根据油品汇总 -->
     <select id="selectOilStructure" parameterType="Long" resultMap="PayOrderResult">
         SELECT  a.oil_name,GROUP_CONCAT(DISTINCT oil_gun) as oil_gun,ROUND(SUM(a.amt),2) as amt,ROUND(SUM(order_liters),2) as order_liters,COUNT(order_no) as order_no
@@ -875,35 +1206,110 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and a.station_id = #{stationId}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="status == null or status == ''"> and status !=0 and status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
-                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
+                AND date_format(pay_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
             </if>
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
-                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
+                AND date_format(pay_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
             </if>
         </where>
         GROUP BY a.oil_name
     </select>
     <!--初始化数据班结数据，根据员工/支付方式汇总 -->
     <select id="selectPersonnelPayStructure" parameterType="Long" resultMap="PayOrderResult">
-        SELECT oil_personnel,GROUP_CONCAT(DISTINCT oil_gun) oil_gun,count(wx_amt) wx_num,count(zfb_amt) zfb_num,count(xj_amt) xj_num,
-        sum(discount_amt) discount_amt,SUM(discount_coupon_amt) discount_coupon_amt,SUM(wx_amt) wx_amt,SUM(zfb_amt) zfb_amt,
-        SUM(xj_amt) xj_amt,sum(member_amt) member_amt,sum(dzk_amt) dzk_amt,count(dzk_amt) dzk_num
-        from  pay_order a
+        SELECT
+        oil_personnel,
+        GROUP_CONCAT( DISTINCT oil_gun ) oil_gun,
+        count( wx_amt ) wx_num,
+        count( zfb_amt ) zfb_num,
+        count( xj_amt ) xj_num,
+        sum( discount_amt ) discount_amt,
+        SUM( discount_coupon_amt ) discount_coupon_amt,
+        SUM( wx_amt ) wx_amt,
+        SUM( zfb_amt ) zfb_amt,
+        SUM( xj_amt ) xj_amt,
+        sum( member_amt ) member_amt,
+        sum( dzk_amt ) dzk_amt,
+        count( dzk_amt ) dzk_num ,
+        user_name,
+        sum(amt) amt
+        FROM
+        pay_order a  left  join sys_user b  on a.refund_user=b.user_id
         <where>
             <if test="stationId != null "> and a.station_id = #{stationId}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="status == null  or status == ''"> and status !=0 </if>
+            <if test="status != null  and status != ''"> and a.status = #{status}</if>
+            <if test="status == null  or status == ''"> and a.status !=0  and a.status != 5 </if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
-            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
-                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
+            <if test="refundSelectFalg != 1">
+            <if test="startDate != null and startDate != ''"><!-- 开始时间检索 -->
+                AND date_format(a.pay_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{startDate},'%Y-%m-%d %H:%i:%s')
             </if>
-            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
-                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
+            <if test="endDate != null and endDate != ''"><!-- 结束时间检索 -->
+                AND date_format(a.pay_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endDate},'%Y-%m-%d %H:%i:%s')
+            </if>
+            </if>
+            <if test="refundSelectFalg == 1">
+                <if test="startDate != null and startDate != ''"><!-- 开始时间检索 -->
+                    AND date_format(a.refund_success_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{startDate},'%Y-%m-%d %H:%i:%s')
+                </if>
+                <if test="endDate != null and endDate != ''"><!-- 结束时间检索 -->
+                    AND date_format(a.refund_success_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endDate},'%Y-%m-%d %H:%i:%s')
+                </if>
             </if>
         </where>
-        GROUP BY a.oil_personnel
+        GROUP BY a.oil_personnel,b.user_name
+    </select>
+   <!--按照支付方式进行求和操作-->
+    <select id="selectPersonnelPayStructureSum" parameterType="Long" resultMap="PayOrderResult">
+        SELECT GROUP_CONCAT(DISTINCT oil_gun) oil_gun,
+        sum(discount_amt) discount_amt,
+        SUM(discount_coupon_amt) discount_coupon_amt,SUM(wx_amt) wx_amt,SUM(zfb_amt) zfb_amt,sum(dzk_amt) dzk_amt,
+        SUM(xj_amt) xj_amt,sum(dzk_amt) dzk_amt,
+        sum(e.xj_num)	xj_num,sum(e.zfb_num)	zfb_num,sum(e.wx_num)	wx_num,sum(e.dzk_num) dzk_num
+        from (
+        SELECT
+        oil_personnel,
+        GROUP_CONCAT( DISTINCT oil_gun ) oil_gun,
+        count( wx_amt ) wx_num,
+        count( zfb_amt ) zfb_num,
+        count( xj_amt ) xj_num,
+        sum( discount_amt ) discount_amt,
+        SUM( discount_coupon_amt ) discount_coupon_amt,
+        SUM( wx_amt ) wx_amt,
+        SUM( zfb_amt ) zfb_amt,
+        SUM( xj_amt ) xj_amt,
+        sum( member_amt ) member_amt,
+        sum( dzk_amt ) dzk_amt,
+        count( dzk_amt ) dzk_num ,
+        user_name,
+        sum(amt) amt
+        FROM
+        pay_order a  left  join sys_user b  on a.refund_user=b.user_id
+        <where>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+            <if test="status != null  and status != ''"> and a.status = #{status}</if>
+            <if test="status == null  or status == ''"> and a.status !=0 and a.status != 5 </if>
+            <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+            <if test="refundSelectFalg != 1">
+                <if test="startDate != null and startDate != ''"><!-- 开始时间检索 -->
+                    AND date_format(a.pay_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{startDate},'%Y-%m-%d %H:%i:%s')
+                </if>
+                <if test="endDate != null and endDate != ''"><!-- 结束时间检索 -->
+                    AND date_format(a.pay_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endDate},'%Y-%m-%d %H:%i:%s')
+                </if>
+            </if>
+            <if test="refundSelectFalg == 1">
+                <if test="startDate != null and startDate != ''"><!-- 开始时间检索 -->
+                    AND date_format(a.refund_success_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{startDate},'%Y-%m-%d %H:%i:%s')
+                </if>
+                <if test="endDate != null and endDate != ''"><!-- 结束时间检索 -->
+                    AND date_format(a.refund_success_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endDate},'%Y-%m-%d %H:%i:%s')
+                </if>
+            </if>
+        </where>
+        GROUP BY a.oil_personnel,b.user_name) e
     </select>
 <!--查询本站第一笔数据-->
     <select id="getPayOrderInfoMin" parameterType="Long" resultMap="PayOrderResult">
@@ -914,6 +1320,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
                 <if test="stationId != null "> and station_id = #{stationId}</if>
                 <if test="status != null  and status != ''"> and status = #{status}</if>
+                <if test="status == null  or status == ''"> and status !=0  and status != 5 </if>
                 <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             </where>
         )

yijia-station/target/classes/mapper/station/StationBalanceChangeMapper.xml

@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectStationBalanceChangeVo">
-        select c.id, c.station_id, c.order_no, c.type, c.amt, c.create_time, c.create_by,dept_name as station_name,u.nick_name as create_name
+        select c.id, c.station_id, c.order_no, c.type, c.amt, c.create_time, c.create_by,dept_name as station_name,u.nick_name as create_name,c.now_amt
 		from station_balance_change c
 		left join sys_dept d on c.station_id = d.dept_id
 		left join sys_user u on c.create_by =u.user_id

yijia-station/target/classes/mapper/station/StationClassesSummaryMapper.xml

@@ -61,10 +61,10 @@
                 and a.classes_no like concat('%', #{likeClassesNo}, '%')
             </if>
             <if test="beginTime != null and beginTime != ''"><!-- 查询班结开始时间检索 -->
-                AND a.date_format(end_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
+                AND date_format(a.end_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
             </if>
             <if test="endTime != null and endTime != ''"><!--  查询班结结束时间检索 -->
-                AND a.date_format(end_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
+                AND date_format(a.end_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
             </if>
         </where>
         order by a.id desc
@@ -116,6 +116,20 @@
         where id = #{id}
     </select>
 
+    <select id="selectStationClassSummaryMax" parameterType="StationClassesSummary" resultMap="StationClassesSummaryResult">
+        select a.id, a.classes_no, a.start_date, a.end_date, a.station_id, (b.dept_name) station_name , a.order_num, a.print_num, a.sale_liters,
+        a.sale_amt, a.amt, a.discount_amt, a.wx_amt, zfb_amt, a.dzk_amt, a.classes_man,a.refund_amt from station_classes_summary a
+        left  join sys_dept b on a.station_id=b.dept_id
+        where id = (
+        SELECT MAX(id) from station_classes_summary
+        <where>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+            <if test="status != null and status != ''"> and status = #{status}</if>
+        </where>
+        )
+    </select>
+
     <insert id="insertStationClassesSummary" parameterType="StationClassesSummary" useGeneratedKeys="true" keyProperty="id">
         insert into station_classes_summary
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -190,4 +204,10 @@
         </foreach>
     </delete>
 
+
+
+
+
+
+
 </mapper>

yijia-station/target/classes/mapper/station/SysAppUserInfoMapper.xml

@@ -1,86 +0,0 @@
-<?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.yijia.station.mapper.SysAppUserInfoMapper">
-    
-    <resultMap type="SysAppUserInfo" id="SysAppUserInfoResult">
-    	<id     property="userId"      column="user_id"      />
-        <result property="userType"    column="user_type"    />
-        <result property="minaOpenid"     column="mina_openid"     />
-        <result property="blogOpenid"   column="blog_openid"   />
-        <result property="mobilePhone"    column="mobile_phone"    />
-        <result property="sexFlag"      column="sex_flag"      />
-        <result property="registeDate"    column="registe_date"    />
-        <result property="blogToken"      column="blog_token"      />
-        <result property="minaToken"    column="mina_token"    />
-        <result property="blogNickName"    column="blog_nick_name"    />
-        <result property="blogProfilePhoto"    column="blog_profile_photo"    />
-        <result property="updateDate"    column="update_date"    />
-        <result property="unionId"    column="union_id"    />
-        <result property="stationId"    column="station_id"    />
-        <result property="aliId"    column="ali_id"    />
-    </resultMap>
-    
-    <sql id="selectSysAppUserInfoVo">
-        SELECT user_id,user_type,blog_openid,mina_openid,mobile_phone,blog_nick_name,
-     sex_flag,registe_date,blog_token,mina_token,blog_profile_photo,update_date,
-     union_id,station_id,ali_id
-     from app_user_info
-    </sql>
-    
-
-    
-    <select id="selectSysAppUserInfoList" parameterType="SysAppUserInfo" resultMap="SysAppUserInfoResult">
-        <include refid="selectSysAppUserInfoVo"/>
-        <where>
-			<if test="userType != null and userType != ''">
-				AND user_type =#{userType}
-			</if>
-			<if test="minaOpenid != null and minaOpenid != ''">
-				AND mina_openid = #{minaOpenid}
-			</if>
-            <if test="blogOpenid != null and blogOpenid != ''">
-                AND blog_openid = #{blogOpenid}
-            </if>
-            <if test="sexFlag != null and sexFlag != ''">
-                AND sex_flag = #{sexFlag}
-            </if>
-            <if test="registeDate != null and registeDate != ''">
-                AND registe_date = #{registeDate}
-            </if>
-            <if test="blogToken != null and blogToken != ''">
-                AND blog_token = #{blogToken}
-            </if>
-            <if test="minaOpenid != null and minaOpenid != ''">
-                AND mina_openid = #{minaOpenid}
-            </if>
-            <if test="blogNickName != null and blogNickName != ''">
-                AND blog_nick_name = #{blogNickName}
-            </if>
-            <if test="blogProfilePhoto != null and blogProfilePhoto != ''">
-                AND blog_profile_photo = #{blogProfilePhoto}
-            </if>
-            <if test="updateDate != null and updateDate != ''">
-                AND update_date = #{updateDate}
-            </if>
-
-            <if test="unionId != null and unionId != ''">
-                AND union_id = #{unionId}
-            </if>
-
-            <if test="stationId != null and stationId != ''">
-                AND station_id = #{stationId}
-            </if>
-
-            <if test="aliId != null and aliId != ''">
-                AND ali_id = #{aliId}
-            </if>
-		</where>
-    </select>
-
-    <select id="selectSysAppUserInfoById" parameterType="Long" resultMap="SysAppUserInfoResult">
-        <include refid="selectSysAppUserInfoVo"/>
-        where user_id = #{userId}
-    </select>
-</mapper>

yijia-station/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Mon Oct 11 10:34:20 CST 2021
+#Wed Jun 22 17:02:11 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-station

yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -36,7 +36,6 @@ com\yijia\station\service\IStationOilPriceService.class
 com\yijia\station\mapper\StationClassesSummaryMapper.class
 com\yijia\station\domain\SysDeptDemo.class
 com\yijia\station\domain\StationOilPriceAdjust.class
-com\yijia\station\mapper\SysAppUserInfoMapper.class
 com\yijia\station\controller\StationInfoController.class
 com\yijia\station\domain\StationOilGun.class
 com\yijia\station\service\impl\StationOilPriceServiceImpl.class
@@ -69,7 +68,6 @@ com\yijia\station\service\IStationOilPriceAdjustService.class
 com\yijia\station\mapper\PayOrderMapper.class
 com\yijia\station\mapper\StationClassStructureMapper.class
 com\yijia\station\service\IStationClassStructureService.class
-com\yijia\station\domain\SysAppUserInfo.class
 com\yijia\station\controller\StationClassStructureController.class
 com\yijia\station\service\IStationOilGunService.class
 com\yijia\station\domain\StationClassStructure.class
@@ -84,12 +82,10 @@ com\yijia\station\service\impl\StationClassStructureServiceImpl.class
 com\yijia\station\domain\StationDeviceManage.class
 com\yijia\station\service\impl\StationPersonnelServiceImpl.class
 com\yijia\station\service\IStationDeviceManageService.class
-com\yijia\station\service\ISysAppUserInfoService.class
 com\yijia\station\domain\StationInfo.class
 com\yijia\station\service\IStationPayService.class
 com\yijia\station\domain\StationPay.class
 com\yijia\station\controller\SXFPaySign.class
 com\yijia\station\mapper\StationSettlementPriceAdjustMapper.class
-com\yijia\station\service\impl\SysAppUserInfoImpl.class
 com\yijia\station\controller\StationPayController.class
 com\yijia\station\domain\StationOilPrice.class

yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -3,7 +3,6 @@ D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\contr
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\StationClassStructure.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationSettlementPriceServiceImpl.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\NoOilOrderController.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mapper\SysAppUserInfoMapper.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mapper\StationOilPriceMapper.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\StationOilPriceAdjustController.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\StationSettlementPrice.java
@@ -15,7 +14,6 @@ D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\contr
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mapper\StationNoticeMapper.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationOilPriceAdjustServiceImpl.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\RSAEncrypt.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\SysAppUserInfo.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\PayOrder.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\mapper\StationPersonnelMapper.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IPayOrderService.java
@@ -27,7 +25,6 @@ D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domai
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IStationOilPriceService.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IStationSettlementPriceService.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\StationSettlementPriceController.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\SysAppUserInfoImpl.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IStationClassStructureService.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\IStationOilPriceAdjustService.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\StationInfo.java
@@ -84,7 +81,6 @@ D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\contr
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\StationPayController.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\controller\ApiResponseBean.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationPayServiceImpl.java
-D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\ISysAppUserInfoService.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\DeptInfoDemo.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\domain\StationOilPriceAdjust.java
 D:\java项目\SAAS-AFTEREND2\yijia-station\src\main\java\com\yijia\station\service\impl\StationOilGunServiceImpl.java

yijia-station/yijia-station.iml

@@ -19,6 +19,7 @@
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.5" level="project" />
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
+    <orderEntry type="library" name="Maven: org.saobei:saobeiopen:1.0" level="project" />
     <orderEntry type="module" module-name="yijia-common" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.18.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.18.RELEASE" level="project" />

yijia-station/src/main/java/com/yijia/station/domain/SysAppUserInfo.java → yijia-system/src/main/java/com/yijia/system/domain/SysAppUserInfo.java

@@ -1,4 +1,4 @@
-package com.yijia.station.domain;
+package com.yijia.system.domain;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;

yijia-station/src/main/java/com/yijia/station/mapper/SysAppUserInfoMapper.java → yijia-system/src/main/java/com/yijia/system/mapper/SysAppUserInfoMapper.java

@@ -1,6 +1,6 @@
-package com.yijia.station.mapper;
+package com.yijia.system.mapper;
 
-import com.yijia.station.domain.SysAppUserInfo;
+import com.yijia.system.domain.SysAppUserInfo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

yijia-station/src/main/java/com/yijia/station/service/ISysAppUserInfoService.java → yijia-system/src/main/java/com/yijia/system/service/ISysAppUserInfoService.java

@@ -1,6 +1,6 @@
-package com.yijia.station.service;
+package com.yijia.system.service;
 
-import com.yijia.station.domain.SysAppUserInfo;
+import com.yijia.system.domain.SysAppUserInfo;
 
 import java.util.List;
 

yijia-station/src/main/java/com/yijia/station/service/impl/SysAppUserInfoImpl.java → yijia-system/src/main/java/com/yijia/system/service/impl/SysAppUserInfoImpl.java

@@ -1,8 +1,8 @@
-package com.yijia.station.service.impl;
+package com.yijia.system.service.impl;
 
-import com.yijia.station.domain.SysAppUserInfo;
-import com.yijia.station.mapper.SysAppUserInfoMapper;
-import com.yijia.station.service.ISysAppUserInfoService;
+import com.yijia.system.domain.SysAppUserInfo;
+import com.yijia.system.mapper.SysAppUserInfoMapper;
+import com.yijia.system.service.ISysAppUserInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

yijia-station/src/main/resources/mapper/station/SysAppUserInfoMapper.xml → yijia-system/src/main/resources/mapper/system/SysAppUserInfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yijia.station.mapper.SysAppUserInfoMapper">
+<mapper namespace="com.yijia.system.mapper.SysAppUserInfoMapper">
     
     <resultMap type="SysAppUserInfo" id="SysAppUserInfoResult">
     	<id     property="userId"      column="user_id"      />

yijia-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -63,6 +63,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="mnoProportion"    column="mno_proportion" />
 		<result property="mnoStatus"    column="mno_status" />
 		<result property="refundExaminStatus"    column="refund_examin_status" />
+		<result property="isAlipayFlag"    column="is_alipay_flag" />
+		<result property="thirdPayment"    column="third_payment" />
 	</resultMap>
 
 	<sql id="selectDeptVo">
@@ -71,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         d.station_latitude, d.mno, discount_setting,card_enabled_flag,d.app_id, d.app_secret,gzh_app_id,gzh_app_secret,ali_app_id,gzh_app_secret,
         ali_app_id,ali_public_key,ali_private_key,ali_encrypt_key,image1,image2,image3,image4,image5,ws_print_flag,print_setting,notice,integral_print_flag,
         d.integral_flag,d.integral_rule_flag,d.card_rule_flag,d.coupon_flag,d.label_flag,d.print_device_type,d.balance,d.is_lng_flag,d.city,coupon_enabled_flag,
-        d.merchant_no,d.terminal_id,d.yun_key,d.mno_array,mno_proportion,mno_status,refund_examin_status
+        d.merchant_no,d.terminal_id,d.yun_key,d.mno_array,mno_proportion,mno_status,refund_examin_status,is_alipay_flag,third_payment
         from sys_dept d
     </sql>
 
@@ -358,7 +360,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		    <if test="mnoArray != null">mno_array,</if>
 		    <if test="mnoProportion != null">mno_proportion,</if>
 		    <if test="mnoStatus != null">mno_status,</if>
+		     <if test="isAlipayFlag != null">is_alipay_flag,</if>
 		    <if test="refundExaminStatus != null">refund_examin_status,</if>
+		   <if test="thirdPayment != null">third_payment,</if>
  			create_time
  		)values(
  			<if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -413,7 +417,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		     <if test="mnoArray != null">#{mnoArray},</if>
 		<if test="mnoProportion != null">#{mnoProportion},</if>
 		<if test="mnoStatus != null">#{mnoStatus},</if>
+		<if test="isAlipayFlag != null">#{isAlipayFlag},</if>
 		<if test="refundExaminStatus != null">#{refundExaminStatus},</if>
+		<if test="thirdPayment != null">#{thirdPayment},</if>
  			sysdate()
  		)
 	</insert>
@@ -472,6 +478,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="mnoArray != null">mno_array= #{mnoArray},</if>
 			<if test="mnoProportion != null">mno_proportion= #{mnoProportion},</if>
 			<if test="mnoStatus != null">mno_status= #{mnoStatus},</if>
+			<if test="isAlipayFlag != null">is_alipay_flag= #{isAlipayFlag},</if>
+			<if test="thirdPayment != null">third_payment= #{thirdPayment},</if>
 			<if test="refundExaminStatus != null">refund_examin_status= #{refundExaminStatus},</if>
  			update_time = sysdate()
  		</set>

yijia-system/target/classes/mapper/system/SysDeptMapper.xml

@@ -63,6 +63,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="mnoProportion"    column="mno_proportion" />
 		<result property="mnoStatus"    column="mno_status" />
 		<result property="refundExaminStatus"    column="refund_examin_status" />
+		<result property="isAlipayFlag"    column="is_alipay_flag" />
+		<result property="thirdPayment"    column="third_payment" />
 	</resultMap>
 
 	<sql id="selectDeptVo">
@@ -71,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         d.station_latitude, d.mno, discount_setting,card_enabled_flag,d.app_id, d.app_secret,gzh_app_id,gzh_app_secret,ali_app_id,gzh_app_secret,
         ali_app_id,ali_public_key,ali_private_key,ali_encrypt_key,image1,image2,image3,image4,image5,ws_print_flag,print_setting,notice,integral_print_flag,
         d.integral_flag,d.integral_rule_flag,d.card_rule_flag,d.coupon_flag,d.label_flag,d.print_device_type,d.balance,d.is_lng_flag,d.city,coupon_enabled_flag,
-        d.merchant_no,d.terminal_id,d.yun_key,d.mno_array,mno_proportion,mno_status,refund_examin_status
+        d.merchant_no,d.terminal_id,d.yun_key,d.mno_array,mno_proportion,mno_status,refund_examin_status,is_alipay_flag,third_payment
         from sys_dept d
     </sql>
 
@@ -358,7 +360,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		    <if test="mnoArray != null">mno_array,</if>
 		    <if test="mnoProportion != null">mno_proportion,</if>
 		    <if test="mnoStatus != null">mno_status,</if>
+		     <if test="isAlipayFlag != null">is_alipay_flag,</if>
 		    <if test="refundExaminStatus != null">refund_examin_status,</if>
+		   <if test="thirdPayment != null">third_payment,</if>
  			create_time
  		)values(
  			<if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -413,7 +417,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		     <if test="mnoArray != null">#{mnoArray},</if>
 		<if test="mnoProportion != null">#{mnoProportion},</if>
 		<if test="mnoStatus != null">#{mnoStatus},</if>
+		<if test="isAlipayFlag != null">#{isAlipayFlag},</if>
 		<if test="refundExaminStatus != null">#{refundExaminStatus},</if>
+		<if test="thirdPayment != null">#{thirdPayment},</if>
  			sysdate()
  		)
 	</insert>
@@ -472,6 +478,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="mnoArray != null">mno_array= #{mnoArray},</if>
 			<if test="mnoProportion != null">mno_proportion= #{mnoProportion},</if>
 			<if test="mnoStatus != null">mno_status= #{mnoStatus},</if>
+			<if test="isAlipayFlag != null">is_alipay_flag= #{isAlipayFlag},</if>
+			<if test="thirdPayment != null">third_payment= #{thirdPayment},</if>
 			<if test="refundExaminStatus != null">refund_examin_status= #{refundExaminStatus},</if>
  			update_time = sysdate()
  		</set>

yijia-system/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Mon Oct 11 10:34:12 CST 2021
+#Wed Jun 22 17:02:04 CST 2022
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-system

yijia-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -7,6 +7,7 @@ com\yijia\system\domain\SysRespon.class
 com\yijia\system\domain\SysConfig.class
 com\yijia\system\domain\vo\MetaVo.class
 com\yijia\system\service\ISysDictTypeService.class
+com\yijia\system\domain\SysAppUserInfo.class
 com\yijia\system\domain\SysOperLog.class
 com\yijia\system\domain\vo\RouterVo.class
 com\yijia\system\service\impl\SysAgentServiceImpl.class
@@ -18,6 +19,7 @@ com\yijia\system\domain\SysLogininfor.class
 com\yijia\system\service\ISysDeptService.class
 com\yijia\system\domain\SysRoleMenu.class
 com\yijia\system\service\ISysUserOnlineService.class
+com\yijia\system\service\ISysAppUserInfoService.class
 com\yijia\system\service\impl\SysOperLogServiceImpl.class
 com\yijia\system\domain\SysUserOnline.class
 com\yijia\system\mapper\SysOperLogMapper.class
@@ -26,8 +28,10 @@ com\yijia\system\domain\SysUserRole.class
 com\yijia\system\service\ISysDictDataService.class
 com\yijia\system\service\impl\SysDictDataServiceImpl.class
 com\yijia\system\domain\SysDeptFalge.class
+com\yijia\system\service\impl\SysAppUserInfoImpl.class
 com\yijia\system\service\impl\SysDeptServiceImpl.class
 com\yijia\system\mapper\SysAgentMapper.class
+com\yijia\system\mapper\SysAppUserInfoMapper.class
 com\yijia\system\service\ISysLogininforService.class
 com\yijia\system\service\ISysUserService.class
 com\yijia\system\domain\SysNotice.class

yijia-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -3,6 +3,7 @@ D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\mapper\
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\service\ISysRoleService.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\domain\SysLogininfor.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\mapper\SysLogininforMapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\service\ISysAppUserInfoService.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\mapper\SysMenuMapper.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\service\ISysDictTypeService.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\mapper\SysAgentMapper.java
@@ -15,6 +16,7 @@ D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\service
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\service\impl\SysMenuServiceImpl.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\service\impl\SysPostServiceImpl.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\service\ISysLogininforService.java
+D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\mapper\SysAppUserInfoMapper.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\mapper\SysRoleMapper.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\domain\SysConfig.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\domain\SysNotice.java
@@ -38,7 +40,9 @@ D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\service
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\mapper\SysDictTypeMapper.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\service\ISysDeptService.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\mapper\SysUserPostMapper.java
+D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\domain\SysAppUserInfo.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\domain\SysUserRole.java
+D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\service\impl\SysAppUserInfoImpl.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\service\impl\SysRoleServiceImpl.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\service\impl\SysAgentServiceImpl.java
 D:\java项目\SAAS-AFTEREND2\yijia-system\src\main\java\com\yijia\system\domain\SysOperLog.java