Merge branch 'developer' of git_lijun/caimei-mall into master

.gitignore

@@ -12,3 +12,36 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
+
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**
+!**/src/test/**
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+**/.idea
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+
+### VS Code ###
+.vscode/

.idea/compiler.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="caimei-mall" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="caimei-mall" target="1.8" />
-    </bytecodeTargetLevel>
-  </component>
-</project>

.idea/encodings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
-  </component>
-</project>

.idea/libraries/Maven__asm_asm_3_3.xml

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

.idea/libraries/Maven__asm_asm_commons_3_3.xml

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

.idea/libraries/Maven__asm_asm_tree_3_3.xml

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

.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_11.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: ch.qos.logback:logback-classic:1.1.11">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.11/logback-classic-1.1.11.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.11/logback-classic-1.1.11-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.11/logback-classic-1.1.11-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_11.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: ch.qos.logback:logback-core:1.1.11">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.11/logback-core-1.1.11.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.11/logback-core-1.1.11-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.11/logback-core-1.1.11-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_alibaba_fastjson_1_2_6.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.alibaba:fastjson:1.2.6">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.6/fastjson-1.2.6.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.6/fastjson-1.2.6-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.6/fastjson-1.2.6-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml:classmate:1.3.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.3.4/classmate-1.3.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.3.4/classmate-1.3.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.3.4/classmate-1.3.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.8.0/jackson-annotations-2.8.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.8.0/jackson-annotations-2.8.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.8.0/jackson-annotations-2.8.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_10.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.10">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.8.10/jackson-core-2.8.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.8.10/jackson-core-2.8.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.8.10/jackson-core-2.8.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_10.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.10">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.8.10/jackson-databind-2.8.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.8.10/jackson-databind-2.8.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.8.10/jackson-databind-2.8.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_0.xml

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

.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_2.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.github.pagehelper:pagehelper:5.1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.2/pagehelper-5.1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.2/pagehelper-5.1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.2/pagehelper-5.1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_3.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.3/pagehelper-spring-boot-autoconfigure-1.2.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.3/pagehelper-spring-boot-autoconfigure-1.2.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.3/pagehelper-spring-boot-autoconfigure-1.2.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_3.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.3/pagehelper-spring-boot-starter-1.2.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.3/pagehelper-spring-boot-starter-1.2.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.3/pagehelper-spring-boot-starter-1.2.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_2_0.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.jayway.jsonpath:json-path:2.2.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2.2.0/json-path-2.2.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2.2.0/json-path-2.2.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2.2.0/json-path-2.2.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_2.xml

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

.idea/libraries/Maven__commons_io_commons_io_2_2.xml

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

.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: javax.validation:validation-api:1.1.0.Final">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__junit_junit_4_12.xml

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

.idea/libraries/Maven__mysql_mysql_connector_java_5_1_21.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: mysql:mysql-connector-java:5.1.21">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.21/mysql-connector-java-5.1.21.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.21/mysql-connector-java-5.1.21-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.21/mysql-connector-java-5.1.21-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: net.minidev:accessors-smart:1.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/accessors-smart/1.1/accessors-smart-1.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/accessors-smart/1.1/accessors-smart-1.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/accessors-smart/1.1/accessors-smart-1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: net.minidev:json-smart:2.2.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/json-smart/2.2.1/json-smart-2.2.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/json-smart/2.2.1/json-smart-2.2.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/json-smart/2.2.1/json-smart-2.2.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__net_sourceforge_nekohtml_nekohtml_1_9_22.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/nekohtml/nekohtml/1.9.22/nekohtml-1.9.22.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/nekohtml/nekohtml/1.9.22/nekohtml-1.9.22-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/nekohtml/nekohtml/1.9.22/nekohtml-1.9.22-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__nz_net_ultraq_thymeleaf_thymeleaf_layout_dialect_1_4_0.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:1.4.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/nz/net/ultraq/thymeleaf/thymeleaf-layout-dialect/1.4.0/thymeleaf-layout-dialect-1.4.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/nz/net/ultraq/thymeleaf/thymeleaf-layout-dialect/1.4.0/thymeleaf-layout-dialect-1.4.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/nz/net/ultraq/thymeleaf/thymeleaf-layout-dialect/1.4.0/thymeleaf-layout-dialect-1.4.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__ognl_ognl_3_0_19.xml

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

.idea/libraries/Maven__org_apache_commons_commons_lang3_3_2.xml

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

.idea/libraries/Maven__org_apache_struts_struts2_core_2_3_32.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.struts:struts2-core:2.3.32">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/struts/struts2-core/2.3.32/struts2-core-2.3.32.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/struts/struts2-core/2.3.32/struts2-core-2.3.32-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/struts/struts2-core/2.3.32/struts2-core-2.3.32-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_apache_struts_xwork_xwork_core_2_3_32.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.struts.xwork:xwork-core:2.3.32">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/struts/xwork/xwork-core/2.3.32/xwork-core-2.3.32.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/struts/xwork/xwork-core/2.3.32/xwork-core-2.3.32-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/struts/xwork/xwork-core/2.3.32/xwork-core-2.3.32-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_23.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.23">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/8.5.23/tomcat-embed-core-8.5.23.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/8.5.23/tomcat-embed-core-8.5.23-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/8.5.23/tomcat-embed-core-8.5.23-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_23.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.23">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/8.5.23/tomcat-embed-el-8.5.23.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/8.5.23/tomcat-embed-el-8.5.23-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/8.5.23/tomcat-embed-el-8.5.23-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_23.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/8.5.23/tomcat-embed-websocket-8.5.23.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/8.5.23/tomcat-embed-websocket-8.5.23-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/8.5.23/tomcat-embed-websocket-8.5.23-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_apache_tomcat_tomcat_annotations_api_8_5_23.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.tomcat:tomcat-annotations-api:8.5.23">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-annotations-api/8.5.23/tomcat-annotations-api-8.5.23.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-annotations-api/8.5.23/tomcat-annotations-api-8.5.23-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-annotations-api/8.5.23/tomcat-annotations-api-8.5.23-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_23.xml

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

.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_23.xml

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

.idea/libraries/Maven__org_assertj_assertj_core_2_6_0.xml

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

.idea/libraries/Maven__org_codehaus_groovy_groovy_2_4_13.xml

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

.idea/libraries/Maven__org_freemarker_freemarker_2_3_27_incubating.xml

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

.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml

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

.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml

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

.idea/libraries/Maven__org_hibernate_hibernate_validator_5_3_6_Final.xml

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

.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml

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

.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_1_Final.xml

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

.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml

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

.idea/libraries/Maven__org_mybatis_mybatis_3_4_5.xml

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

.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_1.xml

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

.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_1.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.3.1/mybatis-spring-boot-autoconfigure-1.3.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.3.1/mybatis-spring-boot-autoconfigure-1.3.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.3.1/mybatis-spring-boot-autoconfigure-1.3.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_1.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/1.3.1/mybatis-spring-boot-starter-1.3.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/1.3.1/mybatis-spring-boot-starter-1.3.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/1.3.1/mybatis-spring-boot-starter-1.3.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml

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

.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml

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

.idea/libraries/Maven__org_skyscreamer_jsonassert_1_4_0.xml

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

.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_25.xml

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

.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml

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

.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_25.xml

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

.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml

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

.idea/libraries/Maven__org_springframework_boot_spring_boot_1_5_9_RELEASE.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot:1.5.9.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/1.5.9.RELEASE/spring-boot-1.5.9.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/1.5.9.RELEASE/spring-boot-1.5.9.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/1.5.9.RELEASE/spring-boot-1.5.9.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_5_9_RELEASE.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.5.9.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/1.5.9.RELEASE/spring-boot-autoconfigure-1.5.9.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/1.5.9.RELEASE/spring-boot-autoconfigure-1.5.9.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/1.5.9.RELEASE/spring-boot-autoconfigure-1.5.9.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_5_9_RELEASE.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-starter:1.5.9.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/1.5.9.RELEASE/spring-boot-starter-1.5.9.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/1.5.9.RELEASE/spring-boot-starter-1.5.9.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/1.5.9.RELEASE/spring-boot-starter-1.5.9.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_5_9_RELEASE.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-starter-jdbc:1.5.9.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/1.5.9.RELEASE/spring-boot-starter-jdbc-1.5.9.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/1.5.9.RELEASE/spring-boot-starter-jdbc-1.5.9.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/1.5.9.RELEASE/spring-boot-starter-jdbc-1.5.9.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_5_9_RELEASE.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-starter-logging:1.5.9.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/1.5.9.RELEASE/spring-boot-starter-logging-1.5.9.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/1.5.9.RELEASE/spring-boot-starter-logging-1.5.9.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/1.5.9.RELEASE/spring-boot-starter-logging-1.5.9.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_5_9_RELEASE.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-starter-test:1.5.9.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/1.5.9.RELEASE/spring-boot-starter-test-1.5.9.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/1.5.9.RELEASE/spring-boot-starter-test-1.5.9.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/1.5.9.RELEASE/spring-boot-starter-test-1.5.9.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_1_5_9_RELEASE.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-thymeleaf/1.5.9.RELEASE/spring-boot-starter-thymeleaf-1.5.9.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-thymeleaf/1.5.9.RELEASE/spring-boot-starter-thymeleaf-1.5.9.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-thymeleaf/1.5.9.RELEASE/spring-boot-starter-thymeleaf-1.5.9.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_5_9_RELEASE.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.5.9.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/1.5.9.RELEASE/spring-boot-starter-tomcat-1.5.9.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/1.5.9.RELEASE/spring-boot-starter-tomcat-1.5.9.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/1.5.9.RELEASE/spring-boot-starter-tomcat-1.5.9.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_5_9_RELEASE.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-starter-web:1.5.9.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/1.5.9.RELEASE/spring-boot-starter-web-1.5.9.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/1.5.9.RELEASE/spring-boot-starter-web-1.5.9.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/1.5.9.RELEASE/spring-boot-starter-web-1.5.9.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_test_1_5_9_RELEASE.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-test:1.5.9.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/1.5.9.RELEASE/spring-boot-test-1.5.9.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/1.5.9.RELEASE/spring-boot-test-1.5.9.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/1.5.9.RELEASE/spring-boot-test-1.5.9.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_1_5_9_RELEASE.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.5.9.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/1.5.9.RELEASE/spring-boot-test-autoconfigure-1.5.9.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/1.5.9.RELEASE/spring-boot-test-autoconfigure-1.5.9.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/1.5.9.RELEASE/spring-boot-test-autoconfigure-1.5.9.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_spring_aop_4_3_13_RELEASE.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-aop:4.3.13.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.3.13.RELEASE/spring-aop-4.3.13.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.3.13.RELEASE/spring-aop-4.3.13.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.3.13.RELEASE/spring-aop-4.3.13.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_spring_beans_4_3_13_RELEASE.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-beans:4.3.13.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.13.RELEASE/spring-beans-4.3.13.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.13.RELEASE/spring-beans-4.3.13.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.13.RELEASE/spring-beans-4.3.13.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_spring_context_4_3_13_RELEASE.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-context:4.3.13.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.13.RELEASE/spring-context-4.3.13.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.13.RELEASE/spring-context-4.3.13.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.13.RELEASE/spring-context-4.3.13.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_spring_core_4_3_13_RELEASE.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-core:4.3.13.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.3.13.RELEASE/spring-core-4.3.13.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.3.13.RELEASE/spring-core-4.3.13.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.3.13.RELEASE/spring-core-4.3.13.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_spring_expression_4_3_13_RELEASE.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-expression:4.3.13.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.3.13.RELEASE/spring-expression-4.3.13.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.3.13.RELEASE/spring-expression-4.3.13.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/4.3.13.RELEASE/spring-expression-4.3.13.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_13_RELEASE.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-jdbc:4.3.13.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.3.13.RELEASE/spring-jdbc-4.3.13.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.3.13.RELEASE/spring-jdbc-4.3.13.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/4.3.13.RELEASE/spring-jdbc-4.3.13.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_spring_test_4_3_13_RELEASE.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-test:4.3.13.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/4.3.13.RELEASE/spring-test-4.3.13.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/4.3.13.RELEASE/spring-test-4.3.13.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/4.3.13.RELEASE/spring-test-4.3.13.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_spring_tx_4_3_13_RELEASE.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-tx:4.3.13.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.3.13.RELEASE/spring-tx-4.3.13.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.3.13.RELEASE/spring-tx-4.3.13.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.3.13.RELEASE/spring-tx-4.3.13.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_spring_web_4_3_13_RELEASE.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-web:4.3.13.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.13.RELEASE/spring-web-4.3.13.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.13.RELEASE/spring-web-4.3.13.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.13.RELEASE/spring-web-4.3.13.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_13_RELEASE.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-webmvc:4.3.13.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.3.13.RELEASE/spring-webmvc-4.3.13.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.3.13.RELEASE/spring-webmvc-4.3.13.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.3.13.RELEASE/spring-webmvc-4.3.13.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_thymeleaf_thymeleaf_2_1_6_RELEASE.xml

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

.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring4_2_1_6_RELEASE.xml

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

.idea/libraries/Maven__org_unbescape_unbescape_1_1_0_RELEASE.xml

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

.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml

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

.idea/libraries/Maven__xerces_xercesImpl_2_11_0.xml

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

.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml

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

.idea/misc.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/classes" />
-  </component>
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/caimei-mall.iml" filepath="$PROJECT_DIR$/caimei-mall.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

pom.xml

@@ -20,7 +20,16 @@
     </properties>
 
     <dependencies>
-
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.caimei.module</groupId>
+            <artifactId>pay</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>com.caimei.module</groupId>
             <artifactId>caimei-search</artifactId>

src/main/java/com/caimei/StartApplication.java

@@ -4,8 +4,17 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-@SpringBootApplication(scanBasePackages = {"com.caimei.module.service", "com.caimei.controller.**", "com.caimei.service.**"})
-@MapperScan(basePackages = {"com.caimei.module.dao", "com.caimei.mapper.**"})
+@SpringBootApplication(scanBasePackages = {
+        "com.caimei.module.search.service",
+        "com.caimei.module.pay.service",
+        "com.caimei.utils",
+        "com.caimei.controller.**",
+        "com.caimei.service.**"
+})
+@MapperScan(basePackages = {
+        "com.caimei.module.search.dao",
+        "com.caimei.module.pay.dao",
+        "com.caimei.mapper.**"})
 public class StartApplication {
 
     public static void main(String[] args) {

src/main/java/com/caimei/controller/order/PayOrderController.java

@@ -0,0 +1,165 @@
+package com.caimei.controller.order;
+
+import com.caimei.module.base.entity.bo.JsonModel;
+import com.caimei.module.base.entity.bo.Payment;
+import com.caimei.module.base.entity.vo.OrderPayLinkVo;
+import com.caimei.module.pay.service.PayService;
+import com.caimei.utils.WxConfig;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * Description
+ *
+ * @author : plf
+ * @date : 2020/5/6
+ */
+@Slf4j
+@RestController
+@RequestMapping("/PayOrder")
+public class PayOrderController {
+    private PayService payService;
+
+    @Autowired
+    public void setPayService(PayService payService) {
+        this.payService = payService;
+    }
+
+    @Value("${miniprogram.notifyUrl}")
+    private String notifyUrl;
+
+    @Value("${miniprogram.redirectLink}")
+    private String redirectLink;
+
+    @Value("${miniprogram.linkPage}")
+    private String linkPage;
+
+    /**
+     * 收银台数据显示
+     */
+    @GetMapping("/checkoutCounter")
+    public JsonModel checkoutCounter(Integer orderId) {
+        return payService.checkoutCounter(orderId);
+    }
+
+    /**
+     * 微信线上支付
+     */
+    @PostMapping("/miniWxPay")
+    public JsonModel miniWxPay(Payment payment, HttpServletRequest request) {
+        JsonModel model = JsonModel.newInstance();
+        if (!"WEIXIN".equals(payment.getPayWay()) || payment.getPayAmount() == null || payment.getPayAmount() < 2) {
+            return model.error("参数异常");
+        }
+        Map<String, Object> map = null;
+        if (null == payment.getState()) {
+            //小程序微信快捷支付
+            payment.setPayType("MINIAPP_WEIXIN");
+            JsonModel wxJscode = WxConfig.getWxJscode(payment.getCode(), request);
+            if (wxJscode.getCode() == -1) {
+                return model.error(wxJscode.getMsg());
+            }
+            map = (Map<String, Object>) wxJscode.getData();
+        } else {
+            //pc微信扫码支付,微信公众号支付
+            payment.setPayType("JSAPI_WEIXIN");
+            try {
+                map = WxConfig.getAccessTokenMap(payment.getCode(), "crm");
+            } catch (Exception e) {
+                e.printStackTrace();
+                return model.error("wx公众号获取openid失败");
+            }
+        }
+        String openid = (String) map.get("openid");
+        if (openid == null) {
+            return model.error("wx获取openid失败");
+        }
+        payment.setOpenid(openid);
+        payment.setNotifyUrl(notifyUrl);
+        log.info("wx支付openid>>>>>" + openid);
+        return payService.pay(payment, request);
+    }
+
+    /**
+     * 支付异步通知回调
+     */
+    @GetMapping("/paymentCallback")
+    public String paymentCallback(HttpServletRequest request) throws Exception {
+        log.info("异步回调通知>>>>>>>start");
+        String data = request.getParameter("data");
+        if (StringUtils.isBlank(data)) {
+            return "回调参数失败";
+        }
+        return payService.paymentCallback(data);
+    }
+
+    /**
+     * 小程序生成网银支付链接
+     */
+    @PostMapping("/payLink")
+    public JsonModel payLink(OrderPayLinkVo orderPayLink) {
+        orderPayLink.setRedirectLink(redirectLink);
+        return payService.payLink(orderPayLink);
+    }
+
+    /**
+     * 支付链接重定向到页面
+     */
+    @GetMapping("/jumpPage")
+    public void jumpPage(String linkLogo, HttpServletResponse response) throws IOException {
+        payService.jumpPage(linkLogo, linkPage, response);
+    }
+
+    /**
+     * pc端支付,银联,支付宝
+     */
+    @PostMapping("/pcMallPay")
+    public JsonModel pcMallPay(Payment payment, HttpServletRequest request) {
+        JsonModel model = JsonModel.newInstance();
+        if (null == payment || StringUtils.isBlank(payment.getPayWay()) || StringUtils.isBlank(payment.getReturnUrl()) || payment.getPayAmount() == null) {
+            return model.error("参数异常");
+        }
+        if ("UNIONPAY".equals(payment.getPayWay())) {
+            //银联支付
+            payment.setPayType("GATEWAY_UNIONPAY");
+        } else if ("ALIPAY".equals(payment.getPayWay())) {
+            //支付宝支付
+            payment.setPayType("ALIPAY_H5");
+        }
+        payment.setNotifyUrl(notifyUrl);
+        return payService.pay(payment, request);
+    }
+
+    /**
+     * 判断此次支付是否完成
+     */
+    @GetMapping("/payWhetherSuccess")
+    public JsonModel payWhetherSuccess(Integer orderId, Integer paySuccessCounter) {
+        if (null == orderId || null == paySuccessCounter) {
+            return JsonModel.newInstance().error("参数异常");
+        }
+        return payService.payWhetherSuccess(orderId, paySuccessCounter);
+    }
+
+    /**
+     * 查询本次支付订单是否完成
+     */
+    @GetMapping("/findOrderStatus")
+    public JsonModel findOrderStatus(String mbOrderId) {
+        if (null == mbOrderId) {
+            return JsonModel.newInstance().error("参数异常");
+        }
+        return payService.findOrderStatus(mbOrderId);
+    }
+}

src/main/java/com/caimei/controller/search/SearchController.java

@@ -4,8 +4,8 @@ import com.caimei.controller.user.LoginController;
 import com.caimei.entity.*;
 import com.caimei.mapper.order.OrderMapper;
 
-import com.caimei.module.entity.vo.*;
-import com.caimei.module.service.SearchService;
+import com.caimei.module.search.entity.vo.*;
+import com.caimei.module.search.service.SearchService;
 import com.caimei.utils.AppUtils;
 import com.caimei.utils.CopyUtil;
 import com.github.pagehelper.PageHelper;
@@ -124,9 +124,12 @@ public class SearchController {
         pageSize = (pageSize != null) ? pageSize : 10;
         PageHelper.startPage(index, pageSize);
         List<CmMallOrderVo> orderList = searchService.searchOrder(organizeID, searchWord, userID);
-        for (CmMallOrderVo order : orderList) {
+        List<CmMallOrder> orderList2 = new ArrayList<>(orderList.size());
+        for (int i=0; i<orderList.size(); i++){
+            CmMallOrder order = new CmMallOrder();
+            CopyUtil.copyProperties(order, orderList.get(i));
             //111,待付待收待发
-            if (order.getStatus().equals(11) && order.getPayStatus().equals("1")) {
+            if ("11".equals(order.getStatus()) && "1".equals(order.getPayStatus())) {
                 order.setStatus("111");
             }
             String[] ShopOrderIDs = {};
@@ -136,24 +139,18 @@ public class SearchController {
                 ShopOrderIDs = new String[]{order.getShopOrderIDs()};
             }
             List<CmMallShopOrder> shopOrderList = orderMapper.findAllShopOrder(ShopOrderIDs);
-            List<CmMallShopOrderVo> shopOrderVoList = new ArrayList<>();
             for (CmMallShopOrder shopOrder : shopOrderList) {
-                CmMallShopOrderVo shopOrderVo = new CmMallShopOrderVo();
-                CopyUtil.copyProperties(shopOrderVo, shopOrder);
                 List<CmMallOrderProduct> orderProductList = orderMapper.findOrderProduct(shopOrder.getShopOrderID());
-                List<CmMallOrderProductVo> orderProductVoList = new ArrayList<>();
                 for (CmMallOrderProduct orderProduct : orderProductList) {
-                    CmMallOrderProductVo orderProductVo = new CmMallOrderProductVo();
-                    CopyUtil.copyProperties(orderProductVo, orderProduct);
-                    orderProductVo.setProductImage(AppUtils.getImageURL("product", orderProduct.getProductImage(), 0, domain));
-                    orderProductVoList.add(orderProductVo);
+                    orderProduct.setProductImage(AppUtils.getImageURL("product", orderProduct.getProductImage(), 0, domain));
                 }
-                shopOrderVo.setCmOrderProducts(orderProductVoList);
-                shopOrderVo.setShopLogo(AppUtils.getImageURL("shopLogo", shopOrder.getShopLogo(), 0, domain));
+                shopOrder.setCmOrderProducts(orderProductList);
+                shopOrder.setShopLogo(AppUtils.getImageURL("shopLogo", shopOrder.getShopLogo(), 0, domain));
             }
-            order.setShopOrderList(shopOrderVoList);
+            order.setShopOrderList(shopOrderList);
+            orderList2.add(order);
         }
-        CmMallPage<CmMallOrderVo> orderPage = new CmMallPage<>(orderList);
+        CmMallPage<CmMallOrder> orderPage = new CmMallPage<>(orderList2);
         return model.success(orderPage);
     }
 

src/main/java/com/caimei/entity/CmMallOrder.java

@@ -1,540 +1,28 @@
 package com.caimei.entity;
 
-import java.io.Serializable;
-import java.util.List;
-
-public class CmMallOrder implements Serializable {
-    private Integer orderID;        // orderID
-    private String orderMark;        // 订单标识，例#orderID#：#1000#
-    private String orderNo;        // 订单编号
-    private String newOrderNo;        // 订单编号+四位随机数----新的拼接交易号（transactionID+四位随机数）
-    private Integer organizeID;     //采美组织默认为null,具体对应cm_mall_organize表ID
-    private Integer userID;        // userID
-    private Integer buyUserID;        // 下单人
-    private String shopOrderIDs;        // 子订单ID
-    private Integer orderSubmitType;        // 订单提交类型  0:个人自己下单 1:企业自己下单 2:员工帮机构下单 3:协销帮机构下单  4:后台下单 5:采美豆订单
-    private Integer orderType;        // 订单类型 协销订单 0 普通订单 1
-    private Integer status;        // 订单状态
-    private String statusName;      //订单状态备注
-    private String hasActProduct;//
-    private String payFlag;             //支付状态 0未支付 1 已支付
-    private String onlinePayFlag;       //能否线上支付 0能  1 只能线下
-    private Double productTotalFee;        // 商品总金额 = 子订单商品金额相加
-    private Double orderTotalFee;    // decimal(20,6) comment '订单总金额',
-    private Double payTotalFee;         // decimal(20,6) comment '支付金额',
-    private Double payableAmount;       // 应付金额
-    private Double balancePayFee;       // decimal(20,6) comment '余额支付',
-    private Double discountFee;         // decimal(20,6) comment '折扣金额',
-    private Integer spID;        // spID
-    private Integer mainSpID;        // mainSpID
-    private String note;        // 订单备注
-    private Integer clubID;        // clubID
-    private String clubScanTime;        // 机构扫描确认时间
-    private String payWay;        // 支付方式
-    private String orderSource;        // 订单来源  1WWW 2 CRM 3APP[历史数据] 4客服 5外单 6星范等小程序
-    private String orderTime;        // 订单提交时间
-    private String payTime;        // 订单支付时间
-    private Integer productCount;        // 购买总数
-    private Integer presentCount;        // 赠送总数
-    private String cooFreeFlag;        // 库分期免息状态
-    private Integer cooFreeRate;        // 库分期分期费率
-    private Double cooFreeAmount;        // 库分期免息金额
-    private String confirmFlag;        // 订单确认标志  0 未确认 1 后台确认 2 机构确认
-    private String updateDate;          //更新时间
-    private Integer clauseID;        // 条款ID
-    private String clauseContent;        // 条款内容
-    private String clauseName;        // 条款名称
-    private String freePostFlag;        // 免邮标志  0 包邮 -1 到付 1有运费
-    private Double freight;        // 总运费
-    private Integer freePostageTicketID;        // 包邮券ID
-    private String delFlag;        // 订单失效状态
-    private String invoiceFlag;      //是否开发票 0 不开 1 开发票
-    private Double preferential;//总优惠金额
-    private String confirmTime; //订单确认时间
-    private String closeTime; //订单取消时间
-    private String closeReason;//订单取消原因
-    private String splitFlag;  //是否可以拆单
-    private String postageOrderFlag; //邮费订单标识 1是邮费订单 0不是邮费订单
-    private String receiptStatus;//（收款买家）收款状态：1待收款、2部分收款、3已收款'
-    private String payStatus;//(付款供应商)付款状态：1待付款、2部分付款、3已付款
-    private String sendOutStatus;//发货状态：1待发货、2部分发货、3已发货
-    private String refundType;//退货退款类型：1部分退、2全部退
-    private List<CmMallShopOrder> shopOrderList; //子订单集合
-    private Long autoCloseTimeMills; //订单自动取消时间 毫秒
-    private Double receiptAmount;      //支付总金额
-    private Double returnedPurchaseFee;     //退款总金额
-
-    public Double getReceiptAmount() {
-        return receiptAmount;
-    }
-
-    public void setReceiptAmount(Double receiptAmount) {
-        this.receiptAmount = receiptAmount;
-    }
-
-    public Double getReturnedPurchaseFee() {
-        return returnedPurchaseFee;
-    }
-
-    public void setReturnedPurchaseFee(Double returnedPurchaseFee) {
-        this.returnedPurchaseFee = returnedPurchaseFee;
-    }
-
-    public Integer getOrderID() {
-        return orderID;
-    }
-
-    public void setOrderID(Integer orderID) {
-        this.orderID = orderID;
-    }
-
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
-    }
-
-    public String getNewOrderNo() {
-        return newOrderNo;
-    }
-
-    public void setNewOrderNo(String newOrderNo) {
-        this.newOrderNo = newOrderNo;
-    }
-
-    public Integer getOrganizeID() {
-        return organizeID;
-    }
-
-    public void setOrganizeID(Integer organizeID) {
-        this.organizeID = organizeID;
-    }
-
-    public Integer getUserID() {
-        return userID;
-    }
-
-    public void setUserID(Integer userID) {
-        this.userID = userID;
-    }
-
-    public Integer getBuyUserID() {
-        return buyUserID;
-    }
-
-    public void setBuyUserID(Integer buyUserID) {
-        this.buyUserID = buyUserID;
-    }
-
-    public String getShopOrderIDs() {
-        return shopOrderIDs;
-    }
-
-    public void setShopOrderIDs(String shopOrderIDs) {
-        this.shopOrderIDs = shopOrderIDs;
-    }
-
-    public Integer getOrderSubmitType() {
-        return orderSubmitType;
-    }
-
-    public void setOrderSubmitType(Integer orderSubmitType) {
-        this.orderSubmitType = orderSubmitType;
-    }
-
-    public Integer getOrderType() {
-        return orderType;
-    }
-
-    public void setOrderType(Integer orderType) {
-        this.orderType = orderType;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public String getStatusName() {
-        return statusName;
-    }
-
-    public void setStatusName(String statusName) {
-        this.statusName = statusName;
-    }
-
-    public String getPayFlag() {
-        return payFlag;
-    }
-
-    public void setPayFlag(String payFlag) {
-        this.payFlag = payFlag;
-    }
-
-    public String getOnlinePayFlag() {
-        return onlinePayFlag;
-    }
-
-    public void setOnlinePayFlag(String onlinePayFlag) {
-        this.onlinePayFlag = onlinePayFlag;
-    }
-
-    public Double getProductTotalFee() {
-        return productTotalFee;
-    }
-
-    public void setProductTotalFee(Double productTotalFee) {
-        this.productTotalFee = productTotalFee;
-    }
-
-    public Double getOrderTotalFee() {
-        return orderTotalFee;
-    }
-
-    public void setOrderTotalFee(Double orderTotalFee) {
-        this.orderTotalFee = orderTotalFee;
-    }
-
-    public Double getPayTotalFee() {
-        return payTotalFee;
-    }
-
-    public void setPayTotalFee(Double payTotalFee) {
-        this.payTotalFee = payTotalFee;
-    }
-
-    public Double getPayableAmount() {
-        return payableAmount;
-    }
-
-    public void setPayableAmount(Double payableAmount) {
-        this.payableAmount = payableAmount;
-    }
-
-    public Double getBalancePayFee() {
-        return balancePayFee;
-    }
-
-    public void setBalancePayFee(Double balancePayFee) {
-        this.balancePayFee = balancePayFee;
-    }
-
-    public Double getDiscountFee() {
-        return discountFee;
-    }
-
-    public void setDiscountFee(Double discountFee) {
-        this.discountFee = discountFee;
-    }
-
-    public Integer getSpID() {
-        return spID;
-    }
-
-    public void setSpID(Integer spID) {
-        this.spID = spID;
-    }
-
-    public Integer getMainSpID() {
-        return mainSpID;
-    }
-
-    public void setMainSpID(Integer mainSpID) {
-        this.mainSpID = mainSpID;
-    }
-
-    public String getNote() {
-        return note;
-    }
-
-    public void setNote(String note) {
-        this.note = note;
-    }
-
-    public Integer getClubID() {
-        return clubID;
-    }
-
-    public void setClubID(Integer clubID) {
-        this.clubID = clubID;
-    }
-
-    public String getClubScanTime() {
-        return clubScanTime;
-    }
-
-    public void setClubScanTime(String clubScanTime) {
-        this.clubScanTime = clubScanTime;
-    }
-
-    public String getPayWay() {
-        return payWay;
-    }
-
-    public void setPayWay(String payWay) {
-        this.payWay = payWay;
-    }
-
-    public String getOrderSource() {
-        return orderSource;
-    }
-
-    public void setOrderSource(String orderSource) {
-        this.orderSource = orderSource;
-    }
-
-    public String getOrderTime() {
-        return orderTime;
-    }
-
-    public void setOrderTime(String orderTime) {
-        this.orderTime = orderTime;
-    }
-
-    public String getPayTime() {
-        return payTime;
-    }
+import com.caimei.module.search.entity.vo.CmMallOrderVo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
-    public void setPayTime(String payTime) {
-        this.payTime = payTime;
-    }
-
-    public Integer getProductCount() {
-        return productCount;
-    }
-
-    public void setProductCount(Integer productCount) {
-        this.productCount = productCount;
-    }
-
-    public Integer getPresentCount() {
-        return presentCount;
-    }
-
-    public void setPresentCount(Integer presentCount) {
-        this.presentCount = presentCount;
-    }
-
-    public String getCooFreeFlag() {
-        return cooFreeFlag;
-    }
-
-    public void setCooFreeFlag(String cooFreeFlag) {
-        this.cooFreeFlag = cooFreeFlag;
-    }
-
-    public Integer getCooFreeRate() {
-        return cooFreeRate;
-    }
-
-    public void setCooFreeRate(Integer cooFreeRate) {
-        this.cooFreeRate = cooFreeRate;
-    }
-
-    public Double getCooFreeAmount() {
-        return cooFreeAmount;
-    }
-
-    public void setCooFreeAmount(Double cooFreeAmount) {
-        this.cooFreeAmount = cooFreeAmount;
-    }
-
-    public String getConfirmFlag() {
-        return confirmFlag;
-    }
-
-    public void setConfirmFlag(String confirmFlag) {
-        this.confirmFlag = confirmFlag;
-    }
-
-    public String getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(String updateDate) {
-        this.updateDate = updateDate;
-    }
-
-    public Integer getClauseID() {
-        return clauseID;
-    }
-
-    public void setClauseID(Integer clauseID) {
-        this.clauseID = clauseID;
-    }
-
-    public String getClauseContent() {
-        return clauseContent;
-    }
-
-    public void setClauseContent(String clauseContent) {
-        this.clauseContent = clauseContent;
-    }
-
-    public String getClauseName() {
-        return clauseName;
-    }
-
-    public void setClauseName(String clauseName) {
-        this.clauseName = clauseName;
-    }
-
-    public String getFreePostFlag() {
-        return freePostFlag;
-    }
-
-    public void setFreePostFlag(String freePostFlag) {
-        this.freePostFlag = freePostFlag;
-    }
-
-    public Double getFreight() {
-        return freight;
-    }
-
-    public void setFreight(Double freight) {
-        this.freight = freight;
-    }
-
-    public Integer getFreePostageTicketID() {
-        return freePostageTicketID;
-    }
-
-    public void setFreePostageTicketID(Integer freePostageTicketID) {
-        this.freePostageTicketID = freePostageTicketID;
-    }
-
-    public String getDelFlag() {
-        return delFlag;
-    }
-
-    public void setDelFlag(String delFlag) {
-        this.delFlag = delFlag;
-    }
-
-    public String getInvoiceFlag() {
-        return invoiceFlag;
-    }
-
-    public void setInvoiceFlag(String invoiceFlag) {
-        this.invoiceFlag = invoiceFlag;
-    }
-
-    public Double getPreferential() {
-        return preferential;
-    }
-
-    public void setPreferential(Double preferential) {
-        this.preferential = preferential;
-    }
-
-    public String getConfirmTime() {
-        return confirmTime;
-    }
-
-    public void setConfirmTime(String confirmTime) {
-        this.confirmTime = confirmTime;
-    }
-
-    public String getCloseTime() {
-        return closeTime;
-    }
-
-    public void setCloseTime(String closeTime) {
-        this.closeTime = closeTime;
-    }
-
-    public String getCloseReason() {
-        return closeReason;
-    }
-
-    public void setCloseReason(String closeReason) {
-        this.closeReason = closeReason;
-    }
-
-    public String getSplitFlag() {
-        return splitFlag;
-    }
-
-    public void setSplitFlag(String splitFlag) {
-        this.splitFlag = splitFlag;
-    }
-
-    public String getPostageOrderFlag() {
-        return postageOrderFlag;
-    }
-
-    public void setPostageOrderFlag(String postageOrderFlag) {
-        this.postageOrderFlag = postageOrderFlag;
-    }
-
-    public String getOrderMark() {
-        return orderMark;
-    }
-
-    public void setOrderMark(String orderMark) {
-        this.orderMark = orderMark;
-    }
-
-    public String getHasActProduct() {
-        return hasActProduct;
-    }
-
-    public void setHasActProduct(String hasActProduct) {
-        this.hasActProduct = hasActProduct;
-    }
-
-    public String getReceiptStatus() {
-        return receiptStatus;
-    }
-
-    public void setReceiptStatus(String receiptStatus) {
-        this.receiptStatus = receiptStatus;
-    }
-
-    public String getPayStatus() {
-        return payStatus;
-    }
-
-    public void setPayStatus(String payStatus) {
-        this.payStatus = payStatus;
-    }
-
-    public String getSendOutStatus() {
-        return sendOutStatus;
-    }
-
-    public void setSendOutStatus(String sendOutStatus) {
-        this.sendOutStatus = sendOutStatus;
-    }
-
-    public String getRefundType() {
-        return refundType;
-    }
-
-    public void setRefundType(String refundType) {
-        this.refundType = refundType;
-    }
-
-    public List<CmMallShopOrder> getShopOrderList() {
-        return shopOrderList;
-    }
-
-    public void setShopOrderList(List<CmMallShopOrder> shopOrderList) {
-        this.shopOrderList = shopOrderList;
-    }
-
-    public Long getAutoCloseTimeMills() {
-        return autoCloseTimeMills;
-    }
+import java.math.BigDecimal;
+import java.util.List;
 
-    public void setAutoCloseTimeMills(Long autoCloseTimeMills) {
-        this.autoCloseTimeMills = autoCloseTimeMills;
-    }
+/**
+ * @author zc
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class CmMallOrder extends CmMallOrderVo {
+    /** 订单标识，例#orderID#：#1000# */
+    private String orderMark;
+    /** 订单编号+四位随机数----新的拼接交易号（transactionID+四位随机数） */
+    private String newOrderNo;
+    /** 订单状态备注 */
+    private String statusName;
+    /** 支付总金额 */
+    private BigDecimal receiptAmount;
+    /** 退款总金额 */
+    private BigDecimal returnedPurchaseFee;
+    /** 子订单集合 CmMallShopOrderVo */
+    private List<CmMallShopOrder> shopOrderList;
 }
-
-

src/main/java/com/caimei/mapper/order/OrderMapper.java

@@ -3,6 +3,7 @@ package com.caimei.mapper.order;
 import com.caimei.entity.*;
 import com.caimei.entity.CmMallOrganizeProducts;
 import com.caimei.entity.CmMallShop;
+import com.caimei.module.base.entity.vo.DiscernReceiptVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -83,4 +84,11 @@ public interface OrderMapper {
     CmMallProductsClassify findClassifyID(String classifyID);
 
     CmMallProductLadderPrice findLadderPrice(Integer id);
+
+    /**
+     * 查询是否有过线下支付,订单款
+     * @param orderId 订单id
+     * @return
+     */
+    DiscernReceiptVo findOfflinePayment(Integer orderId);
 }

src/main/java/com/caimei/service/order/impl/OrderServiceImpl.java

@@ -11,18 +11,17 @@ import com.caimei.mapper.products.HomePageMapper;
 import com.caimei.mapper.products.OrganizeProductsMapper;
 import com.caimei.mapper.products.ShoppingMapper;
 import com.caimei.mapper.user.CmMallAddressMapper;
+import com.caimei.mapper.user.CmMallUserMapper;
 import com.caimei.mapper.user.LoginMapper;
 import com.caimei.mapper.user.PersonalMapper;
-import com.caimei.mapper.user.CmMallUserMapper;
-import com.caimei.entity.CmMallOrganizeProducts;
-import com.caimei.entity.CmMallProduct;
-import com.caimei.entity.CmMallShop;
+import com.caimei.module.base.entity.vo.DiscernReceiptVo;
+import com.caimei.module.base.entity.vo.OrderRelationVo;
+import com.caimei.module.pay.dao.PayDao;
 import com.caimei.service.order.OrderService;
 import com.caimei.utils.AppUtils;
 import com.caimei.utils.MathUtil;
 import com.caimei.utils.NoUtils;
 import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.util.StringUtil;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -33,6 +32,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -65,6 +65,8 @@ public class OrderServiceImpl implements OrderService {
     private ShoppingMapper shoppingMapper;
     @Autowired
     private DetailsMapper detailsMapper;
+    @Resource
+    private PayDao payDao;
 
     @Value("${miniprogram.domain}")
     private String domain;
@@ -94,13 +96,13 @@ public class OrderServiceImpl implements OrderService {
                 productsList = orderMapper.findAllCommodity(params);
                 for (CmMallOrganizeProducts products : productsList) {
                     products.setMainImage(AppUtils.getImageURL("product", products.getMainImage(), 0, domain));
-                    if(StringUtils.equals("1",products.getLadderPriceFlag())){//阶梯价格
+                    if (StringUtils.equals("1", products.getLadderPriceFlag())) {//阶梯价格
                         List<CmMallProductLadderPrice> ladderPriceList = detailsMapper.findLadderPrice(products.getId());
                         //更加商品购买数量获取商品对应阶梯价格
                         retailPrice = getLadderPrice(products.getProductCount(), ladderPriceList);
                         totalPrice += retailPrice * products.getProductCount();
                         products.setRetailPrice(retailPrice);//重置阶梯价格售价
-                    }else{
+                    } else {
                         totalPrice += products.getRetailPrice() * products.getProductCount();
                     }
                 }
@@ -109,13 +111,13 @@ public class OrderServiceImpl implements OrderService {
                 CmMallOrganizeProducts products = orderMapper.findCommodity(productIDs, cmMallShop.getShopID());
                 products.setMainImage(AppUtils.getImageURL("product", products.getMainImage(), 0, domain));
                 products.setProductCount(count);
-                if(StringUtils.equals("1",products.getLadderPriceFlag())){//阶梯价格
+                if (StringUtils.equals("1", products.getLadderPriceFlag())) {//阶梯价格
                     List<CmMallProductLadderPrice> ladderPriceList = detailsMapper.findLadderPrice(products.getId());
                     //更加商品购买数量获取商品对应阶梯价格
                     retailPrice = getLadderPrice(products.getProductCount(), ladderPriceList);
                     totalPrice = retailPrice * products.getProductCount();
                     products.setRetailPrice(retailPrice);//重置阶梯价格售价
-                }else{
+                } else {
                     totalPrice = products.getRetailPrice() * products.getProductCount();
                 }
                 productsList.add(products);
@@ -245,13 +247,13 @@ public class OrderServiceImpl implements OrderService {
         if (order == null) throw new Exception("该订单已删除");
         order.setOrderMark("#" + order.getOrderID() + "#");
         //111,待付待收待发
-        if (order.getStatus().equals(11) && order.getPayStatus().equals("1")) {
-            order.setStatus(111);
+        if ("11".equals(order.getStatus()) && "1".equals(order.getPayStatus())) {
+            order.setStatus("111");
         }
         //判断交易全退情况下,是否发过货,77,交易全退可以查看物流
         List<CmMallLogisticsBatch> batchList = orderMapper.findLogistics(orderID);
-        if (order.getStatus().equals(7) && batchList != null && batchList.size() > 0) {
-            order.setStatus(77);
+        if ("7".equals(order.getStatus()) && batchList != null && batchList.size() > 0) {
+            order.setStatus("77");
         }
         //商品信息
         String[] ShopOrderIDs = {};
@@ -279,18 +281,27 @@ public class OrderServiceImpl implements OrderService {
                 receiptAmount += discernReceipt.getAssociateAmount();
             }
             //支付总金额
-            order.setReceiptAmount(receiptAmount);
+            order.setReceiptAmount(BigDecimal.valueOf(receiptAmount));
         }
         //退款记录
-        List<CmMallReturnedPurchase> returnedPurchaseList = orderMapper.findReturnedPurchase(order.getOrderID());
+        List<CmMallReturnedPurchase> returnedPurchaseList = orderMapper.findReturnedPurchase(order.getOrderID().intValue());
         if (returnedPurchaseList != null && returnedPurchaseList.size() > 0) {
             Double returnedPurchaseFee = 0d;
             for (CmMallReturnedPurchase returnedPurchase : returnedPurchaseList) {
                 returnedPurchaseFee += returnedPurchase.getRefundFee();
             }
             //退款总金额
-            order.setReturnedPurchaseFee(returnedPurchaseFee);
+            order.setReturnedPurchaseFee(BigDecimal.valueOf(returnedPurchaseFee));
         }
+
+        //判断是否可以走线上支付
+        DiscernReceiptVo discernReceipt = orderMapper.findOfflinePayment(orderID);
+        if (null == discernReceipt) {
+            order.setOnlinePayFlag("0");
+        } else {
+            order.setOnlinePayFlag("1");
+        }
+
         //客服热线号码
         String cellPhone = loginMapper.cellPhone(order.getOrganizeID());
         //分享码
@@ -432,16 +443,16 @@ public class OrderServiceImpl implements OrderService {
                         Double retailPrice = 0d;//售价
 //                        Integer classifyID = cmMallOrganizeProducts.getClassifyID();
 
-                        if(StringUtils.equals("1",cmMallOrganizeProducts.getLadderPriceFlag())){
+                        if (StringUtils.equals("1", cmMallOrganizeProducts.getLadderPriceFlag())) {
                             List<CmMallProductLadderPrice> ladderPriceList = detailsMapper.findLadderPrice(productId);
                             //判断阶梯价格的购买数量校验
                             Integer minBuyNumber = getMinBuyNumber(ladderPriceList);
-                            if(productNum < minBuyNumber){
+                            if (productNum < minBuyNumber) {
                                 return cmWxJsonModel.error("-1", "商品购买量低于最小起订量");
                             }
                             //更加商品购买数量获取商品对应阶梯价格
                             retailPrice = getLadderPrice(productNum, ladderPriceList);
-                        }else{
+                        } else {
                             retailPrice = cmMallOrganizeProducts.getRetailPrice();
                         }
                         double productFee = retailPrice * productNum;//单个商品的金额
@@ -510,25 +521,25 @@ public class OrderServiceImpl implements OrderService {
             if (isIncludedInstruments) {//包括仪器
                 if (isIncludedProduct && null != cmMallFreePostageCard) {//包含商品且有包邮卡
                     cmMallOrder.setFreePostFlag("-2");//免邮标志：-1到付，0包邮，1需要运费,-2仪器到付其它包邮【小程序只存在-1,0,-2】
-                    cmMallOrder.setFreight(-2d);
+                    cmMallOrder.setFreight(BigDecimal.valueOf(-2));
                 } else {//（1包含商品无包邮卡，2不包含商品）
                     cmMallOrder.setFreePostFlag("-1");
-                    cmMallOrder.setFreight(-1d);
+                    cmMallOrder.setFreight(BigDecimal.valueOf(-1));
                 }
             } else {//不包括仪器
                 if (isIncludedProduct && null != cmMallFreePostageCard) {//无仪器包含商品且有包邮卡
                     cmMallOrder.setFreePostFlag("0");//免邮标志：-1到付，0包邮，1需要运费,-2仪器到付其它包邮【小程序只存在-1,0,-2】
-                    cmMallOrder.setFreight(0d);
+                    cmMallOrder.setFreight(BigDecimal.valueOf(0));
                 } else {//（1无仪器包含商品无包邮卡）
                     cmMallOrder.setFreePostFlag("-1");
-                    cmMallOrder.setFreight(-1d);
+                    cmMallOrder.setFreight(BigDecimal.valueOf(-1));
                 }
             }
 
             /**统计订单应付总金额*/
             payTotalFee = productTotalFee;
             BigDecimal bdPayTotalFee = new BigDecimal(payTotalFee);
-            cmMallOrder.setStatus(11);//待收款待发货(设置初始化状态)
+            cmMallOrder.setStatus("11");//待收款待发货(设置初始化状态)
             cmMallOrder.setReceiptStatus("1");//（收款买家）收款状态：1待收款、2部分收款、3已收款(设置初始化状态)
             cmMallOrder.setPayFlag("0");//是否已支付 未支付0 已支付1(设置初始化状态)
 
@@ -548,7 +559,7 @@ public class OrderServiceImpl implements OrderService {
                         cmMallUser.setAbleUserMoney(new BigDecimal(0));//余额抵扣用完
                         cmMallUserMapper.updateUserMoney(cmMallUser);
                         cmMallUserMapper.updateAbleUserMoney(cmMallUser);
-                        cmMallOrder.setStatus(21);//部收款待发货
+                        cmMallOrder.setStatus("21");//部收款待发货
                         cmMallOrder.setReceiptStatus("2");
                     } else if (payTotalFee < userMoney) {//全部用余额抵扣，无需直接，直接变成支付完成
                         balancePayFee = payTotalFee;
@@ -556,7 +567,7 @@ public class OrderServiceImpl implements OrderService {
                         cmMallUser.setUserMoney(bdUserMoney.subtract(bdPayTotalFee));
                         cmMallUserMapper.updateAbleUserMoney(cmMallUser);
                         cmMallUserMapper.updateUserMoney(cmMallUser);
-                        cmMallOrder.setStatus(31);//已收款待发货
+                        cmMallOrder.setStatus("31");//已收款待发货
                         cmMallOrder.setReceiptStatus("3");
                         cmMallOrder.setPayFlag("1");
                         isPaySuccessFlag = true;
@@ -566,7 +577,7 @@ public class OrderServiceImpl implements OrderService {
                         cmMallUser.setUserMoney(new BigDecimal(0));
                         cmMallUserMapper.updateAbleUserMoney(cmMallUser);
                         cmMallUserMapper.updateUserMoney(cmMallUser);
-                        cmMallOrder.setStatus(31);//已收款待发货
+                        cmMallOrder.setStatus("31");//已收款待发货
                         cmMallOrder.setReceiptStatus("3");
                         cmMallOrder.setPayFlag("1");
                         isPaySuccessFlag = true;
@@ -597,41 +608,41 @@ public class OrderServiceImpl implements OrderService {
             String orderNo = NoUtils.getCmOrderNo("X");
             cmMallOrder.setOrderNo(orderNo);
             cmMallOrder.setOrganizeID(organizeID);
-            cmMallOrder.setUserID(userId);
+            cmMallOrder.setUserID(userId.longValue());
             cmMallOrder.setBuyUserID(cmOperationID);//操作者的ID(下单人)
             cmMallOrder.setOrderSubmitType(2);// 2:员工帮会所下单
             cmMallOrder.setOrderType(1);//订单类型 协销订单0 、普通订单(自主订单)1
             cmMallOrder.setHasActProduct("0");
             cmMallOrder.setSendOutStatus("1");//待发货
-            cmMallOrder.setProductTotalFee(productTotalFee);
-            cmMallOrder.setOrderTotalFee(productTotalFee);
-            cmMallOrder.setPayTotalFee(payTotalFee);
-            cmMallOrder.setPayableAmount(payableAmount.doubleValue());
-            cmMallOrder.setPreferential(0d);
-            cmMallOrder.setDiscountFee(0d);//经理折扣
+            cmMallOrder.setProductTotalFee(BigDecimal.valueOf(productTotalFee));
+            cmMallOrder.setOrderTotalFee(BigDecimal.valueOf(productTotalFee));
+            cmMallOrder.setPayTotalFee(BigDecimal.valueOf(payTotalFee));
+            cmMallOrder.setPayableAmount(payableAmount);
+            cmMallOrder.setPreferential(BigDecimal.valueOf(0));
+            cmMallOrder.setDiscountFee(BigDecimal.valueOf(0));//经理折扣
             cmMallOrder.setSpID(null);
             cmMallOrder.setMainSpID(null);
-            cmMallOrder.setClubID(clubID);
+            cmMallOrder.setClubID(clubID.longValue());
             cmMallOrder.setOrderSource("6");//小程序
             cmMallOrder.setConfirmTime(dateStr);
             cmMallOrder.setOrderTime(dateStr);
             cmMallOrder.setProductCount(productCount);
             cmMallOrder.setPresentCount(0);
             cmMallOrder.setConfirmFlag("1");
-            cmMallOrder.setClauseID(1);
+            cmMallOrder.setClauseID(1l);
             cmMallOrder.setClauseContent(null);
             cmMallOrder.setClauseName(null);
             cmMallOrder.setUpdateDate(dateStr);
             cmMallOrder.setDelFlag("0");
             cmMallOrder.setSplitFlag("0");//0不可拆分
             cmMallOrder.setPostageOrderFlag("0");//0不是邮费订单
-            cmMallOrder.setBalancePayFee(balancePayFee);//余额支付金额
+            cmMallOrder.setBalancePayFee(BigDecimal.valueOf(balancePayFee));//余额支付金额
             cmMallOrder.setPayStatus("1");//(付款供应商)付款状态：1待付款、2部分付款、3已付款
             cmMallOrder.setOnlinePayFlag("0");//是否能走线上支付 0可以 1不可以 只能线下
 
             //保存住订单数据
             orderMapper.insert(cmMallOrder);
-            Integer orderID = cmMallOrder.getOrderID();
+            Long orderID = cmMallOrder.getOrderID();
             logger.info(">>>>>orderID：" + orderID);
 
             if (useBalanceFlag) {
@@ -642,14 +653,37 @@ public class OrderServiceImpl implements OrderService {
                 cmMallUserBalanceRecord.setBalanceType("1");
                 cmMallUserBalanceRecord.setAddDate(new Date());
                 cmMallUserBalanceRecord.setAmount(String.valueOf(balancePayFee));
-                cmMallUserBalanceRecord.setOrderId(cmMallOrder.getOrderID());
+                cmMallUserBalanceRecord.setOrderId(cmMallOrder.getOrderID().intValue());
                 cmMallUserBalanceRecord.setDelFlag("0");
                 cmMallUserMapper.insertUserBalanceRecord(cmMallUserBalanceRecord);
+
+                //添加余额支付记录
+                DiscernReceiptVo discernReceipt = new DiscernReceiptVo();
+                discernReceipt.setPayWay("3");
+                discernReceipt.setPayType("16");
+                discernReceipt.setReceiptType("1");
+                discernReceipt.setReceiptStatus("3");
+                discernReceipt.setReceiptAmount(BigDecimal.valueOf(balancePayFee));
+                discernReceipt.setConfirmType("4");
+                discernReceipt.setReceiptDate(dateStr);
+                discernReceipt.setConfirmDate(dateStr);
+                discernReceipt.setReviewDate(dateStr);
+                discernReceipt.setUpdateDate(dateStr);
+                discernReceipt.setDelFlag("0");
+                payDao.insertDiscernReceipt(discernReceipt);
+                OrderRelationVo relation = new OrderRelationVo();
+                relation.setReceiptID(discernReceipt.getId().intValue());
+                relation.setOrderID(cmMallOrder.getOrderID().intValue());
+                relation.setAssociateAmount(BigDecimal.valueOf(balancePayFee));
+                relation.setRelationType("2");
+                relation.setDelFlag("0");
+                payDao.insertOrderRelation(relation);
+                logger.info(">>>>>>>>>>>>>>>>>>>>>>>保存余额到收款记录," + balancePayFee);
             }
 
             /**保存订单商品*/
             for (CmMallOrderProduct product : orderProductList) {//循环插入数据
-                product.setOrderID(orderID);
+                product.setOrderID(orderID.intValue());
                 product.setOrderNo(orderNo);
                 //保存订单商品数据
                 organizeProductsMapper.insert(product);
@@ -665,7 +699,7 @@ public class OrderServiceImpl implements OrderService {
 
                 /**统计子订单金额信息*/
                 CmMallOrderProduct cmMallOrderProduct = new CmMallOrderProduct();
-                cmMallOrderProduct.setOrderID(cmMallOrder.getOrderID());
+                cmMallOrderProduct.setOrderID(cmMallOrder.getOrderID().intValue());
                 cmMallOrderProduct.setShopID(shopID);
                 //查询属于该供应商的所有订单商品信息
                 List<CmMallOrderProduct> cmMallOrderProductList = orderProductMapper.findList(cmMallOrderProduct);
@@ -693,7 +727,7 @@ public class OrderServiceImpl implements OrderService {
                 cmMallShopOrder.setClubID(clubID);
                 cmMallShopOrder.setSpID(null);
                 cmMallShopOrder.setMainSpID(null);
-                cmMallShopOrder.setOrderID(orderID);
+                cmMallShopOrder.setOrderID(orderID.intValue());
                 cmMallShopOrder.setOrderNo(orderNo);
                 cmMallShopOrder.setUserID(userId);
                 cmMallShopOrder.setNote(note);
@@ -725,13 +759,13 @@ public class OrderServiceImpl implements OrderService {
                 cmMallShopOrder.setNeedPayAmount(needPayAmount.doubleValue());
                 cmMallShopOrder.setPreferential(preferential.doubleValue());
                 cmMallShopOrder.setShopProductAmount(shopProductAmount);
-                cmMallShopOrder.setShopPostFee(0D);//付给供应商运费
-                cmMallShopOrder.setShopTaxFee(0D);//付给供应商税费
-                cmMallShopOrder.setPayedShopAmount(0D);//已付款金额
-                cmMallShopOrder.setShopOtherFee(0D);//付第三方
+                cmMallShopOrder.setShopPostFee(0d);//付给供应商运费
+                cmMallShopOrder.setShopTaxFee(0d);//付给供应商税费
+                cmMallShopOrder.setPayedShopAmount(0d);//已付款金额
+                cmMallShopOrder.setShopOtherFee(0d);//付第三方
                 cmMallShopOrder.setSplitFlag("0");
 
-                List<CmMallShopOrder> cmMallShopOrders1 = cmMallShopOrderMapper.findMaxShopOrderNo(cmMallOrder.getOrderID());
+                List<CmMallShopOrder> cmMallShopOrders1 = cmMallShopOrderMapper.findMaxShopOrderNo(cmMallOrder.getOrderID().intValue());
                 String shopOrderNo = ""; //子订单编号
                 if (!CollectionUtils.isEmpty(cmMallShopOrders1)) {
                     shopOrderNo = cmMallShopOrders1.get(0).getShopOrderNo();
@@ -758,7 +792,7 @@ public class OrderServiceImpl implements OrderService {
             if (null != cmMallAddress) {
                 //保存地址信息
                 CmMallBpOrderUserInfo cmMallBpOrderUserInfo = new CmMallBpOrderUserInfo();
-                cmMallBpOrderUserInfo.setOrderId(orderID);
+                cmMallBpOrderUserInfo.setOrderId(orderID.intValue());
                 cmMallBpOrderUserInfo.setClubId(clubID);
                 cmMallBpOrderUserInfo.setUserId(userId);
                 cmMallBpOrderUserInfo.setName(cmMallUser.getUserName());
@@ -781,7 +815,7 @@ public class OrderServiceImpl implements OrderService {
             CmMallUserInvoiceInfo invoiceInfo = personalMapper.findInvoice(userId);
             if (null != invoiceInfo) {
                 CmMallOrderInvoice cmMallOrderInvoice = new CmMallOrderInvoice();
-                cmMallOrderInvoice.setOrderId(orderID);
+                cmMallOrderInvoice.setOrderId(orderID.intValue());
                 cmMallOrderInvoice.setInvoiceTitle(invoiceInfo.getInvoiceTitle());
                 cmMallOrderInvoice.setType("2");//增值税发票
                 cmMallOrderInvoice.setCorporationTaxNum(invoiceInfo.getCorporationTaxNum());
@@ -816,6 +850,7 @@ public class OrderServiceImpl implements OrderService {
 
     /**
      * 获取阶梯价格最小购买数量
+     *
      * @return
      */
     private Integer getMinBuyNumber(List<CmMallProductLadderPrice> ladderPriceList) {
@@ -863,8 +898,8 @@ public class OrderServiceImpl implements OrderService {
         List<CmMallOrder> orderList = orderMapper.findAllOrder(userID, orderState, organizeID);
         for (CmMallOrder order : orderList) {
             //111,待付待收待发
-            if (order.getStatus().equals(11) && order.getPayStatus().equals("1")) {
-                order.setStatus(111);
+            if ("11".equals(order.getStatus()) && "1".equals(order.getPayStatus())) {
+                order.setStatus("111");
             }
             String[] ShopOrderIDs = {};
             if (order.getShopOrderIDs().contains(",")) {
@@ -882,6 +917,13 @@ public class OrderServiceImpl implements OrderService {
                 shopOrder.setShopLogo(AppUtils.getImageURL("shopLogo", shopOrder.getShopLogo(), 0, domain));
             }
             order.setShopOrderList(shopOrderList);
+            //判断是否可以走线上支付
+            DiscernReceiptVo discernReceipt = orderMapper.findOfflinePayment(order.getOrderID().intValue());
+            if (null == discernReceipt) {
+                order.setOnlinePayFlag("0");
+            } else {
+                order.setOnlinePayFlag("1");
+            }
         }
         return orderList;
     }
@@ -917,7 +959,7 @@ public class OrderServiceImpl implements OrderService {
         CmWxJsonModel model = CmWxJsonModel.newInstance();
         CmMallOrder order = orderMapper.findOrder(orderID);
         if (order == null) return model.error("订单不存在");
-        if (!(order.getStatus() == 6)) {
+        if (!("6".equals(order.getStatus()))) {
             return model.error("订单异常");
         }
         //逻辑删除主订单
@@ -961,26 +1003,30 @@ public class OrderServiceImpl implements OrderService {
     @Override
     public void cancelOrder(Integer orderID) throws Exception {
         CmMallOrder order = orderMapper.findOrder(orderID);
-        if (order == null) throw new Exception("订单不存在");
-        if (!(order.getStatus() == 11)) {
+        if (order == null) {
+            throw new Exception("订单不存在");
+        }
+        if (!("11".equals(order.getStatus()))) {
             throw new Exception("订单异常");
         }
-        order.setStatus(6);
+        order.setStatus("6");
         orderMapper.update(order);
     }
 
     @Override
     public void affirmCargo(Integer orderID) throws Exception {
         CmMallOrder order = orderMapper.findOrder(orderID);
-        if (order == null) throw new Exception("订单不存在");
-        if (order.getStatus() == 33 && order.getPayStatus().equals("3")) {
+        if (order == null) {
+            throw new Exception("订单不存在");
+        }
+        if ("33".equals(order.getStatus()) && "3".equals(order.getPayStatus())) {
             //已付款供应商,订单完成
-            order.setStatus(5);
+            order.setStatus("5");
             orderMapper.update(order);
             orderMapper.updateLogisticsBatch(orderID);
-        } else if (order.getStatus() == 33) {
+        } else if ("33".equals(order.getStatus())) {
             //交易完成
-            order.setStatus(4);
+            order.setStatus("4");
             orderMapper.update(order);
             orderMapper.updateLogisticsBatch(orderID);
         } else {

src/main/java/com/caimei/service/products/impl/DetailsServiceImpl.java

@@ -45,13 +45,13 @@ public class DetailsServiceImpl implements DetailsService {
             }
         }
         cmMallProduct.setTagsList(split);
-        cmMallProduct.setMainImage(AppUtils.getImageURL("cmMallProduct", cmMallProduct.getMainImage(), 0, domain));
+        cmMallProduct.setMainImage(AppUtils.getImageURL("product", cmMallProduct.getMainImage(), 0, domain));
         if (cmMallProduct.getStock() == null || cmMallProduct.getStock() == 0) cmMallProduct.setStock(99);
         organizeProducts.setProduct(cmMallProduct);
         //商品图片
         List<CmMallProductImage> cmMallProductImage = detailsMapper.findAllProductImage(organizeProducts.getProductID());
         for (CmMallProductImage image : cmMallProductImage) {
-            String imageURL = AppUtils.getImageURL("cmMallProduct", image.getImage(), 0, domain);
+            String imageURL = AppUtils.getImageURL("product", image.getImage(), 0, domain);
             image.setImage(imageURL);
         }
         organizeProducts.setProductImage(cmMallProductImage);

src/main/java/com/caimei/service/products/impl/HomePageServiceImpl.java

@@ -3,8 +3,8 @@ package com.caimei.service.products.impl;
 import com.caimei.entity.*;
 import com.caimei.mapper.products.HomePageMapper;
 import com.caimei.entity.CmMallOrganizeProducts;
-import com.caimei.module.entity.vo.CmMallProductLadderPriceVo;
-import com.caimei.module.service.SearchService;
+import com.caimei.module.search.entity.vo.CmMallProductLadderPriceVo;
+import com.caimei.module.search.service.SearchService;
 import com.caimei.service.products.HomePageService;
 import com.caimei.utils.AppUtils;
 import org.slf4j.Logger;

src/main/java/com/caimei/utils/WxConfig.java

@@ -0,0 +1,130 @@
+package com.caimei.utils;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.caimei.module.base.entity.bo.JsonModel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 微信工具类
+ *
+ * @author LG
+ * @create 2017-09-21
+ **/
+@Component
+public class WxConfig {
+    protected static final Logger logger = LoggerFactory.getLogger(WxConfig.class);
+
+    public static String MiniAppId;
+
+    @Value("${miniprogram.AppId1}")
+    public void setMiniAppId(String miniAppId) {
+        MiniAppId = miniAppId;
+    }
+
+    public static String MiniAppSecret;
+
+    @Value("${miniprogram.AppSecret1}")
+    public void setMiniAppSecret(String miniAppSecret) {
+        MiniAppSecret = miniAppSecret;
+    }
+
+    public static String CrmAppId;
+
+    @Value("${miniprogram.crm_AppId}")
+    public void setCrmAppId(String crmAppId) {
+        CrmAppId = crmAppId;
+    }
+
+    public static String CrmAppSecret;
+
+    @Value("${miniprogram.crm_AppSecret}")
+    public void setCrmAppSecret(String crmAppSecret) {
+        CrmAppSecret = crmAppSecret;
+    }
+
+
+    /**
+     * 网页授权登录,通过code获取access_token
+     *
+     * @param code wxcode
+     * @return
+     * @throws Exception
+     */
+    public static Map<String, Object> getAccessTokenMap(String code, String source) throws Exception {
+        String link = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=APPID&secret=SECRET&code=CODE&grant_type=authorization_code";
+        //微信公众号
+        link = link.replace("APPID", CrmAppId);
+        link = link.replace("SECRET", CrmAppSecret);
+        //填写第一步获取的code参数
+        link = link.replace("CODE", code);
+        String result = HttpRequest.sendGet(link);
+        logger.info(result);
+        Map<String, Object> map = JSONObject.parseObject(result, Map.class);
+        return map;
+    }
+
+
+    /**
+     * 小程序微信授权登录,获取openid
+     *
+     * @param code 微信凭证
+     */
+    public static JsonModel getWxJscode(String code, HttpServletRequest request) {
+        JsonModel res = JsonModel.newInstance();
+        logger.info("Start get SessionKey");
+        Map<String, Object> map = new HashMap<>();
+        //获取当前微信小程序的环境
+        String referer = request.getHeader("Referer");
+        logger.info("referer-is----:" + referer);
+        map.put("referer", referer);
+        String requestUrl = "https://api.weixin.qq.com/sns/jscode2session";
+        Map<String, String> requestUrlParam = new HashMap<String, String>();
+        //小程序appId
+        requestUrlParam.put("appid", MiniAppId);
+        logger.info("appid: ---" + MiniAppId);
+        //小程序appsecret
+        requestUrlParam.put("secret", MiniAppSecret);
+        //小程序端返回的code
+        requestUrlParam.put("js_code", code);
+        //默认参数
+        requestUrlParam.put("grant_type", "authorization_code");
+        //发送post请求读取调用微信接口获取openid用户唯一标识
+        String infos;
+        try {
+            infos = HttpRequest.sendPost(requestUrl, requestUrlParam);
+        } catch (Exception e) {
+            res.setData(map);
+            return res.error("服务器内部异常");
+        }
+        //解析相应内容（转换成json对象）
+        JSONObject jsonObject = JSON.parseObject(infos);
+        String openid = jsonObject.getString("openid");
+        logger.info("openid----->" + openid);
+        String unionid = jsonObject.getString("unionid");
+        logger.info("unionid------>" + unionid);
+        map.put("openid", openid);
+        map.put("unionid", unionid);
+        String session_key = jsonObject.getString("session_key");
+        map.put("session_key", session_key);
+        String errcode = jsonObject.getString("errcode");
+        String errmsg = jsonObject.getString("errmsg");
+        if (!StringUtils.isEmpty(errcode) &&
+                ("-1".equals(errcode) || "40029".equals(errcode) || "45011".equals(errcode))) {
+            res.setMsg(errmsg);
+            res.setData(map);
+            map.put("sessionKey", session_key);
+            res.setCode(-1);
+            return res;
+        }
+        return res.success(map);
+    }
+}

src/main/resources/dev/application-dev.yml

@@ -6,9 +6,9 @@ spring:
 
     #数据源连接--start
   datasource:
-    url: jdbc:mysql://119.29.0.46:3306/caimei_dev?characterEncoding=UTF8
-    username: general
-    password: 6#xsI%b4o@5c3RoE
+    url: jdbc:mysql://192.168.1.11:3306/caimei@20180509?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    username: developer
+    password: 05bZ/OxTB:X+yd%1
     #数据源连接--end
 
   #模板引擎配置
@@ -26,6 +26,7 @@ mybatis:
   mapper-locations:
     - classpath:mapper/*.xml
     - classpath:caimei-search-mapper/*Mapper.xml
+    - classpath:com-caimei-module-pay/*Mapper.xml
   #pojo别名扫描包
   type-aliases-package: com.caimei.entity
 
@@ -52,4 +53,12 @@ miniprogram:
   #采美组织
   AppId2: wxf3cd4ae0cdd11c36
   AppSecret2: 9bdb37d28c5e74ad3694c09c205e9bd2
-
+  #crm公众号信息
+  crm_AppId: wxea43a0f9ebce9e66
+  crm_AppSecret: 1c3cd60908e72dd280840bee9e15f7f6
+  #支付异步回调地址
+  notifyUrl: http://localhost:8107/PayOrder/paymentCallback
+  #支付链接重定向地址
+  redirectLink: http://192.168.1.40:8107/PayOrder/jumpPage
+  #链接页面
+  linkPage: http://192.168.1.10:8083/web/order/view/pay/caimei-starspay.jsp

src/main/resources/mapper/OrderMapper.xml

@@ -313,6 +313,7 @@
           AND cror.delFlag = '0'
           AND cdr.delFlag = '0'
           AND cdr.receiptStatus = '3'
+          AND cdr.payWay != '3'
         ORDER BY
           cdr.receiptDate DESC
     </select>
@@ -574,4 +575,20 @@
         LIMIT
           1
     </select>
+
+    <select id="findOfflinePayment" resultType="com.caimei.module.base.entity.vo.DiscernReceiptVo">
+        SELECT
+          cdr.*,cror.associateAmount
+        FROM
+          cm_receipt_order_relation cror
+          LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
+        WHERE
+          cror.orderID = #{orderId}
+          AND cror.relationType = '2'
+          AND cror.delFlag = '0'
+          AND cdr.delFlag = '0'
+          AND cdr.receiptStatus IN(2,3)
+          AND cdr.payWay = '2'
+        LIMIT 1
+    </select>
 </mapper>