Huiwen 6 éve
commit
df652e438c
100 módosított fájl, 6256 hozzáadás és 0 törlés
  1. 32 0
      .classpath
  2. 8 0
      .idea/artifacts/holleworld_war.xml
  3. 51 0
      .idea/artifacts/holleworld_war_exploded.xml
  4. 16 0
      .idea/compiler.xml
  5. 36 0
      .idea/inspectionProfiles/Project_Default.xml
  6. 13 0
      .idea/libraries/Maven__aopalliance_aopalliance_1_0.xml
  7. 13 0
      .idea/libraries/Maven__cglib_cglib_nodep_3_2_5.xml
  8. 13 0
      .idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_1.xml
  9. 13 0
      .idea/libraries/Maven__ch_qos_logback_logback_core_1_1_1.xml
  10. 13 0
      .idea/libraries/Maven__com_alibaba_fastjson_1_2_23.xml
  11. 13 0
      .idea/libraries/Maven__com_fasterxml_classmate_1_3_1.xml
  12. 13 0
      .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml
  13. 13 0
      .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_5.xml
  14. 13 0
      .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_5.xml
  15. 13 0
      .idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_0.xml
  16. 13 0
      .idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_2.xml
  17. 13 0
      .idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
  18. 13 0
      .idea/libraries/Maven__dom4j_dom4j_1_6_1.xml
  19. 13 0
      .idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml
  20. 13 0
      .idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml
  21. 13 0
      .idea/libraries/Maven__junit_junit_3_8_1.xml
  22. 13 0
      .idea/libraries/Maven__log4j_log4j_1_2_17.xml
  23. 13 0
      .idea/libraries/Maven__mysql_mysql_connector_java_5_1_35.xml
  24. 13 0
      .idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_9.xml
  25. 13 0
      .idea/libraries/Maven__org_hibernate_hibernate_validator_5_3_4_Final.xml
  26. 13 0
      .idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml
  27. 13 0
      .idea/libraries/Maven__org_mybatis_mybatis_3_4_1.xml
  28. 13 0
      .idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml
  29. 13 0
      .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_12.xml
  30. 13 0
      .idea/libraries/Maven__org_springframework_spring_aop_4_3_4_RELEASE.xml
  31. 13 0
      .idea/libraries/Maven__org_springframework_spring_aspects_4_3_4_RELEASE.xml
  32. 13 0
      .idea/libraries/Maven__org_springframework_spring_beans_4_3_4_RELEASE.xml
  33. 13 0
      .idea/libraries/Maven__org_springframework_spring_context_4_3_4_RELEASE.xml
  34. 13 0
      .idea/libraries/Maven__org_springframework_spring_core_4_3_4_RELEASE.xml
  35. 13 0
      .idea/libraries/Maven__org_springframework_spring_expression_4_3_4_RELEASE.xml
  36. 13 0
      .idea/libraries/Maven__org_springframework_spring_jdbc_4_3_4_RELEASE.xml
  37. 13 0
      .idea/libraries/Maven__org_springframework_spring_tx_4_3_4_RELEASE.xml
  38. 13 0
      .idea/libraries/Maven__org_springframework_spring_web_4_3_4_RELEASE.xml
  39. 13 0
      .idea/libraries/Maven__org_springframework_spring_webmvc_4_3_4_RELEASE.xml
  40. 13 0
      .idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml
  41. 16 0
      .idea/misc.xml
  42. 8 0
      .idea/modules.xml
  43. 124 0
      .idea/uiDesigner.xml
  44. 6 0
      .idea/vcs.xml
  45. 1342 0
      .idea/workspace.xml
  46. 48 0
      .project
  47. 13 0
      .settings/.jsdtscope
  48. 8 0
      .settings/org.eclipse.jdt.core.prefs
  49. 4 0
      .settings/org.eclipse.m2e.core.prefs
  50. 10 0
      .settings/org.eclipse.wst.common.component
  51. 7 0
      .settings/org.eclipse.wst.common.project.facet.core.xml
  52. 1 0
      .settings/org.eclipse.wst.jsdt.ui.superType.container
  53. 1 0
      .settings/org.eclipse.wst.jsdt.ui.superType.name
  54. 2 0
      .settings/org.eclipse.wst.validation.prefs
  55. 64 0
      holleworld.iml
  56. 203 0
      pom.xml
  57. 143 0
      src/main/java/com/fuzamei/aspect/AnnotationTest.java
  58. 72 0
      src/main/java/com/fuzamei/common/bean/OpteratorTime.java
  59. 94 0
      src/main/java/com/fuzamei/common/constrain/OperationEnum.java
  60. 42 0
      src/main/java/com/fuzamei/common/constrain/ReslutMsgEnum.java
  61. 68 0
      src/main/java/com/fuzamei/common/constrain/StatusEnum.java
  62. 30 0
      src/main/java/com/fuzamei/common/exception/G33Exception.java
  63. 64 0
      src/main/java/com/fuzamei/config/CrosFilter.java
  64. 53 0
      src/main/java/com/fuzamei/controller/AssetController.java
  65. 73 0
      src/main/java/com/fuzamei/controller/BIllOrderActController.java
  66. 230 0
      src/main/java/com/fuzamei/controller/BillController.java
  67. 114 0
      src/main/java/com/fuzamei/controller/EnterpriseController.java
  68. 91 0
      src/main/java/com/fuzamei/controller/LoggerController.java
  69. 177 0
      src/main/java/com/fuzamei/controller/MarketController.java
  70. 247 0
      src/main/java/com/fuzamei/controller/UserController.java
  71. 22 0
      src/main/java/com/fuzamei/dao/AssetDao.java
  72. 27 0
      src/main/java/com/fuzamei/dao/BillDao.java
  73. 43 0
      src/main/java/com/fuzamei/dao/BillOrderActDao.java
  74. 10 0
      src/main/java/com/fuzamei/dao/ConnectMapper.java
  75. 30 0
      src/main/java/com/fuzamei/dao/EnterpriseMapper.java
  76. 48 0
      src/main/java/com/fuzamei/dao/LoggerDao.java
  77. 24 0
      src/main/java/com/fuzamei/dao/MarketDAO.java
  78. 10 0
      src/main/java/com/fuzamei/dao/OrdersDAO.java
  79. 30 0
      src/main/java/com/fuzamei/dao/UserMapper.java
  80. 28 0
      src/main/java/com/fuzamei/dto/AssetChangeDto.java
  81. 91 0
      src/main/java/com/fuzamei/dto/BaseDTO.java
  82. 18 0
      src/main/java/com/fuzamei/dto/BaseVo.java
  83. 66 0
      src/main/java/com/fuzamei/dto/BillPayInfoDto.java
  84. 68 0
      src/main/java/com/fuzamei/dto/BuyBackInfoDTO.java
  85. 61 0
      src/main/java/com/fuzamei/dto/Condition.java
  86. 121 0
      src/main/java/com/fuzamei/dto/FilterDto.java
  87. 70 0
      src/main/java/com/fuzamei/dto/FincanceInfoDto.java
  88. 121 0
      src/main/java/com/fuzamei/dto/InitiateBillVo.java
  89. 178 0
      src/main/java/com/fuzamei/dto/MarketDTO.java
  90. 98 0
      src/main/java/com/fuzamei/dto/OrderActDto.java
  91. 134 0
      src/main/java/com/fuzamei/dto/OrderDto.java
  92. 62 0
      src/main/java/com/fuzamei/dto/PickDTO.java
  93. 68 0
      src/main/java/com/fuzamei/dto/PledgeInfoDTO.java
  94. 97 0
      src/main/java/com/fuzamei/dto/UpdateBillOrderActDto.java
  95. 11 0
      src/main/java/com/fuzamei/dto/billInfoDto.java
  96. 136 0
      src/main/java/com/fuzamei/entity/Asset.java
  97. 232 0
      src/main/java/com/fuzamei/entity/BillOrderAct.java
  98. 82 0
      src/main/java/com/fuzamei/entity/Enterprise.java
  99. 184 0
      src/main/java/com/fuzamei/entity/Market.java
  100. 133 0
      src/main/java/com/fuzamei/entity/Order.java

+ 32 - 0
.classpath

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

+ 8 - 0
.idea/artifacts/holleworld_war.xml

@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="war" name="holleworld:war">
+    <output-path>$PROJECT_DIR$/target</output-path>
+    <root id="archive" name="holleworld-1.0-SNAPSHOT.war">
+      <element id="artifact" artifact-name="holleworld:war exploded" />
+    </root>
+  </artifact>
+</component>

+ 51 - 0
.idea/artifacts/holleworld_war_exploded.xml

@@ -0,0 +1,51 @@
+<component name="ArtifactManager">
+  <artifact type="exploded-war" name="holleworld:war exploded">
+    <output-path>$PROJECT_DIR$/target/holleworld-1.0-SNAPSHOT</output-path>
+    <root id="root">
+      <element id="directory" name="WEB-INF">
+        <element id="directory" name="classes">
+          <element id="module-output" name="holleworld" />
+        </element>
+        <element id="directory" name="lib">
+          <element id="library" level="project" name="Maven: org.slf4j:slf4j-api:1.7.12" />
+          <element id="library" level="project" name="Maven: ch.qos.logback:logback-core:1.1.1" />
+          <element id="library" level="project" name="Maven: ch.qos.logback:logback-classic:1.1.1" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-aop:4.3.4.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-beans:4.3.4.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-context:4.3.4.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-core:4.3.4.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-expression:4.3.4.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-web:4.3.4.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-webmvc:4.3.4.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-jdbc:4.3.4.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-tx:4.3.4.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-aspects:4.3.4.RELEASE" />
+          <element id="library" level="project" name="Maven: aopalliance:aopalliance:1.0" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.5" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.5" />
+          <element id="library" level="project" name="Maven: com.alibaba:fastjson:1.2.23" />
+          <element id="library" level="project" name="Maven: org.aspectj:aspectjweaver:1.8.9" />
+          <element id="library" level="project" name="Maven: org.mybatis:mybatis:3.4.1" />
+          <element id="library" level="project" name="Maven: org.mybatis:mybatis-spring:1.3.0" />
+          <element id="library" level="project" name="Maven: mysql:mysql-connector-java:5.1.35" />
+          <element id="library" level="project" name="Maven: log4j:log4j:1.2.17" />
+          <element id="library" level="project" name="Maven: cglib:cglib-nodep:3.2.5" />
+          <element id="library" level="project" name="Maven: commons-logging:commons-logging:1.2" />
+          <element id="library" level="project" name="Maven: dom4j:dom4j:1.6.1" />
+          <element id="library" level="project" name="Maven: xml-apis:xml-apis:1.0.b2" />
+          <element id="library" level="project" name="Maven: com.github.pagehelper:pagehelper:5.1.2" />
+          <element id="library" level="project" name="Maven: com.github.jsqlparser:jsqlparser:1.0" />
+          <element id="library" level="project" name="Maven: org.hibernate:hibernate-validator:5.3.4.Final" />
+          <element id="library" level="project" name="Maven: javax.validation:validation-api:1.1.0.Final" />
+          <element id="library" level="project" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" />
+          <element id="library" level="project" name="Maven: com.fasterxml:classmate:1.3.1" />
+        </element>
+      </element>
+      <element id="directory" name="META-INF">
+        <element id="file-copy" path="$PROJECT_DIR$/target/holleworld-1.0-SNAPSHOT/META-INF/MANIFEST.MF" />
+      </element>
+      <element id="javaee-facet-resources" facet="holleworld/web/Web" />
+    </root>
+  </artifact>
+</component>

+ 16 - 0
.idea/compiler.xml

@@ -0,0 +1,16 @@
+<?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="holleworld" />
+      </profile>
+    </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="holleworld" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>

+ 36 - 0
.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,36 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="TOP_LEVEL_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="INNER_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="METHOD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
+        </value>
+      </option>
+      <option name="FIELD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="IGNORE_DEPRECATED" value="false" />
+      <option name="IGNORE_JAVADOC_PERIOD" value="true" />
+      <option name="IGNORE_DUPLICATED_THROWS" value="false" />
+      <option name="IGNORE_POINT_TO_ITSELF" value="false" />
+      <option name="myAdditionalJavadocTags" value="date" />
+    </inspection_tool>
+  </profile>
+</component>

+ 13 - 0
.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml

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

+ 13 - 0
.idea/libraries/Maven__cglib_cglib_nodep_3_2_5.xml

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

+ 13 - 0
.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_1.xml

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

+ 13 - 0
.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_1.xml

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

+ 13 - 0
.idea/libraries/Maven__com_alibaba_fastjson_1_2_23.xml

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

+ 13 - 0
.idea/libraries/Maven__com_fasterxml_classmate_1_3_1.xml

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

+ 13 - 0
.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml

@@ -0,0 +1,13 @@
+<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>

+ 13 - 0
.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_5.xml

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

+ 13 - 0
.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_5.xml

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

+ 13 - 0
.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_0.xml

@@ -0,0 +1,13 @@
+<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>

+ 13 - 0
.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_2.xml

@@ -0,0 +1,13 @@
+<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>

+ 13 - 0
.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml

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

+ 13 - 0
.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml

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

+ 13 - 0
.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml

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

+ 13 - 0
.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml

@@ -0,0 +1,13 @@
+<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>

+ 13 - 0
.idea/libraries/Maven__junit_junit_3_8_1.xml

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

+ 13 - 0
.idea/libraries/Maven__log4j_log4j_1_2_17.xml

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

+ 13 - 0
.idea/libraries/Maven__mysql_mysql_connector_java_5_1_35.xml

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

+ 13 - 0
.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_9.xml

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

+ 13 - 0
.idea/libraries/Maven__org_hibernate_hibernate_validator_5_3_4_Final.xml

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

+ 13 - 0
.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml

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

+ 13 - 0
.idea/libraries/Maven__org_mybatis_mybatis_3_4_1.xml

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

+ 13 - 0
.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml

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

+ 13 - 0
.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_12.xml

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

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_aop_4_3_4_RELEASE.xml

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

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_aspects_4_3_4_RELEASE.xml

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

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_beans_4_3_4_RELEASE.xml

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

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_context_4_3_4_RELEASE.xml

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

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_core_4_3_4_RELEASE.xml

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

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_expression_4_3_4_RELEASE.xml

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

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_4_RELEASE.xml

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

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_tx_4_3_4_RELEASE.xml

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

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_web_4_3_4_RELEASE.xml

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

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_4_RELEASE.xml

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

+ 13 - 0
.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml

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

+ 16 - 0
.idea/misc.xml

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

+ 8 - 0
.idea/modules.xml

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

+ 124 - 0
.idea/uiDesigner.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>

+ 6 - 0
.idea/vcs.xml

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

+ 1342 - 0
.idea/workspace.xml

@@ -0,0 +1,1342 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ArtifactsWorkspaceSettings">
+    <artifacts-to-build>
+      <artifact name="holleworld:war exploded" />
+    </artifacts-to-build>
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="4e0af280-8b1f-412d-bb7e-98dd302a8326" name="Default" comment="订单模块部分完成" />
+    <ignored path="$PROJECT_DIR$/target/" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="DatabaseView">
+    <option name="SHOW_INTERMEDIATE" value="true" />
+    <option name="GROUP_DATA_SOURCES" value="true" />
+    <option name="GROUP_SCHEMA" value="true" />
+    <option name="GROUP_CONTENTS" value="false" />
+    <option name="SORT_POSITIONED" value="false" />
+    <option name="SHOW_EMPTY_GROUPS" value="false" />
+    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
+    <option name="HIDDEN_KINDS">
+      <set />
+    </option>
+    <expand>
+      <path>
+        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
+        <item name="dataSource" type="feb32156:DbDataSourceImpl" />
+      </path>
+      <path>
+        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
+        <item name="dataSource" type="feb32156:DbDataSourceImpl" />
+        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
+      </path>
+      <path>
+        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
+        <item name="dataSource" type="feb32156:DbDataSourceImpl" />
+        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
+        <item name="d1: schema" type="c314c289:MysqlImplModel$Schema" />
+      </path>
+    </expand>
+    <select />
+  </component>
+  <component name="FileEditorManager">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
+      <file leaf-file-name="ExceptionHandle.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/handler/ExceptionHandle.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="540">
+              <caret line="18" column="7" selection-start-line="18" selection-start-column="7" selection-end-line="18" selection-end-column="7" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="UserServiceImpl.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/service/serviceimpl/UserServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="238">
+              <caret line="14" column="7" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#1101#1102#0" expanded="true" />
+                <element signature="e#1142#1143#0" expanded="true" />
+                <element signature="e#1178#1179#0" expanded="true" />
+                <element signature="e#1217#1218#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ConnectServiceImpl.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/service/serviceimpl/ConnectServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="536">
+              <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ConnectService.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/service/ConnectService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="390">
+              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="BIllServiceImpl.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/service/serviceimpl/BIllServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="658">
+              <caret line="133" column="9" lean-forward="true" selection-start-line="133" selection-start-column="9" selection-end-line="133" selection-end-column="9" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="UserService.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/service/UserService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-4">
+              <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="EnterpriseController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/controller/EnterpriseController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="356">
+              <caret line="39" column="18" lean-forward="true" selection-start-line="39" selection-start-column="18" selection-end-line="39" selection-end-column="18" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="UserController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/controller/UserController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-274">
+              <caret line="112" column="5" lean-forward="true" selection-start-line="112" selection-start-column="5" selection-end-line="112" selection-end-column="5" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="BillOrderServiceImpl.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/service/serviceimpl/BillOrderServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="643">
+              <caret line="102" column="101" selection-start-line="102" selection-start-column="101" selection-end-line="102" selection-end-column="101" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="MarketServiceImpl.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/service/serviceimpl/MarketServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="549">
+              <caret line="350" lean-forward="true" selection-start-line="350" selection-end-line="350" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Interface" />
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>john</find>
+      <find>BillOrderActService</find>
+      <find>getInitiateBillInfo</find>
+      <find>com.fuzhamei.ssm</find>
+      <find>OrderActDAO</find>
+      <find>operator_enterpriseId</find>
+      <find>sqc</find>
+      <find>com.sqc</find>
+    </findStrings>
+    <replaceStrings>
+      <replace>BillOrderActDao</replace>
+      <replace />
+      <replace>fuzamei</replace>
+      <replace>com.fuzamei</replace>
+    </replaceStrings>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="GradleLocalSettings">
+    <option name="projectSyncType">
+      <map>
+        <entry key="$USER_HOME$/Documents/Tencent Files/1335033346/FileRecv/SpringiA4_SourceCode/Chapter_17/jms" value="PREVIEW" />
+        <entry key="$USER_HOME$/Documents/Tencent Files/1335033346/FileRecv/SpringiA4_SourceCode/Chapter_18/STOMP" value="PREVIEW" />
+        <entry key="$USER_HOME$/Documents/Tencent Files/1335033346/FileRecv/SpringiA4_SourceCode/Chapter_18/STOMPUser" value="PREVIEW" />
+        <entry key="$USER_HOME$/Documents/Tencent Files/1335033346/FileRecv/SpringiA4_SourceCode/Chapter_18/WebSocket" value="PREVIEW" />
+        <entry key="$USER_HOME$/Downloads/SpringBoot-DynamicDataSource-master" value="PREVIEW" />
+        <entry key="$USER_HOME$/Downloads/SpringBoot-DynamicDataSource-master/SpringBoot-DynamicDataSource-master" value="PREVIEW" />
+      </map>
+    </option>
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzhamei/g33/controller/BIllOrderActController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzhamei/g33/service/serviceimpl/BillOrderServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzhamei/g33/service/serviceimpl/BIllServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzhamei/service/serviceimpl/BIllServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/dao/MarketPO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/dao/OrderActDAO.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapping/MarketMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/dao/MarketDAO.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring-mybatis.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/dao/OrdersDAO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/dao/BillOrderActDao.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/entity/BillOrderAct.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapping/BillOrderActMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/entity/User.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/common/interceptor/LoginInterceptor.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/util/HintEnum.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/dao/ConnectMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/dao/UserMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/service/serviceimpl/EnterpriseServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapping/ConnectMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapping/UserMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/interceptor/LoginInterceptor.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/dto/FincanceInfoDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/service/BillOrderActService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/service/MarketService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/dao/UserEnterpriseDao.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/entity/UserEnterprise.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/dao/EnterpriseMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapping/EnterpriseMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/common/exception/G33Exception.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/handler/Handler.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring-springmvc.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/common/constrain/StatusEnum.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/service/serviceimpl/MarketServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/enums/CodeEnum.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/handler/ExceptionHandler.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/controller/AssetController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/controller/BillController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/controller/BIllOrderActController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/controller/MarketController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/util/MD5.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/service/UserService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/service/ConnectService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/service/serviceimpl/BillOrderServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/controller/EnterpriseController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/controller/EnterpriseController(2).java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/controller/UserController(2).java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/controller/UserController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/service/serviceimpl/BIllServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/service/serviceimpl/UserServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/fuzamei/service/serviceimpl/ConnectServiceImpl.java" />
+      </list>
+    </option>
+  </component>
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsGulpfileManager">
+    <detection-done>true</detection-done>
+    <sorting>DEFINITION_ORDER</sorting>
+  </component>
+  <component name="LogFilters">
+    <option name="FILTER_ERRORS" value="false" />
+    <option name="FILTER_WARNINGS" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
+    <option name="CUSTOM_FILTER" />
+  </component>
+  <component name="MavenImportPreferences">
+    <option name="generalSettings">
+      <MavenGeneralSettings>
+        <option name="mavenHome" value="D:/apache-maven-3.5.3" />
+        <option name="userSettingsFile" value="D:\apache-maven-3.5.3\conf\settings.xml" />
+      </MavenGeneralSettings>
+    </option>
+  </component>
+  <component name="MavenProjectNavigator">
+    <treeState>
+      <expand>
+        <path>
+          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+          <item name="holleworld Maven Webapp" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+        </path>
+      </expand>
+      <select />
+    </treeState>
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="2391" />
+    <option name="y" value="-9" />
+    <option name="width" value="2418" />
+    <option name="height" value="1318" />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="PackagesPane" />
+      <pane id="AndroidView" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="g33" type="b2602c69:ProjectViewProjectNode" />
+              <item name="g33" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="g33" type="b2602c69:ProjectViewProjectNode" />
+              <item name="g33" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="g33" type="b2602c69:ProjectViewProjectNode" />
+              <item name="g33" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="g33" type="b2602c69:ProjectViewProjectNode" />
+              <item name="g33" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="g33" type="b2602c69:ProjectViewProjectNode" />
+              <item name="g33" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="g33" type="b2602c69:ProjectViewProjectNode" />
+              <item name="g33" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="fuzamei" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="g33" type="b2602c69:ProjectViewProjectNode" />
+              <item name="g33" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="fuzamei" type="462c0819:PsiDirectoryNode" />
+              <item name="common" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="g33" type="b2602c69:ProjectViewProjectNode" />
+              <item name="g33" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="fuzamei" type="462c0819:PsiDirectoryNode" />
+              <item name="common" type="462c0819:PsiDirectoryNode" />
+              <item name="bean" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="g33" type="b2602c69:ProjectViewProjectNode" />
+              <item name="g33" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="fuzamei" type="462c0819:PsiDirectoryNode" />
+              <item name="common" type="462c0819:PsiDirectoryNode" />
+              <item name="constrain" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="g33" type="b2602c69:ProjectViewProjectNode" />
+              <item name="g33" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="fuzamei" type="462c0819:PsiDirectoryNode" />
+              <item name="common" type="462c0819:PsiDirectoryNode" />
+              <item name="exception" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="g33" type="b2602c69:ProjectViewProjectNode" />
+              <item name="g33" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="fuzamei" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="g33" type="b2602c69:ProjectViewProjectNode" />
+              <item name="g33" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="fuzamei" type="462c0819:PsiDirectoryNode" />
+              <item name="entity" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="g33" type="b2602c69:ProjectViewProjectNode" />
+              <item name="g33" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="fuzamei" type="462c0819:PsiDirectoryNode" />
+              <item name="enums" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="g33" type="b2602c69:ProjectViewProjectNode" />
+              <item name="g33" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="fuzamei" type="462c0819:PsiDirectoryNode" />
+              <item name="handler" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="g33" type="b2602c69:ProjectViewProjectNode" />
+              <item name="g33" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="fuzamei" type="462c0819:PsiDirectoryNode" />
+              <item name="interceptor" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="g33" type="b2602c69:ProjectViewProjectNode" />
+              <item name="g33" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="fuzamei" type="462c0819:PsiDirectoryNode" />
+              <item name="po" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="g33" type="b2602c69:ProjectViewProjectNode" />
+              <item name="g33" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="fuzamei" type="462c0819:PsiDirectoryNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="g33" type="b2602c69:ProjectViewProjectNode" />
+              <item name="g33" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="fuzamei" type="462c0819:PsiDirectoryNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+              <item name="serviceimpl" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="g33" type="b2602c69:ProjectViewProjectNode" />
+              <item name="g33" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="fuzamei" type="462c0819:PsiDirectoryNode" />
+              <item name="util" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="g33" type="b2602c69:ProjectViewProjectNode" />
+              <item name="g33" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="fuzamei" type="462c0819:PsiDirectoryNode" />
+              <item name="vo" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="g33" type="b2602c69:ProjectViewProjectNode" />
+              <item name="g33" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="g33" type="b2602c69:ProjectViewProjectNode" />
+              <item name="g33" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="mapping" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="g33" type="b2602c69:ProjectViewProjectNode" />
+              <item name="g33" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="webapp" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="g33" type="b2602c69:ProjectViewProjectNode" />
+              <item name="g33" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="webapp" type="462c0819:PsiDirectoryNode" />
+              <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="aspect.path.notification.shown" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="settings.editor.selected.configurable" value="editing.templates" />
+  </component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\mahui\Desktop\proj\新建文件夹\g33\src\main\java\com\fuzamei\controller" />
+      <recent name="C:\Users\mahui\Desktop\proj\新建文件夹\g33\src\main\java\com\fuzamei\service" />
+      <recent name="C:\Users\mahui\Desktop\proj\新建文件夹\g33\src\main\java\com\fuzamei\util" />
+      <recent name="C:\Users\mahui\Desktop\proj\g33_5.18\g33\src\main\resources\mapping" />
+      <recent name="C:\Users\mahui\Desktop\proj\g33_5.18\g33\src\main\java\com\fuzamei\service\serviceimpl" />
+    </key>
+    <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.fuzamei.util" />
+      <recent name="com.fuzamei.common.interceptor" />
+      <recent name="com.fuzamei.dao" />
+      <recent name="com.fuzamei.service.serviceimpl" />
+      <recent name="com.fuzamei.service" />
+    </key>
+    <key name="CreateClassDialog.RecentsKey">
+      <recent name="com.fuzamei.dao" />
+      <recent name="com.john.ssm.dto" />
+    </key>
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="RunManager">
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+    </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    </configuration>
+    <configuration default="true" type="JUnit" factoryName="JUnit">
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <patterns />
+    </configuration>
+    <configuration default="true" type="TestNG" factoryName="TestNG">
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SUITE_NAME" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="GROUP_NAME" />
+      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="OUTPUT_DIRECTORY" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <option name="USE_DEFAULT_REPORTERS" value="false" />
+      <option name="PROPERTIES_FILE" />
+      <properties />
+      <listeners />
+    </configuration>
+    <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 9.0.6" ALTERNATIVE_JRE_ENABLED="false">
+      <option name="UPDATING_POLICY" value="redeploy-artifacts" />
+      <deployment>
+        <artifact name="holleworld:war exploded">
+          <settings>
+            <option name="CONTEXT_PATH" value="/t" />
+          </settings>
+        </artifact>
+      </deployment>
+      <server-settings>
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_g33" />
+      </server-settings>
+      <predefined_log_file id="Tomcat" enabled="true" />
+      <predefined_log_file id="Tomcat Catalina" enabled="true" />
+      <predefined_log_file id="Tomcat Manager" enabled="false" />
+      <predefined_log_file id="Tomcat Host Manager" enabled="false" />
+      <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
+      <RunnerSettings RunnerId="Debug">
+        <option name="DEBUG_PORT" value="50709" />
+      </RunnerSettings>
+      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
+        <option name="USE_ENV_VARIABLES" value="true" />
+        <STARTUP>
+          <option name="USE_DEFAULT" value="true" />
+          <option name="SCRIPT" value="" />
+          <option name="VM_PARAMETERS" value="" />
+          <option name="PROGRAM_PARAMETERS" value="" />
+        </STARTUP>
+        <SHUTDOWN>
+          <option name="USE_DEFAULT" value="true" />
+          <option name="SCRIPT" value="" />
+          <option name="VM_PARAMETERS" value="" />
+          <option name="PROGRAM_PARAMETERS" value="" />
+        </SHUTDOWN>
+      </ConfigurationWrapper>
+      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
+        <option name="USE_ENV_VARIABLES" value="true" />
+        <STARTUP>
+          <option name="USE_DEFAULT" value="true" />
+          <option name="SCRIPT" value="" />
+          <option name="VM_PARAMETERS" value="" />
+          <option name="PROGRAM_PARAMETERS" value="" />
+        </STARTUP>
+        <SHUTDOWN>
+          <option name="USE_DEFAULT" value="true" />
+          <option name="SCRIPT" value="" />
+          <option name="VM_PARAMETERS" value="" />
+          <option name="PROGRAM_PARAMETERS" value="" />
+        </SHUTDOWN>
+      </ConfigurationWrapper>
+      <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
+        <option name="USE_ENV_VARIABLES" value="true" />
+        <STARTUP>
+          <option name="USE_DEFAULT" value="true" />
+          <option name="SCRIPT" value="" />
+          <option name="VM_PARAMETERS" value="" />
+          <option name="PROGRAM_PARAMETERS" value="" />
+        </STARTUP>
+        <SHUTDOWN>
+          <option name="USE_DEFAULT" value="true" />
+          <option name="SCRIPT" value="" />
+          <option name="VM_PARAMETERS" value="" />
+          <option name="PROGRAM_PARAMETERS" value="" />
+        </SHUTDOWN>
+      </ConfigurationWrapper>
+      <method>
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="holleworld:war exploded" />
+        </option>
+      </method>
+    </configuration>
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+    </configuration>
+    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+      <option name="PROGRAM_PARAMETERS" />
+      <predefined_log_file id="idea.log" enabled="true" />
+    </configuration>
+    <configuration default="true" type="tests" factoryName="Nosetests">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <module name="" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+      <option name="_new_regexPattern" value="&quot;&quot;" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;&quot;" />
+      <option name="_new_targetType" value="&quot;PATH&quot;" />
+    </configuration>
+    <configuration default="true" type="tests" factoryName="Twisted Trial">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <module name="" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;&quot;" />
+      <option name="_new_targetType" value="&quot;PATH&quot;" />
+    </configuration>
+    <configuration default="true" type="tests" factoryName="Unittests">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <module name="" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;&quot;" />
+      <option name="_new_targetType" value="&quot;PATH&quot;" />
+    </configuration>
+    <configuration default="true" type="tests" factoryName="py.test">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <module name="" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+      <option name="_new_keywords" value="&quot;&quot;" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;&quot;" />
+      <option name="_new_targetType" value="&quot;PATH&quot;" />
+    </configuration>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="4e0af280-8b1f-412d-bb7e-98dd302a8326" name="Default" comment="" />
+      <created>1525425726404</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1525425726404</updated>
+      <workItem from="1525425729005" duration="3296000" />
+      <workItem from="1525743883352" duration="10842000" />
+      <workItem from="1525760736809" duration="25194000" />
+      <workItem from="1526616034280" duration="11394000" />
+      <workItem from="1526866476932" duration="19653000" />
+      <workItem from="1526897197333" duration="4148000" />
+      <workItem from="1527040964905" duration="9709000" />
+      <workItem from="1527058418137" duration="12647000" />
+      <workItem from="1527126671400" duration="24497000" />
+      <workItem from="1527214035692" duration="491000" />
+      <workItem from="1527214719606" duration="3436000" />
+      <workItem from="1527736959256" duration="21852000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="147159000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="2391" y="-9" width="2418" height="1318" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info anchor="right" id="Palette" order="6" />
+      <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" weight="0.3295325" />
+      <window_info anchor="bottom" id="Application Servers" order="0" weight="0.3295325" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.3299356" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info id="Capture Tool" order="2" />
+      <window_info id="Designer" order="3" />
+      <window_info anchor="right" id="Database" order="7" weight="0.3299356" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="right" id="Ant Build" order="3" weight="0.24973205" />
+      <window_info id="UI Designer" order="4" />
+      <window_info anchor="bottom" id="Debug" order="6" weight="0.3990878" />
+      <window_info anchor="bottom" id="TODO" order="9" />
+      <window_info active="true" anchor="bottom" id="Messages" order="1" visible="true" weight="0.32868353" />
+      <window_info anchor="right" id="Palette&#9;" order="8" />
+      <window_info id="Image Layers" order="5" />
+      <window_info anchor="bottom" id="Java Enterprise" order="10" />
+      <window_info anchor="right" id="Capture Analysis" order="9" />
+      <window_info anchor="bottom" id="Run" order="5" weight="0.39110604" />
+      <window_info anchor="bottom" id="Version Control" order="11" weight="0.23489168" />
+      <window_info anchor="bottom" id="Spring" order="2" weight="0.3295325" />
+      <window_info anchor="bottom" id="Terminal" order="13" weight="0.3295325" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.23231031" />
+      <window_info anchor="right" id="Bean Validation" order="2" weight="0.3299356" />
+      <window_info id="Web" order="6" side_tool="true" />
+      <window_info anchor="bottom" id="Find" order="4" weight="0.3295325" />
+      <window_info anchor="right" id="Theme Preview" order="10" />
+      <window_info id="Favorites" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Inspection" order="8" weight="0.4" />
+      <window_info anchor="right" id="Commander" order="1" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="7" weight="0.25" />
+      <window_info anchor="bottom" id="Message" order="3" />
+      <window_info anchor="right" id="SciView" order="0" weight="0.3299356" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="4" weight="0.25" />
+    </layout>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="订单模块部分完成" />
+    <option name="LAST_COMMIT_MESSAGE" value="订单模块部分完成" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <option name="time" value="2" />
+    </breakpoint-manager>
+  </component>
+  <component name="antWorkspaceConfiguration">
+    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
+    <option name="FILTER_TARGETS" value="false" />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/dao/BillOrderActDao.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="660">
+          <caret line="28" column="27" selection-start-line="28" selection-start-column="27" selection-end-line="28" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/dao/ConnectMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="9" column="1" selection-start-line="9" selection-start-column="1" selection-end-line="9" selection-end-column="1" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/dao/UserMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="570">
+          <caret line="23" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapping/MarketMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="3" selection-start-line="3" selection-end-line="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapping/ConnectMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="9" column="11" selection-start-line="9" selection-start-column="11" selection-end-line="9" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapping/UserMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="870">
+          <caret line="29" column="54" selection-start-line="29" selection-start-column="54" selection-end-line="29" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapping/AssetDaoMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="4" column="25" selection-start-line="4" selection-start-column="25" selection-end-line="4" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/interceptor/LoginInterceptor.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="600">
+          <caret line="26" column="48" selection-start-line="26" selection-start-column="48" selection-end-line="26" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1650">
+          <caret line="55" column="17" selection-start-line="55" selection-start-column="17" selection-end-line="55" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/service/serviceimpl/AssetServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="420">
+          <caret line="22" column="22" selection-start-line="22" selection-start-column="22" selection-end-line="22" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/entity/SearchBean.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="433">
+          <caret line="23" column="33" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/service/maketService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/dto/BillPayInfoDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="450">
+          <caret line="15" column="32" lean-forward="true" selection-start-line="15" selection-start-column="32" selection-end-line="15" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/service/BillOrderActService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="793">
+          <caret line="45" selection-start-line="45" selection-end-line="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/entity/BillOrderAct.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="18" column="28" lean-forward="true" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/dao/UserEnterpriseDao.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/entity/UserEnterprise.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1530">
+          <caret line="51" column="18" selection-start-line="51" selection-start-column="18" selection-end-line="51" selection-end-column="18" />
+          <folding>
+            <element signature="e#284#285#0" expanded="true" />
+            <element signature="e#309#310#0" expanded="true" />
+            <element signature="e#346#347#0" expanded="true" />
+            <element signature="e#374#375#0" expanded="true" />
+            <element signature="e#408#409#0" expanded="true" />
+            <element signature="e#437#438#0" expanded="true" />
+            <element signature="e#482#483#0" expanded="true" />
+            <element signature="e#518#519#0" expanded="true" />
+            <element signature="e#552#553#0" expanded="true" />
+            <element signature="e#582#583#0" expanded="true" />
+            <element signature="e#628#629#0" expanded="true" />
+            <element signature="e#666#667#0" expanded="true" />
+            <element signature="e#710#711#0" expanded="true" />
+            <element signature="e#750#751#0" expanded="true" />
+            <element signature="e#816#817#0" expanded="true" />
+            <element signature="e#874#875#0" expanded="true" />
+            <element signature="e#915#916#0" expanded="true" />
+            <element signature="e#952#953#0" expanded="true" />
+            <element signature="e#1012#1013#0" expanded="true" />
+            <element signature="e#1064#1065#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/dao/EnterpriseMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="900">
+          <caret line="30" lean-forward="true" selection-start-line="30" selection-end-line="30" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapping/EnterpriseMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="343">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapping/BillOrderActMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="5" column="28" lean-forward="true" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_161/src.zip!/java/lang/RuntimeException.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="433">
+          <caret line="62" column="5" lean-forward="true" selection-start-line="62" selection-start-column="5" selection-end-line="62" selection-end-column="5" />
+          <folding>
+            <element signature="e#1598#1599#0" expanded="true" />
+            <element signature="e#1628#1629#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/common/exception/G33Exception.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="750">
+          <caret line="25" column="23" selection-start-line="25" selection-start-column="11" selection-end-line="25" selection-end-column="23" />
+          <folding>
+            <element signature="e#273#274#0" expanded="true" />
+            <element signature="e#296#297#0" expanded="true" />
+            <element signature="e#331#332#0" expanded="true" />
+            <element signature="e#358#359#0" expanded="true" />
+            <element signature="e#399#400#0" expanded="true" />
+            <element signature="e#431#432#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/common/constrain/OperationEnum.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-60">
+          <caret line="28" column="29" lean-forward="true" selection-start-line="28" selection-start-column="29" selection-end-line="28" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/common/constrain/ReslutMsgEnum.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="420">
+          <caret line="14" column="50" lean-forward="true" selection-start-line="14" selection-start-column="50" selection-end-line="14" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/entity/Market.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="853">
+          <caret line="182" column="5" lean-forward="true" selection-start-line="182" selection-start-column="5" selection-end-line="182" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/common/constrain/StatusEnum.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="840">
+          <caret line="28" column="30" selection-start-line="28" selection-start-column="30" selection-end-line="28" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/service/MarketService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="343">
+          <caret line="31" column="8" selection-start-line="31" selection-start-column="8" selection-end-line="31" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring-springmvc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="360">
+          <caret line="12" column="29" lean-forward="true" selection-start-line="12" selection-start-column="29" selection-end-line="12" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/dto/FincanceInfoDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="3" column="29" lean-forward="true" selection-start-line="3" selection-start-column="29" selection-end-line="3" selection-end-column="29" />
+          <folding>
+            <element signature="e#342#343#0" expanded="true" />
+            <element signature="e#374#375#0" expanded="true" />
+            <element signature="e#424#425#0" expanded="true" />
+            <element signature="e#466#467#0" expanded="true" />
+            <element signature="e#504#505#0" expanded="true" />
+            <element signature="e#537#538#0" expanded="true" />
+            <element signature="e#590#591#0" expanded="true" />
+            <element signature="e#634#635#0" expanded="true" />
+            <element signature="e#676#677#0" expanded="true" />
+            <element signature="e#714#715#0" expanded="true" />
+            <element signature="e#776#777#0" expanded="true" />
+            <element signature="e#830#831#0" expanded="true" />
+            <element signature="e#869#870#0" expanded="true" />
+            <element signature="e#904#905#0" expanded="true" />
+            <element signature="e#960#961#0" expanded="true" />
+            <element signature="e#1008#1009#0" expanded="true" />
+            <element signature="e#1048#1049#0" expanded="true" />
+            <element signature="e#1084#1085#0" expanded="true" />
+            <element signature="e#1142#1143#0" expanded="true" />
+            <element signature="e#1192#1193#0" expanded="true" />
+            <element signature="e#1234#1235#0" expanded="true" />
+            <element signature="e#1272#1273#0" expanded="true" />
+            <element signature="e#1334#1335#0" expanded="true" />
+            <element signature="e#1388#1389#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/controller/LoggerController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/controller/AssetController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="549">
+          <caret line="40" selection-start-line="40" selection-end-line="44" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/controller/BillController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="805">
+          <caret line="227" column="9" lean-forward="true" selection-start-line="227" selection-start-column="9" selection-end-line="227" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/controller/BIllOrderActController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="613">
+          <caret line="63" selection-start-line="63" selection-end-line="67" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/controller/MarketController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5070">
+          <caret line="169" column="24" lean-forward="true" selection-start-line="169" selection-start-column="24" selection-end-line="169" selection-end-column="24" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/service/serviceimpl/EnterpriseServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="390">
+          <caret line="13" column="8" lean-forward="true" selection-start-line="13" selection-start-column="8" selection-end-line="13" selection-end-column="8" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/entity/User.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/util/MD5.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="300">
+          <caret line="10" column="41" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="41" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/util/ResponseUtil.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="360">
+          <caret line="13" column="25" selection-start-line="13" selection-start-column="25" selection-end-line="13" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/enums/CodeEnum.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="7" column="15" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/service/serviceimpl/MarketServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="549">
+          <caret line="350" lean-forward="true" selection-start-line="350" selection-end-line="350" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/service/serviceimpl/BillOrderServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="643">
+          <caret line="102" column="101" selection-start-line="102" selection-start-column="101" selection-end-line="102" selection-end-column="101" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/controller/UserController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="4236">
+          <caret line="183" lean-forward="true" selection-start-line="183" selection-end-line="183" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/controller/EnterpriseController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="688">
+          <caret line="80" lean-forward="true" selection-start-line="80" selection-end-line="80" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/controller/EnterpriseController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="356">
+          <caret line="39" column="18" lean-forward="true" selection-start-line="39" selection-start-column="18" selection-end-line="39" selection-end-column="18" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/controller/UserController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-274">
+          <caret line="112" column="5" lean-forward="true" selection-start-line="112" selection-start-column="5" selection-end-line="112" selection-end-column="5" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/handler/ExceptionHandle.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="18" column="7" selection-start-line="18" selection-start-column="7" selection-end-line="18" selection-end-column="7" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/service/UserService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-4">
+          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/service/ConnectService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="390">
+          <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/service/serviceimpl/UserServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="238">
+          <caret line="14" column="7" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#1101#1102#0" expanded="true" />
+            <element signature="e#1142#1143#0" expanded="true" />
+            <element signature="e#1178#1179#0" expanded="true" />
+            <element signature="e#1217#1218#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/service/serviceimpl/ConnectServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="536">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/fuzamei/service/serviceimpl/BIllServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="658">
+          <caret line="133" column="9" lean-forward="true" selection-start-line="133" selection-start-column="9" selection-end-line="133" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+  </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ProjectJDKs.UI">
+        <settings>
+          <last-edited>1.8</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
+</project>

+ 48 - 0
.project

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>holleworld</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.springframework.ide.eclipse.core.springnature</nature>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>

+ 13 - 0
.settings/.jsdtscope

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/webapp"/>
+	<classpathentry excluding="**/bower_components/*|**/node_modules/*|**/*.min.js" kind="src" path="target/m2e-wtp/web-resources"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>

+ 8 - 0
.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,8 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.8

+ 4 - 0
.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

+ 10 - 0
.settings/org.eclipse.wst.common.component

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="holleworld-1.0-SNAPSHOT">
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <property name="context-root" value="holleworld"/>
+        <property name="java-output-path" value="/holleworld/target/classes"/>
+    </wb-module>
+</project-modules>

+ 7 - 0
.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="java" version="1.8"/>
+  <installed facet="jst.web" version="3.0"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>

+ 1 - 0
.settings/org.eclipse.wst.jsdt.ui.superType.container

@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary

+ 1 - 0
.settings/org.eclipse.wst.jsdt.ui.superType.name

@@ -0,0 +1 @@
+Window

+ 2 - 0
.settings/org.eclipse.wst.validation.prefs

@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1

+ 64 - 0
holleworld.iml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <descriptors>
+          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
+        </descriptors>
+        <webroots>
+          <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
+        </webroots>
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.12" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.3.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.5" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.5" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.23" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.0" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.35" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:3.2.5" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.3.4.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
+  </component>
+</module>

+ 203 - 0
pom.xml

@@ -0,0 +1,203 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.examlpe</groupId>
+  <artifactId>holleworld</artifactId>
+  <packaging>war</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <name>holleworld Maven Webapp</name>
+  <url>http://maven.apache.org</url>
+  <!-- 配置相关jar包的版本 -->
+  <properties>
+  <spring.version>4.3.4.RELEASE</spring.version>
+  <aspectj.version>1.8.9</aspectj.version>
+  <mybatis.version>3.4.1</mybatis.version>
+  <mybatis-spring.version>1.3.0</mybatis-spring.version>
+  <jdbc.version>5.1.35</jdbc.version>
+  <fastjson.version>1.2.23</fastjson.version>
+  <log4j.version>1.2.17</log4j.version>
+
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+
+	<dependency>
+		<groupId>org.slf4j</groupId>
+		<artifactId>slf4j-api</artifactId>
+		<version>1.7.12</version>
+	</dependency>
+	<dependency>
+		<groupId>ch.qos.logback</groupId>
+		<artifactId>logback-core</artifactId>
+		<version>1.1.1</version>
+	</dependency>
+	<!-- 实现slf4j接口并整合 -->
+	<dependency>
+		<groupId>ch.qos.logback</groupId>
+		<artifactId>logback-classic</artifactId>
+		<version>1.1.1</version>
+	</dependency>
+
+      <!-- 添加spring依赖 -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <!-- spring-beans-version.RELEASE.jar -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <!-- spring-context-version.RELEASE.jar -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <!-- spring-core-version.RELEASE.jar -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <!-- spring-expression-version.RELEASE.jar -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-expression</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <!-- spring-web-version.RELEASE.jar -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-webmvc</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-jdbc</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.springframework</groupId>
+         <artifactId>spring-tx</artifactId>
+         <version>${spring.version}</version>
+      </dependency>
+	<dependency>
+		<groupId>org.springframework</groupId>
+		<artifactId>spring-aspects</artifactId>
+		<version>${spring.version}</version>
+	</dependency>
+	<dependency>
+		<groupId>aopalliance</groupId>
+		<artifactId>aopalliance</artifactId>
+		<version>1.0</version>
+	</dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.8.5</version>
+    </dependency>
+    <dependency>
+      <groupId>com.alibaba</groupId>
+      <artifactId>fastjson</artifactId>
+      <version>1.2.23</version>
+    </dependency>
+      <dependency>
+        <groupId>org.aspectj</groupId>
+        <artifactId>aspectjweaver</artifactId>
+        <version>${aspectj.version}</version>
+      </dependency>
+
+
+      <!-- 添加mybatis依赖 -->
+      <dependency>
+        <groupId>org.mybatis</groupId>
+        <artifactId>mybatis</artifactId>
+        <version>${mybatis.version}</version>
+      </dependency>
+
+      <!-- 添加mybatis-spring依赖 -->
+      <dependency>
+        <groupId>org.mybatis</groupId>
+        <artifactId>mybatis-spring</artifactId>
+        <version>${mybatis-spring.version}</version>
+      </dependency>
+
+      <!-- 数据库驱动 -->
+      <dependency>
+        <groupId>mysql</groupId>
+        <artifactId>mysql-connector-java</artifactId>
+        <version>${jdbc.version}</version>
+      </dependency>
+
+
+      <!-- log4j -->
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>${log4j.version}</version>
+      </dependency>
+
+	<dependency>
+		<groupId>cglib</groupId>
+		<artifactId>cglib-nodep</artifactId>
+		<version>3.2.5</version>
+	</dependency>
+	<dependency>
+		<groupId>commons-logging</groupId>
+		<artifactId>commons-logging</artifactId>
+		<version>1.2</version>
+	</dependency>
+	<dependency>
+		<groupId>dom4j</groupId>
+		<artifactId>dom4j</artifactId>
+		<version>1.6.1</version>
+	</dependency>
+
+      <!-- serlvet -->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <!--分页工具-->
+    <dependency>
+      <groupId>com.github.pagehelper</groupId>
+      <artifactId>pagehelper</artifactId>
+      <version>5.1.2</version>
+    </dependency>
+    <!--校验工具-->
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <version>5.3.4.Final</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.1</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

+ 143 - 0
src/main/java/com/fuzamei/aspect/AnnotationTest.java

@@ -0,0 +1,143 @@
+package com.fuzamei.aspect;
+
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.After;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.fuzamei.dao.BillOrderActDao;
+import com.fuzamei.dto.OrderDto;
+import com.fuzamei.dto.billInfoDto;
+import com.fuzamei.entity.BillOrderAct;
+import com.fuzamei.enums.LogTypeEnum;
+import com.fuzamei.po.LogAct;
+import com.fuzamei.service.LoggerService;
+import com.fuzamei.util.TimeStampUtil;
+
+@Component
+@Aspect
+public class AnnotationTest {
+
+	
+	@Autowired 
+	LoggerService loggerService;
+	@Autowired
+	BillOrderActDao billOrderActDao;
+	//定义切点
+    //	execution意思是当某方法执行时触发。
+    //	第一个 * 意思配备任何一个perform方法,是不在乎方法返回类型是什么。
+    //	concert.Performance是为了定位perform()方法再哪个类中。
+    //	.. 代表配备任何一个perform方法,不在意他的参数列表是啥。
+//	@Pointcut("execution(* *.findLogActById(..))")
+//	public void sayings() {}
+//	
+//	
+//	
+//	@Before("sayings()")
+//	public void sayHello(JoinPoint point) {
+//		System.out.println("注解类型前置通知:我还要输出参数:"  + Arrays.toString(point.getArgs())); //
+//	}
+	//后置通知
+	//开单日志记录
+	@AfterReturning(pointcut="execution(* *.insertOrder(..)) && args(orderDto)")
+	public void logForMakeBill(OrderDto orderDto) throws ParseException{
+		System.out.println("注解类型后置通知" + orderDto);
+		//获取当前时间当做用户操作的操作时间
+		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		String dateString = formatter.format(new Date());
+		//封装LogAct
+		LogAct logAct = new LogAct();
+		logAct.setOrderId(orderDto.getOrderId());
+		logAct.setOperatorType(LogTypeEnum.ENTERING.getStateInfo());//'录入'枚举
+		logAct.setOperatorTime(TimeStampUtil.dateToStamp(dateString));
+		logAct.setOperatorEnterpriseId(orderDto.getOutEnterpriseId());
+		logAct.setOperatorEnterpriseName(orderDto.getOutEnterprise());
+		logAct.setBillTotalMoney(orderDto.getSummary());
+		logAct.setPaymentEnterpriseName(orderDto.getOutEnterprise());
+		//logact存入数据库
+		try {
+			loggerService.inputLogAct(logAct);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			System.out.println("操作记录存入数据库失败,请检查日志");
+		}
+		
+	}
+	//撤销单据日志记录
+	@AfterReturning(pointcut="execution(* *.cancelBill(..)) && args(billId)")
+	public void logForCancelBill(String billId) throws ParseException{
+		System.out.println("注解类型后置通知" + billId);
+		//获取当前时间当做用户操作的操作时间
+		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		String dateString = formatter.format(new Date());
+		
+		//billId临时转换成int
+		int intBillId = Integer.parseInt(billId);
+		//根据流转表id查询流转表信息
+		BillOrderAct billOrderAct = billOrderActDao.selectByOrderActId(intBillId);
+		//封装LogAct
+		LogAct logAct = new LogAct();
+		logAct.setOrderId(billOrderAct.getOrderId());
+		logAct.setOperatorType(LogTypeEnum.REVOKE_ENTERING.getStateInfo());//'撤销录入'枚举
+		logAct.setOperatorTime(TimeStampUtil.dateToStamp(dateString));
+		logAct.setOperatorEnterpriseId(billOrderAct.getOwnEnterpriseId());
+		logAct.setOperatorEnterpriseName(billOrderAct.getOwnEnterprise());
+		logAct.setBillTotalMoney(billOrderAct.getMoney());
+		logAct.setPaymentEnterpriseName(billOrderAct.getOperatorEnterprise());
+		//logact存入数据库
+		try {
+			loggerService.inputLogAct(logAct);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			System.out.println("操作记录存入数据库失败,请检查日志");
+		}
+	}
+	
+	//编辑修改单据日志记录
+	@AfterReturning(pointcut="execution(* *.editBill(..)) && args(orderDto)")
+	public void logForEditBill(OrderDto orderDto) throws ParseException{
+		System.out.println("注解类型后置通知" + orderDto);
+		//获取当前时间当做用户操作的操作时间
+		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		String dateString = formatter.format(new Date());
+		//封装LogAct
+		LogAct logAct = new LogAct();
+		logAct.setOrderId(orderDto.getOrderId());
+		logAct.setOperatorType(LogTypeEnum.REVISE.getStateInfo());//'编辑修改'枚举
+		logAct.setOperatorTime(TimeStampUtil.dateToStamp(dateString));
+		logAct.setOperatorEnterpriseId(orderDto.getOutEnterpriseId());
+		logAct.setOperatorEnterpriseName(orderDto.getOutEnterprise());
+		logAct.setBillTotalMoney(orderDto.getSummary());
+		logAct.setPaymentEnterpriseName(orderDto.getOutEnterprise());
+		//logact存入数据库
+		try {
+			loggerService.inputLogAct(logAct);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			System.out.println("操作记录存入数据库失败,请检查日志");
+		}
+		
+	}
+//	//环绕通知。注意要有ProceedingJoinPoint参数传入。
+//	@Around("sayings()")
+//	public void sayAround(ProceedingJoinPoint pjp) throws Throwable{
+//		System.out.println("注解类型环绕通知..环绕前");
+//		pjp.proceed();//执行方法
+//		System.out.println("注解类型环绕通知..环绕后");
+//	}
+}

+ 72 - 0
src/main/java/com/fuzamei/common/bean/OpteratorTime.java

@@ -0,0 +1,72 @@
+package com.fuzamei.common.bean;
+
+import com.fuzamei.vo.TimeStampUtil;
+
+import java.text.ParseException;
+
+/**
+ * @file_name: OpteratorTime
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/4 11:51
+ * @version:
+ */
+public class OpteratorTime {
+    private long createTime;
+    private String createBy;
+    private long modifyTime;
+    private String modifyBy;
+
+    public OpteratorTime(){}
+
+
+    public long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        try {
+            this.createTime = TimeStampUtil.dateToStamp(createTime);
+        }catch (ParseException e){
+            e.printStackTrace();
+        }
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public long getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(String modifyTime) {
+        try {
+            this.modifyTime = TimeStampUtil.dateToStamp(modifyTime);
+        }catch (ParseException e){
+            e.printStackTrace();
+        }
+    }
+
+    public String getModifyBy() {
+        return modifyBy;
+    }
+
+    public void setModifyBy(String modifyBy) {
+        this.modifyBy = modifyBy;
+    }
+
+    @Override
+    public String toString() {
+        return "OpteratorTime{" +
+                "createTime='" + createTime + '\'' +
+                ", createBy='" + createBy + '\'' +
+                ", modifyTime='" + modifyTime + '\'' +
+                ", modifyBy='" + modifyBy + '\'' +
+                '}';
+    }
+}

+ 94 - 0
src/main/java/com/fuzamei/common/constrain/OperationEnum.java

@@ -0,0 +1,94 @@
+package com.fuzamei.common.constrain;
+
+/**
+ * @file_name: g
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/3 9:43
+ * @version:
+ */
+public enum OperationEnum {
+    /*
+        充值(18),提现(19),拒绝签收(29),支付(11),
+        撤销支付(14),确认支付(21),确认签收(35),兑付(17),
+        申请兑付(16),担保审核(30),修改(32),撤销录入(33),
+        确认担保(34),同意撤销(36),拒绝撤销(37),申请担保(39),
+        担保兑付(40),解包(51),申请质押(53),申请回购(54),
+        摘取质押(58),撤销质押(59),同意支付撤销(48),拒绝支付撤销(49),
+        收票(61);
+        */
+    HANG_CARD("挂牌", 7),
+    PAY("支付", 11),
+    APPLY_HONOUR("申请兑付", 16),
+    HONOUR("兑付", 17),
+    CONFIRM_PAY("确认支付", 21),
+    DELIST("摘牌", 23),
+    REMOVE_THE_CARD("撤牌", 24),
+    REFUSING_RECEIPT("拒绝签收", 29),
+    WARRANT_AUDITING("担保审核", 30),
+    CANCEL_INPUT("撤销录入", 33),
+    CONFIRM_WARRANT("确认担保", 34),
+    CONFIRM_RECEIPT("确认签收", 35),
+    AGREE_CANCEL("同意撤销", 36),
+    REFUSING_CANCEL("拒绝撤销", 37),
+    APPLY_WARRANT("申请担保", 39),
+    WARRANT_HONOUR("担保兑付", 40),
+    AGREE_PAY_CANCEL("同意支付撤销", 48),
+    REFUSING_PAY_CANCEL("拒绝支付撤销", 49),
+    UNPACK("解包", 51),
+    APPLY_PLEDGE("申请质押", 53),
+    APPLY_BUYBACK("申请回购", 54),
+    APPLY_ADVANCE_BUYBACK("申请提前回购", 78),
+    APPLY_OVERDUE_BUYBACK("申请逾期回购", 79),
+    PICK_PLEDGE("摘取质押", 58),
+    CANCEL_PLEDGE("撤销质押", 59),
+    COLLECT_TICKET("收票", 61),
+    PACK("打包", 62),
+    ADVANCE_PAYMENT("提前兑付",63),
+    EXPIRE_PAYMENT("到期兑付",64),
+    OVERDUE_PAYMENT("逾期兑付",65),
+
+    OPEN_BILL("开票",80),
+    EDIT("修改", 32),
+    APPLY_MORTGAGE_LOAN("申请抵押借款",66),
+    CANCEL_APPLY_MORTGAGE_LOAN("撤销申请抵押借款",68),
+    PICK_MORTGAGE_LOAN("摘取抵押借款",69),
+    APPLY_MORTGAGE_LOAN_BUYBACK("申请抵押回购",66),
+    CANCEL_BILL("应收账撤销",70);
+
+
+
+
+
+    // 成员变量
+    private String name;
+    private int code;
+    // 构造方法
+    private OperationEnum(String name, int code) {
+        this.name = name;
+        this.code = code;
+    }
+
+    // 普通方法
+    public static String getName(int code) {
+        for (OperationEnum c : OperationEnum.values()) {
+            if (c.getCode() == code) {
+                return c.name;
+            }
+        }
+        return null;
+    }
+    // get set 方法
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+    public int getCode() {
+        return code;
+    }
+    public void setCode(int code) {
+        this.code = code;
+    }
+}

+ 42 - 0
src/main/java/com/fuzamei/common/constrain/ReslutMsgEnum.java

@@ -0,0 +1,42 @@
+package com.fuzamei.common.constrain;
+
+/**
+ * @file_name: ReslutMsgEnum
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/4 11:04
+ * @version:
+ */
+public enum ReslutMsgEnum {
+    CASH_NOT_ENOUGH("余额不足",100);
+    private String name;
+    private int code;
+    // 构造方法
+    private ReslutMsgEnum(String name, int code) {
+        this.name = name;
+        this.code = code;
+    }
+
+    // 普通方法
+    public static String getName(int code) {
+        for (ReslutMsgEnum c : ReslutMsgEnum.values()) {
+            if (c.getCode() == code) {
+                return c.name;
+            }
+        }
+        return null;
+    }
+    // get set 方法
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+    public int getCode() {
+        return code;
+    }
+    public void setCode(int code) {
+        this.code = code;
+    }
+}

+ 68 - 0
src/main/java/com/fuzamei/common/constrain/StatusEnum.java

@@ -0,0 +1,68 @@
+package com.fuzamei.common.constrain;
+
+/**
+ * @file_name: StatusEnum
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/10 10:29
+ * @version:
+ */
+public enum StatusEnum {
+
+    //-------------------流转表状态
+    REJECT("拒绝签收",10),
+    CANCEL("已撤销",0),
+    BILL_WAIT("待签收",1),
+    BILL_END("結束",2),
+    OWNING("持有中",4),
+    PLEDGE_WAIT("申请质押中",5),
+    PLEDGED("质押中",6),
+    FINANCE_WAITING("申请融资中",7),
+    FINANCING("融资中",8),
+    PAY_WAIT("待确认支付",9),
+    OWING_PLEDGE("持有质押",10),
+
+    //---------------------其它状态
+    MARKET_FINANCE("买断",0),
+    MARKET_PLEDGE("质押",1),
+    MARKET_DELIST("已摘",0),
+    MARKET_NOT_DELIST("未摘",1),
+
+
+
+
+    THIS_IS_LAST_ENUM("最后一条枚举",10000000);
+
+
+
+    private String name;
+    private int code;
+    // 构造方法
+    private StatusEnum(String name, int code) {
+        this.name = name;
+        this.code = code;
+    }
+
+    // 普通方法
+    public static String getName(int code) {
+        for (StatusEnum c : StatusEnum.values()) {
+            if (c.getCode() == code) {
+                return c.name;
+            }
+        }
+        return null;
+    }
+    // get set 方法
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+    public int getCode() {
+        return code;
+    }
+    public void setCode(int code) {
+        this.code = code;
+    }
+}

+ 30 - 0
src/main/java/com/fuzamei/common/exception/G33Exception.java

@@ -0,0 +1,30 @@
+package com.fuzamei.common.exception;
+
+/**
+ * @file_name: G33Exception
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/3 10:48
+ * @version:
+ */
+public class G33Exception extends RuntimeException{
+
+    private Integer code;
+
+    public G33Exception(String msg) {
+        super(msg);
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public G33Exception(Integer code, String msg) {
+        super(msg);
+        this.code = code;
+    }
+}

+ 64 - 0
src/main/java/com/fuzamei/config/CrosFilter.java

@@ -0,0 +1,64 @@
+package com.fuzamei.config;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * @file_name: crosFilter
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/3 9:44
+ * @version:
+ */
+public class CrosFilter implements Filter {
+
+    /**
+     * Default constructor.
+     */
+    public CrosFilter() {
+        // TODO Auto-generated constructor stub
+    }
+
+    /**
+     * @see Filter#destroy()
+     */
+    @Override
+    public void destroy() {
+        // TODO Auto-generated method stub
+    }
+
+    /**
+     * @see Filter#doFilter(ServletRequest, ServletResponse, FilterChain)
+     */
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+        // TODO Auto-generated method stub
+        // place your code here
+        HttpServletResponse response1 = (HttpServletResponse) response;
+
+        HttpServletRequest reqs = (HttpServletRequest) request;
+
+//        response1.setHeader("Access-Control-Allow-Origin",reqs.getHeader("Origin"));
+        response1.setHeader("Access-Control-Allow-Credentials", "true");
+        response1.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+        response1.setHeader("Access-Control-Max-Age", "3600");
+        response1.setHeader("Access-Control-Allow-Headers", "x-requested-with");
+        response1.setHeader("Access-Control-Allow-origin", "*");
+        response1.setHeader("Access-Control-Allow-Headers", "Authorization,Content-Type");
+        chain.doFilter(request, response1);
+        // pass the request along the filter chain
+
+    }
+
+    /**
+     * @see Filter#init(FilterConfig)
+     */
+    @Override
+    public void init(FilterConfig fConfig) throws ServletException {
+        // TODO Auto-generated method stub
+
+    }
+
+}

+ 53 - 0
src/main/java/com/fuzamei/controller/AssetController.java

@@ -0,0 +1,53 @@
+package com.fuzamei.controller;
+
+import com.fuzamei.dto.AssetChangeDto;
+import com.fuzamei.enums.CodeEnum;
+import com.fuzamei.service.AssetService;
+import com.fuzamei.util.ResponseUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+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.HttpServlet;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @file_name: AssetController
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/10 15:32
+ * @version:
+ */
+@RestController
+@RequestMapping(value = "/asset")
+public class AssetController {
+    @Autowired
+    private AssetService assetService;
+
+    @PostMapping(value = "/addMoney")
+    public ResponseUtil addMoney(){
+        AssetChangeDto assetChangeDto = new AssetChangeDto();
+        assetChangeDto.setAccountId("1");
+        assetChangeDto.setChinaYuan(1020.0);
+        AssetChangeDto assetChangeDto1 = new AssetChangeDto();
+        assetChangeDto1.setAccountId("1");
+        assetChangeDto1.setChinaYuan(-20.0);
+        List<AssetChangeDto> list = new ArrayList<>();
+        list.add(assetChangeDto);
+        list.add(assetChangeDto1);
+        int result = assetService.updateAssetInfo(list);
+        if(result > 0) {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_SUCCESS.getCode(),true,null);
+        }else {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_ERROR.getCode(), true, null);
+        }
+    }
+
+    String getUser(HttpServlet req){
+
+
+     return  "userID";
+    }
+}

+ 73 - 0
src/main/java/com/fuzamei/controller/BIllOrderActController.java

@@ -0,0 +1,73 @@
+package com.fuzamei.controller;
+
+import com.fuzamei.dto.BillPayInfoDto;
+import com.fuzamei.entity.BillOrderAct;
+import com.fuzamei.enums.CodeEnum;
+import com.fuzamei.service.BillOrderActService;
+import com.fuzamei.service.BillService;
+import com.fuzamei.util.ResponseUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @file_name: BIllOrderActController
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/14 15:36
+ * @version:
+ */
+@RestController
+@RequestMapping(value = "/billOrderAct")
+public class BIllOrderActController {
+    @Autowired
+    private BillOrderActService billOrderActService;
+    @Autowired
+    private BillService billService;
+
+    /**
+     * 单据支付
+     * @param
+     */
+    @PostMapping(value = "/billPay")
+    public ResponseUtil billPay(@RequestBody  BillPayInfoDto billPayInfoDto){
+        int result = billOrderActService.payBill(billPayInfoDto);
+        if(result > 0) {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_SUCCESS.getCode(),true,result);
+        }else {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_ERROR.getCode(), true, null);
+        }
+    }
+
+    /**
+     * 签收单据(应为确认支付?)
+     * @param billOrderId
+     * @return
+     */
+    @PostMapping(value = "/confirmPay")
+    public ResponseUtil confirmPay(@RequestParam String billOrderId){
+        int result = billOrderActService.confirmPay(Integer.parseInt(billOrderId),true);
+        if(result > 0) {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_SUCCESS.getCode(),true,result);
+        }else {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_ERROR.getCode(), true, null);
+        }
+    }
+
+    /**
+     * 拒绝签收单据(应为取消支付?)
+     * @param billOrderId
+     * @return
+     */
+    @PostMapping(value = "/cancelPay")
+    public  ResponseUtil cancelPay(@RequestParam int billOrderId){
+        int result = billOrderActService.confirmPay(billOrderId,false);
+        if(result > 0) {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_SUCCESS.getCode(),true,result);
+        }else {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_ERROR.getCode(), true, null);
+        }
+    }
+
+    
+
+}

+ 230 - 0
src/main/java/com/fuzamei/controller/BillController.java

@@ -0,0 +1,230 @@
+package com.fuzamei.controller;
+
+
+import com.fuzamei.dto.FilterDto;
+import com.fuzamei.entity.Asset;
+import com.fuzamei.enums.CodeEnum;
+import com.fuzamei.service.AssetService;
+import com.fuzamei.service.BillOrderActService;
+import com.fuzamei.util.PageData;
+import com.fuzamei.util.ResponseUtil;
+import com.fuzamei.util.StringDivisionUtil;
+import com.fuzamei.dto.OrderDto;
+import com.fuzamei.service.BillService;
+import com.fuzamei.vo.AssetDetailVo;
+import com.fuzamei.vo.BillDetailVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.logging.Logger;
+
+/**
+ * @file_name: BillControllerInterface
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/4 9:50
+ * @version:
+ */
+@RestController
+@RequestMapping(value = "bill")
+@Component
+public class BillController {
+
+    private final static Logger log = Logger.getLogger(BillController.class.getName());
+    @Autowired
+    private BillService billService;
+    @Autowired
+    private AssetService assetService;
+    @Autowired
+    private BillOrderActService billOrderActService;
+
+    /**
+     * 根据筛选类的内部属性 例如状态,企业,时间来进行筛选单据,并且对其进行分页处理后传递前段
+     * @param filterDto 界面筛选条件类
+     * @return ResponseUtil 所有请求都返回这个类,内部code需使用枚举定义,
+     */
+    @RequestMapping(value ="/selectBillByFilterVo" ,method = RequestMethod.POST)
+    public ResponseUtil selectBillByFilterVo(@RequestBody FilterDto filterDto){
+        PageData pageData = billService.getInitiateBillInfo(filterDto);
+        if(pageData != null) {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_SUCCESS.getCode(),true,null);
+        }else {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_ERROR.getCode(), true, null);
+        }
+    }
+
+    /**
+     * 获取当前用户的账户余额,包括人民币和单据
+     * @return ResponseUtil 错误代码待定,成功返回UserAccountVo
+     */
+    @GetMapping(value = "/getAccountLeft")
+    public ResponseUtil getAccountLeft(){
+        AssetDetailVo assetDetailVo  = assetService.getCurrentUserAsset("1");
+        if(assetDetailVo != null) {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_SUCCESS.getCode(),true,assetDetailVo);
+        }else {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_ERROR.getCode(), true, null);
+        }
+    }
+
+    /**
+     * 获取单据详细信息,
+     * @param  filterDto
+     * @Return ResponseUtil 传入数据为AccountLeftDto
+     */
+    @PostMapping(value = "/getBill")
+    public ResponseUtil getBillDetail(@RequestBody FilterDto filterDto){
+        Integer orderId = filterDto.getOrderId();
+        BillDetailVo billDetailVo = billService.getBillDetailInfo(Integer.toString(orderId));
+        if(billDetailVo != null) {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_SUCCESS.getCode(),true,billDetailVo);
+        }else {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_ERROR.getCode(), true, null);
+        }
+    }
+
+    /**
+     * 用户开单,
+     * @param  orderDto 开单信息  
+     * @Return ResponseUtil
+     */
+    @PostMapping(value = "/makeBill")
+    public ResponseUtil makeBill(@Validated(OrderDto.MakeBill.class)@RequestBody OrderDto orderDto){
+        System.out.println(orderDto.toString());
+        //获取结果值
+        int result = billService.insertOrder(orderDto);
+        if(result > 0) {
+        	return ResponseUtil.getResult(207, true, null);
+        }else {
+        	if(result == 0) {
+        		return ResponseUtil.getResult(507, false, null);
+        	}
+        	else if (result == -1) {
+        		return ResponseUtil.getResult(507, false, null);
+			}
+        	else if (result == -2) {
+        		return ResponseUtil.getResult(507, false, null);
+			}
+        	else {
+        		return ResponseUtil.getResult(507, false, null);
+			}
+        }
+    }
+
+    /**
+     * 对单据进行签收
+     *
+     */
+    @GetMapping(value = "/confirmBill")
+    public ResponseUtil confirmBill(@RequestParam String billId){
+        int result = billService.confirmBill(billId);
+        if(result > 0) {
+        	return ResponseUtil.getResult(208, true, null);
+        }else {
+        	if(result == 0) {
+        		return ResponseUtil.getResult(508, false, null);
+        	}
+        	else if (result == -1) {
+        		return ResponseUtil.getResult(508, false, null);
+			}
+        	else if (result == -2) {
+        		return ResponseUtil.getResult(508, false, null);
+			}
+        	else {
+        		return ResponseUtil.getResult(508, false, null);
+			}
+        }
+    }
+
+    /**
+     * 用户对未签收的单据进行撤销
+     * @param billId 单据编号
+     *
+     */
+    @GetMapping(value = "/cancelBill")
+    public ResponseUtil cancelBillController(@RequestParam String billId){
+
+    	//TODO订单流转表的billId是自增的,前端传进来的billId是String类型的,这里需要类型转换再交给billService.cancelBill(billId)方法
+        
+        int result = billService.cancelBill(billId);
+        if(result > 0) {
+        	return ResponseUtil.getResult(209, true, null);
+        }else {
+        	if(result == 0) {
+        		return ResponseUtil.getResult(509, false, null);
+        	}
+        	else if (result == -1) {
+        		return ResponseUtil.getResult(509, false, null);
+			}
+        	else if (result == -2) {
+        		return ResponseUtil.getResult(509, false, null);
+			}
+        	else {
+        		return ResponseUtil.getResult(509, false, null);
+			}
+        }
+    }
+
+    /**
+     * 用户重新编辑单据
+     * @param orderDto
+     * @return
+     */
+    @PostMapping(value = "/editBill")
+    public ResponseUtil editBIllController(@Validated(OrderDto.MakeBill.class)@RequestBody OrderDto orderDto){
+        
+        int result = billService.editBill(orderDto);
+        if(result > 0) {
+        	return ResponseUtil.getResult(210, true, null);
+        }else {
+        	if(result == 0) {
+        		return ResponseUtil.getResult(510, false, null);
+        	}
+        	else if (result == -1) {
+        		return ResponseUtil.getResult(510, false, null);
+			}
+        	else if (result == -2) {
+        		return ResponseUtil.getResult(510, false, null);
+			}
+        	else {
+        		return ResponseUtil.getResult(510, false, null);
+			}
+        }
+        
+    }
+
+//    /**
+//     * 用户对单据可兑付余额(不知道用哪)
+//     * @param orderId
+//     * @return
+//     */
+//    @GetMapping(value = "/getCashBillInfo")
+//    public ResponseUtil getCashBillInfo(@RequestParam String orderId){
+//        return ResponseUtil.returnErrorWithData(billService.getCashBillInfo(orderId));
+//    }
+
+    /**
+     * 用户对单据进行兑付
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @PostMapping(value = "/cashBill")
+    public ResponseUtil cashBill(@RequestParam String billOrderActId) {
+        //这里需要用户模块获取到用户的id 整合之前使用id 1
+    	//分割字符串获取流转表idList
+    	List<Integer> billOrderActIdList = StringDivisionUtil.stringDivision(billOrderActId);
+
+    	String userId = null;//用户id用session传递
+    	
+    	int result = billService.cashBill(billOrderActIdList,"1");
+
+        if(result > 0) {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_SUCCESS.getCode(),true,null);
+        }else {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_ERROR.getCode(), true, null);
+        }
+    }
+}

+ 114 - 0
src/main/java/com/fuzamei/controller/EnterpriseController.java

@@ -0,0 +1,114 @@
+package com.fuzamei.controller;
+
+
+import com.fuzamei.entity.Enterprise;
+import com.fuzamei.entity.User;
+import com.fuzamei.entity.UserConnectEnterprise;
+import com.fuzamei.service.ConnectService;
+import com.fuzamei.service.EnterpriseService;
+import com.fuzamei.service.UserService;
+import com.fuzamei.util.ResponseUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.util.List;
+import java.util.logging.Logger;
+
+import static com.fuzamei.enums.CodeEnum.COMPLETE_SUCCESS;
+import static com.fuzamei.enums.CodeEnum.EXISTED_ENTERPRISE;
+import static com.fuzamei.util.ResponseUtil.getResult;
+
+
+/**
+ * Created by sqc95 on 2018/4/28.
+ */
+
+@RestController
+@RequestMapping(path = "/enterprise")
+public class EnterpriseController {
+
+    @Autowired
+    EnterpriseService enterpriseService;
+    @Autowired
+    ConnectService connectService;
+    @Autowired
+    UserService userService;
+
+    Logger logger;
+    final int USER_ID_LENGTH=2;
+
+    /**
+     * @Author: SongQiCong
+     * @Description:    主要用于企业信息表查询 测试用
+     * @Date:     2018/5/18
+     * @function:  查找企业表所有信息
+     */
+
+    @RequestMapping(path = "/selectAllEnterprise", method = RequestMethod.GET)
+    public List<User> findAll() {
+        List list = enterpriseService.findInfo();
+        Logger.getLogger(enterpriseService.findInfo().toString());
+        return list;
+    }
+
+
+
+
+
+
+/**
+     * @Author: SongQiCong
+     * @Description:    只输入tel password即可封装成enterprise类 校验是否已存在相同账号
+     * @Date:   2018/5/14
+     * @function:   用户注册
+     */
+
+    @RequestMapping(path = "/insertInfo", method = RequestMethod.POST)
+    public ResponseUtil insertInfo(@RequestBody Enterprise enterprise,
+                                   HttpServletRequest request) {
+
+
+        String enterpriseAccount = enterprise.getEnterpriseAccount();
+        List list = enterpriseService.findEnterpriseByAccount(enterpriseAccount);
+        if(!list.isEmpty()){
+            return getResult(EXISTED_ENTERPRISE.getCode(),false,null);
+        }
+        else{
+
+            //加入企业表
+            UserConnectEnterprise userConnectEnterprise = new UserConnectEnterprise();
+            enterpriseService.CreateInfo(enterprise);
+            //加入映射表
+            HttpSession session = request.getSession();
+            User user = (User)session.getAttribute("user");
+
+            System.out.println("实现的用户密码"+user.getUserID().toString());
+
+
+
+            userConnectEnterprise.setUserTel(user.getUserTel());
+            userConnectEnterprise.setUserID(user.getUserID());
+            userConnectEnterprise.setEnterpriseAccount(enterpriseAccount);
+            userConnectEnterprise.setEnterpriseName(enterprise.getEnterpriseName());
+
+            connectService.insertInfo(userConnectEnterprise);
+        }
+
+
+    return getResult(COMPLETE_SUCCESS.getCode(),true,null);
+
+
+
+    }
+
+
+
+
+}
+
+
+
+

+ 91 - 0
src/main/java/com/fuzamei/controller/LoggerController.java

@@ -0,0 +1,91 @@
+package com.fuzamei.controller;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import com.fuzamei.po.LogAct;
+import com.fuzamei.po.LogCapital;
+import com.fuzamei.service.LoggerService;
+import com.fuzamei.util.ActionReturnUtil;
+import com.fuzamei.vo.LogActVo;
+import com.fuzamei.vo.LogCapitalVo;
+import com.fuzamei.vo.LogMarketVo;
+
+@Controller
+@RequestMapping("/logger")
+@Component
+public class LoggerController {
+
+	private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+	@Autowired
+	private LoggerService loggerService;
+	
+	/**
+	 * 根据企业id查询该企业的操作日志
+	 * @param enterpriseId
+	 * @return
+	 */
+	@RequestMapping(value ="/findLogActById",method = RequestMethod.GET)
+	@ResponseBody  //返回非html数据格式的数据,例如json、xml等,使用前需要在配置文件中添加"配置转换器"
+	public ActionReturnUtil findLogActById(Integer enterpriseId)  
+	{
+		//int intEnterpriseId = Integer.parseInt(enterpriseId);
+	    List<LogActVo> resultList = loggerService.getLogActList(enterpriseId);
+	    //判断resultList是否为空
+	    if(resultList == null) {
+	    	return ActionReturnUtil.returnError("400"); //返回错误信息
+	    } else {
+	    	return ActionReturnUtil.returnSuccessWithData(resultList);//返回查询结果信息
+	    }
+    }
+	
+	/**
+	 * 根据企业id查询资金流水日志
+	 * @param enterpriseId
+	 * @return
+	 */
+	@RequestMapping(value = "/findLogCapitalById",method = RequestMethod.GET)
+	@ResponseBody 
+	public  ActionReturnUtil findLogCapitalById(String enterpriseId)
+    {
+		int intEnterpriseId = Integer.parseInt(enterpriseId);
+		List<LogCapitalVo> resultlist =loggerService.getLogCapitalList(intEnterpriseId);
+		if(resultlist == null) {
+			return ActionReturnUtil.returnError("400");
+		} else {
+			return ActionReturnUtil.returnSuccessWithData(resultlist);
+		}
+    }
+	
+	/**
+	 * 根据市场id查询市场票据详细信息
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/getMarketInfo",method = RequestMethod.GET)
+	@ResponseBody
+	public ActionReturnUtil getMarketInfo(Integer id)
+    {
+		LogMarketVo logMarketVo = new LogMarketVo();
+		logMarketVo = loggerService.getMarketInfo(id);
+		if(logMarketVo == null) {
+			return ActionReturnUtil.returnError("400"); 
+		} else {
+			System.out.println(ActionReturnUtil.returnSuccessWithData(logMarketVo));
+	    	return ActionReturnUtil.returnSuccessWithData(logMarketVo);
+		}
+    }	
+	
+
+}

+ 177 - 0
src/main/java/com/fuzamei/controller/MarketController.java

@@ -0,0 +1,177 @@
+package com.fuzamei.controller;
+
+import com.fuzamei.dto.*;
+import com.fuzamei.entity.Market;
+import com.fuzamei.enums.CodeEnum;
+import com.fuzamei.service.BillOrderActService;
+import com.fuzamei.service.MarketService;
+import com.fuzamei.util.PageData;
+import com.fuzamei.util.ResponseUtil;
+import com.fuzamei.vo.MarketVO;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * @file_name: MarketController
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/4 10:40
+ * @version:
+ */
+@Controller
+@RequestMapping(value = "/market")
+public class MarketController {
+
+    private static Logger logger = Logger.getLogger(MarketController.class);
+
+    @Autowired
+    private MarketService marketService;
+
+    @Autowired
+    private BillOrderActService billOrderActService;
+
+    /**
+     * 对单据进行申请融资
+     * @param fincanceInfoDto
+     * @return
+     */
+    @PostMapping(value = "/financingBill")
+    public ResponseUtil financingBill(@RequestBody FincanceInfoDto fincanceInfoDto){
+
+        if(fincanceInfoDto.getFinancePayMoney() <= 0) {
+            return ResponseUtil.getResult(CodeEnum.FINANCING_FALSE.getCode(), false, null);
+        }
+        if(fincanceInfoDto.getDiscountMoney() <= 0) {
+            return ResponseUtil.getResult(CodeEnum.FINANCING_FALSE.getCode(), false, null);
+        }
+
+        marketService.financingBill(fincanceInfoDto);
+
+        return ResponseUtil.getResult(CodeEnum.FINANCING_SUCCESS.getCode(), false, null);
+
+    }
+    
+    /**
+     * 申请质押
+     * @param pledgeInfoDTO
+     * @return
+     */
+    @RequestMapping(value = "/pledge", method = RequestMethod.POST)
+    public @ResponseBody
+    ResponseUtil applyPledge(@RequestBody PledgeInfoDTO pledgeInfoDTO) {
+        int result = marketService.applyPledge(pledgeInfoDTO);
+        if(result > 0) {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_SUCCESS.getCode(),true,result);
+        }else {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_ERROR.getCode(), true, null);
+        }
+    }
+
+    /**
+     * 获取市场挂牌信息,由时间,出账企业等做筛选,默认为空,不筛选,返回第一页
+     * @param baseDTO
+     * @return
+     */
+    @RequestMapping(value="/selectByState", method = RequestMethod.POST)
+    public @ResponseBody
+    ResponseUtil selectByState(@RequestBody BaseDTO baseDTO) {
+        PageData pageData = marketService.selectByState(baseDTO);
+        if(pageData != null) {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_SUCCESS.getCode(),true,pageData);
+        }else {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_ERROR.getCode(), true, null);
+        }
+
+    }
+
+    /**
+     * 对市场挂牌进行摘牌,查看融资信息
+     * @param marketDTO 所摘牌的单据信息
+     * @Return ResponseUtil 成功放回信息由枚举类定义,@See ResultMsgEnum
+     */
+    @RequestMapping(value = "/prePick", method = RequestMethod.POST)
+    public @ResponseBody
+    ResponseUtil preBuyBill(@RequestBody MarketDTO marketDTO) {
+        Integer marketId = marketDTO.getId();
+        MarketVO marketVO = marketService.selectById(marketId);
+        if(marketVO != null) {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_SUCCESS.getCode(),true,marketVO);
+        }else {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_ERROR.getCode(), true, null);
+        }
+    }
+
+    /**
+     * 确认对市场买断融资挂牌进行摘牌
+     * @param pickDTO marketId 所摘牌的单据信息
+     * @Return ResponseUtil 成功放回信息由枚举类定义,@See ResultMsgEnum
+     */
+    @RequestMapping(value = "/pickFinance", method = RequestMethod.POST)
+    @Transactional
+    public @ResponseBody
+    ResponseUtil pickFinance(@RequestBody PickDTO pickDTO) {
+        int result = marketService.pickFinance(pickDTO);
+        if(result > 0) {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_SUCCESS.getCode(),true,result);
+        }else {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_ERROR.getCode(), true, null);
+        }
+    }
+
+    /**
+     * 对市场挂牌进行摘牌,查看质押信息
+     * @param marketDTO 所摘牌的单据信息
+     * @Return ResponseUtil 成功放回信息由枚举类定义,@See ResultMsgEnum
+     */
+    @RequestMapping(value = "/prePickPledge", method = RequestMethod.POST)
+    public @ResponseBody
+    ResponseUtil prePickPledge(@RequestBody MarketDTO marketDTO) {
+        Integer marketId = marketDTO.getId();
+        MarketVO marketVO = marketService.selectById(marketId);
+        if(marketVO != null) {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_SUCCESS.getCode(),true, marketVO);
+        }else {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_ERROR.getCode(), true, null);
+        }
+    }
+
+    /**
+     * 确认对市场买断融资挂牌进行摘牌
+     * @param pickDTO
+     * @return
+     */
+    @RequestMapping(value = "pickPledge", method = RequestMethod.POST)
+    public @ResponseBody
+    ResponseUtil pickPledge(@RequestBody PickDTO pickDTO) {
+        int result = marketService.pickPledge(pickDTO);
+        if(result > 0) {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_SUCCESS.getCode(),true,result);
+        }else {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_ERROR.getCode(), true, null);
+        }
+    }
+
+    /**
+     * 回购(未调)
+     * @param buyBackInfoDTO
+     * @return
+     */
+    @RequestMapping(value = "buyBack", method = RequestMethod.POST)
+    public @ResponseBody
+    ResponseUtil burBack(@RequestBody BuyBackInfoDTO buyBackInfoDTO) {
+        int result = marketService.buyBack(buyBackInfoDTO);
+        if(result > 0) {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_SUCCESS.getCode(),true,result);
+        }else {
+            return ResponseUtil.getResult(CodeEnum.COMMONS_ERROR.getCode(), true, null);
+        }
+    }
+
+}

+ 247 - 0
src/main/java/com/fuzamei/controller/UserController.java

@@ -0,0 +1,247 @@
+package com.fuzamei.controller;
+
+
+import com.fuzamei.entity.User;
+import com.fuzamei.entity.UserConnectEnterprise;
+import com.fuzamei.service.ConnectService;
+import com.fuzamei.service.UserService;
+import com.fuzamei.util.ResponseUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.util.Date;
+import java.util.List;
+import java.util.logging.Logger;
+
+import static com.fuzamei.enums.CodeEnum.*;
+import static com.fuzamei.util.MD5.parseStrToMd5L32;
+import static com.fuzamei.util.ResponseUtil.getResult;
+
+
+/**
+ * Created by sqc95 on 2018/4/28.
+ */
+@RestController
+@RequestMapping(path = "/user")
+public class UserController {
+
+    @Autowired
+    @Resource
+
+    UserService userService;
+    @Autowired
+    ConnectService connectService;
+    Logger logger;
+    final int USER_ID_LENGTH= 2;
+
+
+    @ResponseBody
+    @RequestMapping(path = "/test", method = RequestMethod.GET)
+    public String  test() {
+        return "123";
+    }
+
+
+    /**
+     * @Author: SongQiCong
+     * @Description:    仅用于测试
+     * @Date:   2018/5/14
+     * @function:   展示用户表
+     */
+    @ResponseBody
+    @RequestMapping(path = "/selectAllUser", method = RequestMethod.GET)
+    public List<User> findAll() {
+        List list = userService.findAll();
+        Logger.getLogger(userService.findAll().toString());
+        return list;
+    }
+
+
+
+
+    /**
+     * @Author: SongQiCong
+     * @Description:    仅用于测试
+     * @Date:   2018/5/14
+     * @function:   通过ID查找用户
+     */
+    @RequestMapping(path = "/findID", method = RequestMethod.POST)
+    public User findUserById(@RequestBody User user
+                             //@RequestParam Integer userID
+    ) {
+        int userID = user.getUserID();
+        Logger.getLogger(userService.findUserById(userID).toString());
+        return userService.findUserById(userID);
+
+    }
+
+
+
+
+    /**
+     * @Author: SongQiCong
+     * @Description:    仅用于测试
+     * @Date:   2018/5/14
+     * @function:   删除用户
+     */
+    @RequestMapping(path = "/delete", method = RequestMethod.POST)
+    public List<User> deleteUser(@RequestParam Integer userID) {
+        userService.deleteUser(userID);
+        return userService.findAll();
+
+    }
+
+
+
+    /**
+     * @Author: SongQiCong
+     * @Description:    仅用于测试
+     * @Date:       2018/5/14
+     * @function:   增加用户
+     */
+    @RequestMapping(path = "/add", method = RequestMethod.POST)
+    public List<User> addUser(@RequestBody User user) {
+        String code = user.getPassword();//获得明文密码
+        Date day = new Date();
+
+        user.setPassword(parseStrToMd5L32(code));
+        userService.addUser(user);
+        return userService.findAll();
+    }
+
+
+
+    /**
+     * @Author: SongQiCong
+     * @Description:    主要用于 password重置后 重新加密 用户管理修改信息
+     * @Date:     2018/5/14
+     * @function:  更新数据
+     */
+    @RequestMapping(path = "/update", method = RequestMethod.POST)
+    public User updateUser(@RequestBody User user) {
+
+       String userTel = user.getUserTel();//Tel
+        int userID = user.getUserID();
+        User user2 = userService.findUserById(userID);
+
+        user2.setUserName(user.getUserName());
+        user2.setUserAge(user.getUserAge());
+        user2.setUserTel(user.getUserTel());
+        user2.setPassword(parseStrToMd5L32(user.getPassword()));
+
+
+        userService.updateUser(user2);
+
+
+        return user;
+    }
+
+
+
+    /**
+     * @Author: SongQiCong
+     * @Description:    只输入tel password即可封装成user类 校验是否已存在相同账号
+     * @Date:   2018/5/14
+     * @function:   用户注册
+     */
+    @RequestMapping(path = "/registry", method = RequestMethod.POST)
+    public ResponseUtil registryDetect(@RequestBody User user) {
+        List list = userService.findUserByTel(user.getUserTel());
+
+        if (!list.isEmpty())
+            return getResult(REGISTRY_FAIL.getCode(),false,null);
+        else {
+
+            user.setPassword(parseStrToMd5L32(user.getPassword()));
+
+            userService.registry(user);
+            return getResult(REGISTRY_SUCCESS.getCode(),true,null);
+        }
+
+
+    }
+
+
+
+    /**
+     * @Author: SongQiCong
+     * @Description:    同样使用tel password登录 校验账号是否存在 密码校对
+     * @Date:   2018/5/14
+     * @function:   用户登录
+     */
+    @RequestMapping(path = "/login", method = RequestMethod.POST)
+    public ResponseUtil loginDetect(@RequestBody User user,HttpServletRequest request) {
+
+        User u =userService.login(user.getUserTel(),parseStrToMd5L32(user.getPassword()));
+        if(u!=null) {
+                HttpSession session = request.getSession();
+                session.setAttribute("user", u);
+                int userID= u.getUserID();
+                UserConnectEnterprise userConnectEnterprise= connectService.findInfoByUserID(userID);
+                if(userConnectEnterprise==null)
+                    return getResult(LOGIN_SUCCESS.getCode(),true,null);
+                String enterpriseName=userConnectEnterprise.getEnterpriseName();
+            return getResult(LOGIN_SUCCESS.getCode(),true,enterpriseName);
+        }else
+            return getResult(LOGIN_FAIL.getCode(),false,null);
+
+
+    }
+
+
+
+    /**
+     * @Author: SongQiCong
+     * @Description:    登录状态token校验 账号真实存在校验
+     * @Date:       2018/5/14
+     * @function:   注销用户登录状态
+     */
+    @RequestMapping(path = "/logout", method = RequestMethod.POST)
+    public ResponseUtil logout(HttpServletRequest request) {
+        HttpSession session = request.getSession();
+        session.setAttribute("user",null);
+        return getResult(LOGOUT_SUCCESS.getCode(),true,null);
+
+    }
+
+
+    @RequestMapping(path = "/changeCode",method = RequestMethod.POST)
+    public ResponseUtil changeCode(@RequestParam String theNewOne,
+                                    @RequestParam String theNewForconfirm,
+                                   HttpServletRequest request){
+
+        if(!theNewOne.equals(theNewForconfirm)){
+            return getResult(DIFFERENT_PASSWORD.getCode(),false,null);
+        }
+        if(theNewOne.equals(theNewForconfirm)){
+            HttpSession session = request.getSession();
+            User user = (User)session.getAttribute("user");
+            int userID= user.getUserID();
+            if(!theNewOne.equals(user.getPassword()))
+                user.setPassword(theNewOne);
+                updateUser(user);
+                return getResult(CHANGE_SUCCESS.getCode(),true,null);
+        }
+        return getResult(NO_CHANGE.getCode(),false,null);
+
+
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+ 22 - 0
src/main/java/com/fuzamei/dao/AssetDao.java

@@ -0,0 +1,22 @@
+package com.fuzamei.dao;
+
+import com.fuzamei.dto.AssetChangeDto;
+import com.fuzamei.entity.Asset;
+import com.fuzamei.vo.AssetDetailVo;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @file_name: AssetDao
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/10 9:49
+ * @version:
+ */
+@Repository
+public interface AssetDao {
+     Asset getAssetDetail(String id);
+     int updateAssetWithList(List<AssetChangeDto> list);
+     int updateAsset(Asset asset);
+}

+ 27 - 0
src/main/java/com/fuzamei/dao/BillDao.java

@@ -0,0 +1,27 @@
+package com.fuzamei.dao;
+
+import com.fuzamei.dto.FilterDto;
+import com.fuzamei.dto.OrderDto;
+import com.fuzamei.entity.Order;
+import com.fuzamei.vo.BillDetailVo;
+import com.fuzamei.dto.InitiateBillVo;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @file_name: BillDao
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/4 11:34
+ * @version:
+ */
+@Repository
+public interface BillDao {
+   List<InitiateBillVo> getInitiateBillInfo(FilterDto filterDto);
+   Order selectBillDetail(String id);
+   int insertOrder(Order orderDto);
+   int updateBill(Order order);
+
+
+}

+ 43 - 0
src/main/java/com/fuzamei/dao/BillOrderActDao.java

@@ -0,0 +1,43 @@
+package com.fuzamei.dao;
+
+import com.fuzamei.dto.Condition;
+import com.fuzamei.dto.UpdateBillOrderActDto;
+import com.fuzamei.entity.BillOrderAct;
+import com.fuzamei.entity.Order;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @file_name: BillOrderDao
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/10 16:34
+ * @version:
+ */
+@Repository
+public interface BillOrderActDao {
+    int insertIntoBillOrder(BillOrderAct order);
+    double selectBillFreeze(String id);
+    List<BillOrderAct> selectOrderOfBill(String id);
+    int updateBillStatus(UpdateBillOrderActDto updateBillOrderActDto);
+    int updateBillStatusByOrderId(UpdateBillOrderActDto updateBillOrderActDto);
+    
+    BillOrderAct selectBillOrderActById(int id);
+
+    int updateBillMoney(UpdateBillOrderActDto updateBillOrderActDto);
+    int deleteBillOrdersActByOrderId(String billID);
+    int updateBillOrderAct(BillOrderAct billOrderAct);
+    BillOrderAct selectBillOrderActByCondition(Condition condition);
+    int deleteBillOrdersActById(int id);
+    
+    //根据流转表id查询数据实体信息
+    BillOrderAct selectByOrderActId(Integer id);
+    
+    BillOrderAct selectSimilarOrderAct(BillOrderAct billOrderAct);
+    int updateOrderAct(BillOrderAct billOrderAct);
+    BillOrderAct selectPledgeOrderAct(BillOrderAct billOrderAct);
+    
+    //根据流转表id更改流转表状态
+    int updateBillStatusByOrderActId(UpdateBillOrderActDto updateBillOrderActDto);
+}

+ 10 - 0
src/main/java/com/fuzamei/dao/ConnectMapper.java

@@ -0,0 +1,10 @@
+package com.fuzamei.dao;
+
+import com.fuzamei.entity.UserConnectEnterprise;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ConnectMapper {
+   int insertInfo(UserConnectEnterprise userConnectEnterprise);
+
+}

+ 30 - 0
src/main/java/com/fuzamei/dao/EnterpriseMapper.java

@@ -0,0 +1,30 @@
+package com.fuzamei.dao;
+
+import com.fuzamei.entity.Enterprise;
+import com.fuzamei.entity.UserEnterprise;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * Created by fuzamei95 on 2018/5/14.
+ */
+
+@Repository
+public interface EnterpriseMapper {
+
+    List<Enterprise> findInfo();
+
+    void updateInfo(@RequestBody Enterprise enterprise);
+
+    void createInfo(@RequestBody Enterprise enterprise);
+
+    List<Enterprise> findEnterpriseByAccount(@Param("enterpriseAccount") String enterpriseAccount);
+
+    //根据账户id(手机号)找用户企业关联表
+    UserEnterprise getUserEnterpriseByUserTel(String userTel);
+
+
+}

+ 48 - 0
src/main/java/com/fuzamei/dao/LoggerDao.java

@@ -0,0 +1,48 @@
+package com.fuzamei.dao;
+
+import java.util.List;
+
+import com.fuzamei.po.BillMarket;
+import com.fuzamei.po.LogAct;
+import com.fuzamei.po.LogCapital;
+
+public interface LoggerDao {
+
+	/**
+	 * 根据企业id查操作日志列表
+	 * @param enterpriseId
+	 * @return
+	 */
+	List<LogAct> LogActList(int enterpriseId);
+	
+	
+	/**
+	 * 根据企业id查询资金流水日志
+	 * @param enterpriseId
+	 * @return
+	 */
+	List<LogCapital>  LogCapitalList(int enterpriseId);
+	
+	/**
+	 * 根据市场id查询市场详情
+	 * @param id
+	 * @return
+	 */
+	BillMarket getMarketInfo(int id);
+	
+	/**
+	 * 插入企业操作记录
+	 * @param logAct
+	 * @return
+	 */
+	int inputLogAct(LogAct logAct);
+	
+	/**
+	 * 插入企业资金流水记录
+	 * @param logCapital
+	 * @return
+	 */
+	int inputLogCapital(LogCapital logCapital);
+	
+	
+}

+ 24 - 0
src/main/java/com/fuzamei/dao/MarketDAO.java

@@ -0,0 +1,24 @@
+package com.fuzamei.dao;
+
+import com.fuzamei.dto.BaseDTO;
+import com.fuzamei.dto.PickDTO;
+import com.fuzamei.entity.Market;
+
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface MarketDAO {
+
+    int insertMarket(Market marketPO);
+
+    List<Market> selectByState(BaseDTO baseDTO);
+
+    Market selectById(Integer marketId);
+
+    int updateMarket(Market market);
+
+    int updateDelistStatus(PickDTO pickDTO);
+
+}

+ 10 - 0
src/main/java/com/fuzamei/dao/OrdersDAO.java

@@ -0,0 +1,10 @@
+package com.fuzamei.dao;
+
+import com.fuzamei.entity.Order;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface OrdersDAO {
+    //通过母表id查询母表信息
+    Order selectByID(String id);
+}

+ 30 - 0
src/main/java/com/fuzamei/dao/UserMapper.java

@@ -0,0 +1,30 @@
+package com.fuzamei.dao;
+
+import com.fuzamei.entity.User;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * Created by fuzamei95 on 2018/4/28.
+ */
+
+@Repository
+public interface UserMapper {
+    User findUserById(@Param("userID") Integer userID);
+
+    Integer updateUser(User user);
+
+    List<User> findAll();
+
+    void deleteUser(@Param("userID") Integer userID);
+
+    void  addUser(User user);
+
+    List<User> findUserByTel(@Param("userTel") String userTel);
+
+    void registry(User user);
+
+    void logout(User user);
+}

+ 28 - 0
src/main/java/com/fuzamei/dto/AssetChangeDto.java

@@ -0,0 +1,28 @@
+package com.fuzamei.dto;
+
+import com.fuzamei.vo.AssetDetailVo;
+
+/**
+ * @file_name: AssetChangeDto
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/10 12:09
+ * @version:
+ */
+public class AssetChangeDto extends AssetDetailVo{
+    private String accountId;
+
+    public String getAccountId() {
+        return accountId;
+    }
+
+    public void setAccountId(String accountId) {
+        this.accountId = accountId;
+    }
+
+    public Double add(Double d){
+        setChinaYuan(getChinaYuan()+d);
+        return getChinaYuan();
+    }
+
+}

+ 91 - 0
src/main/java/com/fuzamei/dto/BaseDTO.java

@@ -0,0 +1,91 @@
+package com.fuzamei.dto;
+
+import javax.validation.GroupSequence;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+public class BaseDTO {
+    private Object sign;	//签名数据
+    private String searchString;//模糊搜索字符串
+    private String searchBeginDate;//搜索起始日期
+    private String searchEndDate;//搜索结束日期
+    private Integer pageIndex=1;
+    private Integer pageSize=10;
+
+    @NotNull(message = "企业id不能为空", groups = { EnterpriseId.class })
+    @Size(min = 5, max = 15)
+    private Integer enterpriseId;
+
+    private  Integer searchState;
+
+    public Integer getPageIndex() {
+        return pageIndex;
+    }
+
+    public void setPageIndex(Integer pageIndex) {
+        this.pageIndex = pageIndex;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public Object getSign() {
+        return sign;
+    }
+
+    public void setSign(Object sign) {
+        this.sign = sign;
+    }
+
+    public String getSearchBeginDate() {
+        return searchBeginDate;
+    }
+
+    public void setSearchBeginDate(String searchBeginDate) {
+        this.searchBeginDate = searchBeginDate;
+    }
+
+    public String getSearchEndDate() {
+        return searchEndDate;
+    }
+
+    public String getSearchString() {
+        return searchString;
+    }
+
+    public void setSearchString(String searchString) {
+        this.searchString = searchString;
+    }
+
+    public void setSearchEndDate(String searchEndDate) {
+        this.searchEndDate = searchEndDate;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Integer getSearchState() {
+        return searchState;
+    }
+
+    public void setSearchState(Integer searchState) {
+        this.searchState = searchState;
+    }
+
+
+
+    public interface EnterpriseId{};
+
+    @GroupSequence({EnterpriseId.class})
+    public interface CheckSearchEnterpriseId{};
+}

+ 18 - 0
src/main/java/com/fuzamei/dto/BaseVo.java

@@ -0,0 +1,18 @@
+package com.fuzamei.dto;
+
+/**
+ * @file_name: BaseVo
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/8 16:26
+ * @version:
+ */
+public class BaseVo {
+    private String ownEnterprise;
+    //起始日期
+    private String beginTime;
+    //结束日期
+    private Integer pageIndex=1;
+    private Integer pageSize=10;
+
+}

+ 66 - 0
src/main/java/com/fuzamei/dto/BillPayInfoDto.java

@@ -0,0 +1,66 @@
+package com.fuzamei.dto;
+
+/**
+ * @file_name: BillPayInfoDto
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/14 16:51
+ * @version:
+ */
+public class BillPayInfoDto {
+
+    private String accountId;//账户id
+    private int billId; //流转表id
+    private String inEnterprise; //持有企业
+    private double money; 
+    private double payBillMoney;
+    private Double rate;
+
+    public String getAccountId() {
+        return accountId;
+    }
+
+    public void setAccountId(String accountId) {
+        this.accountId = accountId;
+    }
+
+    public String getInEnterprise() {
+        return inEnterprise;
+    }
+
+    public void setInEnterprise(String inEnterprise) {
+        this.inEnterprise = inEnterprise;
+    }
+
+    public double getMoneys() {
+        return money;
+    }
+
+    public void setMoneys(double money) {
+        this.money = money;
+    }
+
+    public double getPayBillMoney() {
+        return payBillMoney;
+    }
+
+    public void setPayBillMoney(double payBillMoney) {
+        this.payBillMoney = payBillMoney;
+    }
+
+    public Double getRate() {
+        return rate;
+    }
+
+    public void setRate(Double rate) {
+        this.rate = rate;
+    }
+
+    public int getBillId() {
+        return billId;
+    }
+
+    public void setBillId(int billId) {
+        this.billId = billId;
+    }
+}

+ 68 - 0
src/main/java/com/fuzamei/dto/BuyBackInfoDTO.java

@@ -0,0 +1,68 @@
+package com.fuzamei.dto;
+
+public class BuyBackInfoDTO {
+
+    private String accountId;
+    private String operatorEnterprise;
+    private String ownEnterprise;
+    private Integer orderActId;
+    private Long remainingDays;
+    private Double annualRate;
+    private Double paidMoney;
+
+    public String getAccountId() {
+        return accountId;
+    }
+
+    public void setAccountId(String accountId) {
+        this.accountId = accountId;
+    }
+
+    public String getOwnEnterprise() {
+        return ownEnterprise;
+    }
+
+    public void setOwnEnterprise(String ownEnterprise) {
+        this.ownEnterprise = ownEnterprise;
+    }
+
+    public String getOperatorEnterprise() {
+        return operatorEnterprise;
+    }
+
+    public void setOperatorEnterprise(String operatorEnterprise) {
+        this.operatorEnterprise = operatorEnterprise;
+    }
+
+    public Integer getOrderActId() {
+        return orderActId;
+    }
+
+    public void setOrderActId(Integer orderActId) {
+        this.orderActId = orderActId;
+    }
+
+    public Long getRemainingDays() {
+        return remainingDays;
+    }
+
+    public void setRemainingDays(Long remainingDays) {
+        this.remainingDays = remainingDays;
+    }
+
+    public Double getAnnualRate() {
+        return annualRate;
+    }
+
+    public void setAnnualRate(Double annualRate) {
+        this.annualRate = annualRate;
+    }
+
+    public Double getPaidMoney() {
+        return paidMoney;
+    }
+
+    public void setPaidMoney(Double paidMoney) {
+        this.paidMoney = paidMoney;
+    }
+}

+ 61 - 0
src/main/java/com/fuzamei/dto/Condition.java

@@ -0,0 +1,61 @@
+package com.fuzamei.dto;
+
+/**
+ * @file_name: Condition
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/15 13:53
+ * @version:
+ */
+public class Condition {
+    private int status;
+    private String ownEnterprise; 
+    private String orderId;
+    private int billId;
+    
+    
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getOwnEnterprise() {
+        return ownEnterprise;
+    }
+
+    public void setOwnEnterprise(String ownEnterprise) {
+        this.ownEnterprise = ownEnterprise;
+    }
+
+    
+    public int getBillId() {
+		return billId;
+	}
+
+	public void setBillId(int billId) {
+		this.billId = billId;
+	}
+
+	
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+	@Override
+	public String toString() {
+		return "Condition [status=" + status + ", ownEnterprise=" + ownEnterprise + ", orderId=" + orderId + ", billId="
+				+ billId + "]";
+	}
+    
+    
+    
+}

+ 121 - 0
src/main/java/com/fuzamei/dto/FilterDto.java

@@ -0,0 +1,121 @@
+package com.fuzamei.dto;
+
+/**
+ * @file_name: FIlterVo
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/4 10:01
+ * @version:
+ */
+public class FilterDto {
+    //token
+    private String token;
+    //状态
+    private String status;
+    //持票企业企业
+    private String ownEnterprise;
+    //起始日期
+    private String beginTime;
+    //结束日期
+    private String  endTime;
+    //出账企业
+    private String outEnterprise;
+    //母表id
+    private Integer orderId;
+    //流转表id
+    private Integer orderActId;
+
+    public Integer getOrderActId() {
+        return orderActId;
+    }
+
+    public void setOrderActId(Integer orderActId) {
+        this.orderActId = orderActId;
+    }
+
+    public Integer getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Integer orderId) {
+        this.orderId = orderId;
+    }
+
+    private Integer pageIndex=1;
+    private Integer pageSize=10;
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getOwnEnterprise() {
+        return ownEnterprise;
+    }
+
+    public void setOwnEnterprise(String ownEnterprise) {
+        this.ownEnterprise = ownEnterprise;
+    }
+
+    public String getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(String beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getOutEnterprise() {
+        return outEnterprise;
+    }
+
+    public void setOutEnterprise(String outEnterprise) {
+        this.outEnterprise = outEnterprise;
+    }
+
+    public Integer getPageIndex() {
+        return pageIndex;
+    }
+
+    public void setPageIndex(Integer pageIndex) {
+        this.pageIndex = pageIndex;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    @Override
+    public String toString() {
+        return "FilterDto{" +
+                "status=" + status +
+                ", ownEnterprise=" + ownEnterprise +
+                ", beginTime='" + beginTime + '\'' +
+                ", endTime=" + endTime +
+                ", outEnterprise=" + outEnterprise +
+                '}';
+    }
+}

+ 70 - 0
src/main/java/com/fuzamei/dto/FincanceInfoDto.java

@@ -0,0 +1,70 @@
+package com.fuzamei.dto;
+
+public class FincanceInfoDto {
+    private String accountId;   //账户id
+    private Integer orderActId;  //流转表id
+    private Double financePayMoney;  //融资份额
+    private Double discountRate;  //贴现利率
+    private Double discountMoney;   //贴现费
+    private Double financeGetMoney;  //融资金额
+
+    public String getAccountId() {
+        return accountId;
+    }
+
+    public void setAccountId(String accountId) {
+        this.accountId = accountId;
+    }
+
+    public Integer getOrderActId() {
+        return orderActId;
+    }
+
+    public void setOrderActId(Integer orderActId) {
+        this.orderActId = orderActId;
+    }
+
+    public Double getFinancePayMoney() {
+        return financePayMoney;
+    }
+
+    public void setFinancePayMoney(Double financePayMoney) {
+        this.financePayMoney = financePayMoney;
+    }
+
+    public Double getDiscountRate() {
+        return discountRate;
+    }
+
+    public void setDiscountRate(Double discountRate) {
+        this.discountRate = discountRate;
+    }
+
+    public Double getDiscountMoney() {
+        return discountMoney;
+    }
+
+    public void setDiscountMoney(Double discountMoney) {
+        this.discountMoney = discountMoney;
+    }
+
+    public Double getFinanceGetMoney() {
+        return financeGetMoney;
+    }
+
+    public void setFinanceGetMoney(Double financeGetMoney) {
+        this.financeGetMoney = financeGetMoney;
+    }
+
+    @Override
+    public String toString() {
+        return "FincanceInfoDto{" +
+                "accountId='" + accountId + '\'' +
+                ", orderActId=" + orderActId +
+                ", financePayMoney=" + financePayMoney +
+                ", discountRate=" + discountRate +
+                ", discountMoney=" + discountMoney +
+                ", financeGetMoney=" + financeGetMoney +
+                '}';
+    }
+}

+ 121 - 0
src/main/java/com/fuzamei/dto/InitiateBillVo.java

@@ -0,0 +1,121 @@
+package com.fuzamei.dto;
+
+/**
+ * @file_name: InitiateBillVo
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/8 9:55
+ * @version:
+ */
+public class InitiateBillVo {
+    private int id;
+    private String orderId;
+    private int money;
+    private int rate;
+    private String operatorEnterprise;
+    private String ownEnterprise;
+    private int ownCopies;
+    private int status;
+    private String enterpriseName;
+
+    public InitiateBillVo() {
+    }
+
+    public InitiateBillVo(int id, String billId, int money, int rate, String operatorEnterprise, String ownEnterprise, int ownCopies, int status, String enterpriseName) {
+        this.id = id;
+        this.orderId = billId;
+        this.money = money;
+        this.rate = rate;
+        this.operatorEnterprise = operatorEnterprise;
+        this.ownEnterprise = ownEnterprise;
+        this.ownCopies = ownCopies;
+        this.status = status;
+        this.enterpriseName = enterpriseName;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public int getMoney() {
+        return money;
+    }
+
+    public void setMoney(int money) {
+        this.money = money;
+    }
+
+    public int getRate() {
+        return rate;
+    }
+
+    public void setRate(int rate) {
+        this.rate = rate;
+    }
+
+    public String getOperatorEnterprise() {
+        return operatorEnterprise;
+    }
+
+    public void setOperatorEnterprise(String operatorEnterprise) {
+        this.operatorEnterprise = operatorEnterprise;
+    }
+
+    public String getOwnEnterprise() {
+        return ownEnterprise;
+    }
+
+    public void setOwnEnterprise(String ownEnterprise) {
+        this.ownEnterprise = ownEnterprise;
+    }
+
+    public int getOwnCopies() {
+        return ownCopies;
+    }
+
+    public void setOwnCopies(int ownCopies) {
+        this.ownCopies = ownCopies;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getEnterpriseName() {
+        return enterpriseName;
+    }
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
+    }
+
+    @Override
+    public String toString() {
+        return "InitiateBillVo{" +
+                "id=" + id +
+                ", billId=" + orderId +
+                ", money=" + money +
+                ", rate=" + rate +
+                ", operatorEnterprise=" + operatorEnterprise +
+                ", ownEnterprise='" + ownEnterprise + '\'' +
+                ", ownCopies=" + ownCopies +
+                ", status=" + status +
+                '}';
+    }
+}

+ 178 - 0
src/main/java/com/fuzamei/dto/MarketDTO.java

@@ -0,0 +1,178 @@
+package com.fuzamei.dto;
+
+/**
+ * @file_name: MaketInfoDto
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/4 10:45
+ * @version:
+ */
+public class MarketDTO extends BaseDTO {
+
+    private Integer id; //市场id
+    private Integer orderId; //单据id
+    private Integer operatorEnterpriseId; //操作企业id
+    private String operatorEnterprise; //操作企业
+    private String outEnterprise;   //出账企业
+    private Long deadline;   //承兑日期
+    private Double summary; //账单总额
+    private Double transferMoney;  //转让金额
+    private Double annualRate;   //年化利率
+    private Double discountRate;   //贴现利率
+    private Double discountMoney;  //贴现费
+    private Double financingMoney;    //融资金额
+    private Integer orderType;  //单据类型
+    private Integer status; //0买断 1质押
+    private Integer delistStatus;   //0已摘 1未摘
+    private Long createTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Integer orderId) {
+        this.orderId = orderId;
+    }
+
+    public Integer getOperatorEnterpriseId() {
+        return operatorEnterpriseId;
+    }
+
+    public void setOperatorEnterpriseId(Integer operatorEnterpriseId) {
+        this.operatorEnterpriseId = operatorEnterpriseId;
+    }
+
+    public String getOperatorEnterprise() {
+        return operatorEnterprise;
+    }
+
+    public void setOperatorEnterprise(String operatorEnterprise) {
+        this.operatorEnterprise = operatorEnterprise;
+    }
+
+    public String getOutEnterprise() {
+        return outEnterprise;
+    }
+
+    public void setOutEnterprise(String outEnterprise) {
+        this.outEnterprise = outEnterprise;
+    }
+
+    public Long getDeadline() {
+        return deadline;
+    }
+
+    public void setDeadline(Long deadline) {
+        this.deadline = deadline;
+    }
+
+    public Double getSummary() {
+        return summary;
+    }
+
+    public void setSummary(Double summary) {
+        this.summary = summary;
+    }
+
+    public Double getTransferMoney() {
+        return transferMoney;
+    }
+
+    public void setTransferMoney(Double transferMoney) {
+        this.transferMoney = transferMoney;
+    }
+
+    public Double getAnnualRate() {
+        return annualRate;
+    }
+
+    public void setAnnualRate(Double annualRate) {
+        this.annualRate = annualRate;
+    }
+
+    public Double getDiscountRate() {
+        return discountRate;
+    }
+
+    public void setDiscountRate(Double discountRate) {
+        this.discountRate = discountRate;
+    }
+
+    public Double getDiscountMoney() {
+        return discountMoney;
+    }
+
+    public void setDiscountMoney(Double discountMoney) {
+        this.discountMoney = discountMoney;
+    }
+
+    public Double getFinancingMoney() {
+        return financingMoney;
+    }
+
+    public void setFinancingMoney(Double financingMoney) {
+        this.financingMoney = financingMoney;
+    }
+
+    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 Integer getDelistStatus() {
+        return delistStatus;
+    }
+
+    public void setDelistStatus(Integer delistStatus) {
+        this.delistStatus = delistStatus;
+    }
+
+    public Long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
+    }
+
+    @Override
+    public String toString() {
+        return "MarketDTO{" +
+                "id=" + id +
+                ", orderId=" + orderId +
+                ", operatorEnterpriseId=" + operatorEnterpriseId +
+                ", operatorEnterprise='" + operatorEnterprise + '\'' +
+                ", outEnterprise='" + outEnterprise + '\'' +
+                ", deadline=" + deadline +
+                ", summary=" + summary +
+                ", transferMoney=" + transferMoney +
+                ", annualRate=" + annualRate +
+                ", discountRate=" + discountRate +
+                ", discountMoney=" + discountMoney +
+                ", financingMoney=" + financingMoney +
+                ", orderType=" + orderType +
+                ", status=" + status +
+                ", delistStatus=" + delistStatus +
+                ", createTime=" + createTime +
+                '}';
+    }
+}

+ 98 - 0
src/main/java/com/fuzamei/dto/OrderActDto.java

@@ -0,0 +1,98 @@
+package com.fuzamei.dto;
+
+/**
+ * @file_name: OrderActDto
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/10 16:36
+ * @version:
+ */
+public class OrderActDto {
+    private int id;
+    private int orderId;
+    private String operatorEnterprise;
+    private double money;
+    private double rate;
+    private int ownCopies;
+    private int createBy;
+    private long createTime;
+    private int status;
+    private String payEnterprie;
+
+    public double getRate() {
+        return rate;
+    }
+
+    public void setRate(double rate) {
+        this.rate = rate;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public OrderActDto() {
+    }
+
+
+
+    public String getOperatorEnterprise() {
+        return operatorEnterprise;
+    }
+
+    public int getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(int orderId) {
+        this.orderId = orderId;
+    }
+
+    public void setOperatorEnterprise(String operatorEnterprise) {
+        this.operatorEnterprise = operatorEnterprise;
+    }
+
+    public double getMoney() {
+        return money;
+    }
+
+    public void setMoney(double money) {
+        this.money = money;
+    }
+
+    public int getOwnCopies() {
+        return ownCopies;
+    }
+
+    public void setOwnCopies(int ownCopies) {
+        this.ownCopies = ownCopies;
+    }
+
+    public int getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(int createBy) {
+        this.createBy = createBy;
+    }
+
+    public long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(long createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getPayEnterprie() {
+        return payEnterprie;
+    }
+
+    public void setPayEnterprie(String payEnterprie) {
+        this.payEnterprie = payEnterprie;
+    }
+}

+ 134 - 0
src/main/java/com/fuzamei/dto/OrderDto.java

@@ -0,0 +1,134 @@
+package com.fuzamei.dto;
+
+
+import com.fuzamei.common.bean.OpteratorTime;
+import com.fuzamei.vo.TimeStampUtil;
+
+import javax.validation.GroupSequence;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @file_name: OrderDto
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/4 11:25
+ * @version:
+ */
+public class OrderDto extends OpteratorTime {
+
+    @NotNull(message = "单据标号不能为空", groups={OrderId.class})
+    private String orderId;
+    //出账企业
+    @NotNull(message = "出账企业不呢为空",groups = {OutEnterprise.class})
+    private String outEnterprise;
+    //收账
+    private int outEnterpriseId;
+    @NotNull(message = "收账企业不能为空",groups = {InEnterprise.class})
+    private String  inEnterprise;
+    private int  inEnterpriseId;
+    @NotNull(message = "单据金额不能为空",groups = {Summary.class})
+    private double summary;
+    @NotNull(message = "收账日期不能为空",groups = {Deadline.class})
+    private long deadline;
+    @NotNull(message = "出账日期不能为空",groups = {OutBillTime.class})
+    private long outBillTime;
+    @NotNull(message = "协议利率不能为空",groups = {Rate.class})
+    private double rate;
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getOutEnterprise() {
+        return outEnterprise;
+    }
+
+    public void setOutEnterprise(String outEnterprise) {
+        this.outEnterprise = outEnterprise;
+    }
+
+    public int getOutEnterpriseId() {
+        return outEnterpriseId;
+    }
+
+    public void setOutEnterpriseId(int outEnterpriseId) {
+        this.outEnterpriseId = outEnterpriseId;
+    }
+
+    public String getInEnterprise() {
+        return inEnterprise;
+    }
+
+    public void setInEnterprise(String inEnterprise) {
+        this.inEnterprise = inEnterprise;
+    }
+
+    public int getInEnterpriseId() {
+        return inEnterpriseId;
+    }
+
+    public void setInEnterpriseId(int inEnterpriseId) {
+        this.inEnterpriseId = inEnterpriseId;
+    }
+
+    public double getSummary() {
+        return summary;
+    }
+
+    public void setSummary(double summary) {
+        this.summary = summary;
+    }
+
+    public long getDeadline() {
+        return deadline;
+    }
+
+    public void setDeadline(long deadline) {
+        this.deadline = deadline;
+    }
+
+    public long getOutBillTime() {
+        return outBillTime;
+    }
+
+    public void setOutBillTime(long outBillTime) {
+        this.outBillTime = outBillTime;
+    }
+
+    @Override
+    public String toString() {
+        return "OrderDto{" +
+                "orderId='" + orderId + '\'' +
+                ", outEnterprise='" + outEnterprise + '\'' +
+                ", outEnterpriseId=" + outEnterpriseId +
+                ", inEnterprise='" + inEnterprise + '\'' +
+                ", inEnterpriseId=" + inEnterpriseId +
+                ", summary=" + summary +
+                ", deadline=" + deadline +
+                ", outBillTime=" + outBillTime +
+                ", rate=" + rate +
+                '}';
+    }
+
+    public double getRate() {
+        return rate;
+    }
+
+    public void setRate(double rate) {
+        this.rate = rate;
+    }
+    public interface OrderId{}
+    public interface  OutEnterprise{}
+    private interface InEnterprise{}
+    private interface Summary{}
+    private interface Deadline{}
+    private interface OutBillTime{}
+    private interface Rate{}
+    @GroupSequence({OrderId.class,OutEnterprise.class,InEnterprise.class,Summary.class,Deadline.class,OutBillTime.class,Rate.class})
+    public  interface  MakeBill{}
+
+}

+ 62 - 0
src/main/java/com/fuzamei/dto/PickDTO.java

@@ -0,0 +1,62 @@
+package com.fuzamei.dto;
+
+public class PickDTO {
+    private Integer id; //市场id
+    private Integer operateEnterpriseId;    //操作企业
+    private String operateEnterprise;   //操作企业
+    private Double pickCopies;  //摘牌份额
+    private Double discountMoney;    //摘牌份额相应的贴现费
+
+    public void setDiscountMoney(Double discountMoney) {
+        this.discountMoney = discountMoney;
+    }
+
+    public Double getDiscountMoney() {
+        return discountMoney;
+    }
+
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getOperateEnterpriseId() {
+        return operateEnterpriseId;
+    }
+
+    public void setOperateEnterpriseId(Integer operateEnterpriseId) {
+        this.operateEnterpriseId = operateEnterpriseId;
+    }
+
+    public String getOperateEnterprise() {
+        return operateEnterprise;
+    }
+
+    public void setOperateEnterprise(String operateEnterprise) {
+        this.operateEnterprise = operateEnterprise;
+    }
+
+    public Double getPickCopies() {
+        return pickCopies;
+    }
+
+    public void setPickCopies(Double pickCopies) {
+        this.pickCopies = pickCopies;
+    }
+
+    @Override
+    public String toString() {
+        return "PickDTO{" +
+                "id=" + id +
+                ", operateEnterpriseId=" + operateEnterpriseId +
+                ", operateEnterprise='" + operateEnterprise + '\'' +
+                ", pickCopies=" + pickCopies +
+                ", discountMoney=" + discountMoney +
+                '}';
+    }
+}

+ 68 - 0
src/main/java/com/fuzamei/dto/PledgeInfoDTO.java

@@ -0,0 +1,68 @@
+package com.fuzamei.dto;
+
+public class PledgeInfoDTO {
+
+    private String accountId;   //账户id
+    private Integer orderActId;    //流转表id
+    private Double pledgeMoney; //质押份额
+    private String inEnterprise;    //收账企业/质押企业
+    private Double annualRate;  //年化利率
+    private Double discountMoney;   //贴现费
+    private Long buyBackDate;   //回购日期
+
+    public String getAccountId() {
+        return accountId;
+    }
+
+    public void setAccountId(String accountId) {
+        this.accountId = accountId;
+    }
+
+    public Integer getOrderActId() {
+        return orderActId;
+    }
+
+    public void setOrderActId(Integer orderActId) {
+        this.orderActId = orderActId;
+    }
+
+    public Double getPledgeMoney() {
+        return pledgeMoney;
+    }
+
+    public void setPledgeMoney(Double pledgeMoney) {
+        this.pledgeMoney = pledgeMoney;
+    }
+
+    public String getInEnterprise() {
+        return inEnterprise;
+    }
+
+    public void setInEnterprise(String inEnterprise) {
+        this.inEnterprise = inEnterprise;
+    }
+
+    public Double getAnnualRate() {
+        return annualRate;
+    }
+
+    public void setAnnualRate(Double annualRate) {
+        this.annualRate = annualRate;
+    }
+
+    public Double getDiscountMoney() {
+        return discountMoney;
+    }
+
+    public void setDiscountMoney(Double discountMoney) {
+        this.discountMoney = discountMoney;
+    }
+
+    public Long getBuyBackDate() {
+        return buyBackDate;
+    }
+
+    public void setBuyBackDate(Long buyBackDate) {
+        this.buyBackDate = buyBackDate;
+    }
+}

+ 97 - 0
src/main/java/com/fuzamei/dto/UpdateBillOrderActDto.java

@@ -0,0 +1,97 @@
+package com.fuzamei.dto;
+
+/**
+ * @file_name: UpdateBillOrderActDto
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/11 17:26
+ * @version:
+ */
+public class UpdateBillOrderActDto {
+    private String billId;
+    private int id;
+    private int status;
+    private double money;
+    private int operatorEnterpriseId;
+    private String operatorEnterprise;
+    private int ownEnterpriseId;
+    private String ownEnterprise;
+
+    public int getOperatorEnterpriseId() {
+        return operatorEnterpriseId;
+    }
+
+    public void setOperatorEnterpriseId(int operatorEnterpriseId) {
+        this.operatorEnterpriseId = operatorEnterpriseId;
+    }
+
+    public String getOperatorEnterprise() {
+        return operatorEnterprise;
+    }
+
+    public void setOperatorEnterprise(String operatorEnterprise) {
+        this.operatorEnterprise = operatorEnterprise;
+    }
+
+    public int getOwnEnterpriseId() {
+        return ownEnterpriseId;
+    }
+
+    public void setOwnEnterpriseId(int ownEnterpriseId) {
+        this.ownEnterpriseId = ownEnterpriseId;
+    }
+
+    public String getOwnEnterprise() {
+        return ownEnterprise;
+    }
+
+    public void setOwnEnterprise(String ownEnterprise) {
+        this.ownEnterprise = ownEnterprise;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public double getMoney() {
+        return money;
+    }
+
+    public void setMoney(double money) {
+        this.money = money;
+    }
+
+    public String getBillId() {
+        return billId;
+    }
+
+    public void setBillId(String billId) {
+        this.billId = billId;
+    }
+
+    @Override
+    public String toString() {
+        return "UpdateBillOrderActDto{" +
+                "billId='" + billId + '\'' +
+                ", id=" + id +
+                ", status=" + status +
+                ", money=" + money +
+                ", operatorEnterpriseId=" + operatorEnterpriseId +
+                ", operatorEnterprise='" + operatorEnterprise + '\'' +
+                ", ownEnterpriseId=" + ownEnterpriseId +
+                ", ownEnterprise='" + ownEnterprise + '\'' +
+                '}';
+    }
+}

+ 11 - 0
src/main/java/com/fuzamei/dto/billInfoDto.java

@@ -0,0 +1,11 @@
+package com.fuzamei.dto;
+
+/**
+ * @file_name: billInfoDto
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/4 11:12
+ * @version:
+ */
+public class billInfoDto {
+}

+ 136 - 0
src/main/java/com/fuzamei/entity/Asset.java

@@ -0,0 +1,136 @@
+package com.fuzamei.entity;
+
+/**
+ * @file_name: Asset
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/14 17:00
+ * @version:
+ */
+public class Asset {
+    private int id;
+    private String accountId;
+    private  double chinaYuan;
+    private double waitPayOrderMoney;
+    private double paidOrderMoney;
+    private double investOrderMoney;
+    private double profitOrderMoney;
+    private double financingOrderMoney;
+    private double pledgeOrderMoney;
+    private double payingOrderMoney;
+    private double useableOrderMoney;
+    private double pickPledgeOrderMoney;
+    private double pledgedToBeTakenOrderMoney;
+
+    public String getAccountId() {
+        return accountId;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public double getPayingOrderMoney() {
+        return payingOrderMoney;
+    }
+
+    public void setPayingOrderMoney(double payingOrderMoney) {
+        this.payingOrderMoney = payingOrderMoney;
+    }
+
+    public void setAccountId(String accountId) {
+        this.accountId = accountId;
+    }
+
+    public double getChinaYuan() {
+        return chinaYuan;
+    }
+
+    public void setChinaYuan(double chinaYuan) {
+        this.chinaYuan = chinaYuan;
+    }
+
+    public double getWaitPayOrderMoney() {
+        return waitPayOrderMoney;
+    }
+
+    public void setWaitPayOrderMoney(double waitPayOrderMoney) {
+        this.waitPayOrderMoney = waitPayOrderMoney;
+    }
+
+    public double getPaidOrderMoney() {
+        return paidOrderMoney;
+    }
+
+    public void setPaidOrderMoney(double paidOrderMoney) {
+        this.paidOrderMoney = paidOrderMoney;
+    }
+
+    public double getInvestOrderMoney() {
+        return investOrderMoney;
+    }
+
+    public void setInvestOrderMoney(double investOrderMoney) {
+        this.investOrderMoney = investOrderMoney;
+    }
+
+    public double getProfitOrderMoney() {
+        return profitOrderMoney;
+    }
+
+    public void setProfitOrderMoney(double profitOrderMoney) {
+        this.profitOrderMoney = profitOrderMoney;
+    }
+
+    public double getFinancingOrderMoney() {
+        return financingOrderMoney;
+    }
+
+    public void setFinancingOrderMoney(double financingOrderMoney) {
+        this.financingOrderMoney = financingOrderMoney;
+    }
+
+    public double getPledgeOrderMoney() {
+        return pledgeOrderMoney;
+    }
+
+    public void setPledgeOrderMoney(double pledgeOrderMoney) {
+        this.pledgeOrderMoney = pledgeOrderMoney;
+    }
+
+    public double getPayingOrdermoney() {
+        return payingOrderMoney;
+    }
+
+    public void setPayingOrdermoney(double playingOrdermoney) {
+        this.payingOrderMoney = playingOrdermoney;
+    }
+
+    public double getUseableOrderMoney() {
+        return useableOrderMoney;
+    }
+
+    public void setUseableOrderMoney(double useableOrderMoney) {
+        this.useableOrderMoney = useableOrderMoney;
+    }
+
+    public double getPickPledgeOrderMoney() {
+        return pickPledgeOrderMoney;
+    }
+
+    public void setPickPledgeOrderMoney(double pickPledgeOrderMoney) {
+        this.pickPledgeOrderMoney = pickPledgeOrderMoney;
+    }
+
+    public double getPledgedToBeTakenOrderMoney() {
+        return pledgedToBeTakenOrderMoney;
+    }
+
+    public void setPledgedToBeTakenOrderMoney(double pledgedToBeTakenOrderMoney) {
+        this.pledgedToBeTakenOrderMoney = pledgedToBeTakenOrderMoney;
+    }
+}

+ 232 - 0
src/main/java/com/fuzamei/entity/BillOrderAct.java

@@ -0,0 +1,232 @@
+package com.fuzamei.entity;
+
+/**
+ * @file_name: BillOrderAct
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/10 16:47
+ * @version:
+ */
+public class BillOrderAct {
+    private int id;
+    private String orderId;
+    private String operatorEnterprise;
+    private double money;
+    private double rate;
+    private String ownEnterprise;
+    private int ownCopies;
+    private String createBy;
+    private long createTime;
+    private String modifyBy;
+    private long modifyTime;
+    private int financingMoney;
+    private double financingRate;
+    private double pledgeMoney;
+    private double pledgeRate;
+    private int status;
+    private Long buyBackDate;
+    private String payEnterprise;
+    private int payEnterpriseId;
+    private int operatorEnterpriseId;
+    private int ownEnterpriseId;
+
+    public BillOrderAct(){}
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getModifyBy() {
+        return modifyBy;
+    }
+
+    public void setModifyBy(String modifyBy) {
+        this.modifyBy = modifyBy;
+    }
+
+    public long getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(long modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public double getFinancingRate() {
+        return financingRate;
+    }
+
+    public void setFinancingRate(double financingRate) {
+        this.financingRate = financingRate;
+    }
+
+    public String getPayEnterprise() {
+        return payEnterprise;
+    }
+
+    public void setPayEnterprise(String payEnterprise) {
+        this.payEnterprise = payEnterprise;
+    }
+
+    public String getOperatorEnterprise() {
+        return operatorEnterprise;
+    }
+
+    public void setOperatorEnterprise(String operatorEnterprise) {
+        this.operatorEnterprise = operatorEnterprise;
+    }
+
+    public double getMoney() {
+        return money;
+    }
+
+    public void setMoney(double money) {
+        this.money = money;
+    }
+
+    public double getRate() {
+        return rate;
+    }
+
+    public void setRate(double rate) {
+        this.rate = rate;
+    }
+
+    public int getPayEnterpriseId() {
+        return payEnterpriseId;
+    }
+
+    public void setPayEnterpriseId(int payEnterpriseId) {
+        this.payEnterpriseId = payEnterpriseId;
+    }
+
+    public int getOperatorEnterpriseId() {
+        return operatorEnterpriseId;
+    }
+
+    public void setOperatorEnterpriseId(int operatorEnterpriseId) {
+        this.operatorEnterpriseId = operatorEnterpriseId;
+    }
+
+    public int getOwnEnterpriseId() {
+        return ownEnterpriseId;
+    }
+
+    public void setOwnEnterpriseId(int ownEnterpriseId) {
+        this.ownEnterpriseId = ownEnterpriseId;
+    }
+
+    public String getOwnEnterprise() {
+        return ownEnterprise;
+    }
+
+    public void setOwnEnterprise(String ownEnterprise) {
+        this.ownEnterprise = ownEnterprise;
+    }
+
+    public int getOwnCopies() {
+        return ownCopies;
+    }
+
+    public void setOwnCopies(int ownCopies) {
+        this.ownCopies = ownCopies;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(long createTime) {
+        this.createTime = createTime;
+    }
+
+    public int getFinancingMoney() {
+        return financingMoney;
+    }
+
+    public void setFinancingMoney(int financingMoney) {
+        this.financingMoney = financingMoney;
+    }
+
+
+
+    public double getPledgeMoney() {
+        return pledgeMoney;
+    }
+
+    public void setPledgeMoney(double pledgeMoney) {
+        this.pledgeMoney = pledgeMoney;
+    }
+
+    public double getPledgeRate() {
+        return pledgeRate;
+    }
+
+    public void setPledgeRate(double pledgeRate) {
+        this.pledgeRate = pledgeRate;
+    }
+
+    public Long getBuyBackDate() {
+        return buyBackDate;
+    }
+
+    public void setBuyBackDate(Long buyBackDate) {
+        this.buyBackDate = buyBackDate;
+    }
+
+
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    @Override
+    public String toString() {
+        return "BillOrderAct{" +
+                "orderId=" + orderId +
+                ", operatorEnterprise='" + operatorEnterprise + '\'' +
+                ", money=" + money +
+                ", rate=" + rate +
+                ", ownEnterprise='" + ownEnterprise + '\'' +
+                ", ownCopies=" + ownCopies +
+                ", createBy=" + createBy +
+                ", createTime=" + createTime +
+                ", modifyBy='" + modifyBy + '\'' +
+                ", modifyTime=" + modifyTime +
+                ", financingMoney=" + financingMoney +
+                ", financingRate=" + financingRate +
+                ", pledgeMoney=" + pledgeMoney +
+                ", pledgeRate=" + pledgeRate +
+                ", status=" + status +
+                ", buyBackDate=" + buyBackDate +
+                ", payEnterprise='" + payEnterprise + '\'' +
+                '}';
+    }
+//    public static Market toMarket(BillOrderAct billOrderAct,Order order){
+//
+//    }
+}

+ 82 - 0
src/main/java/com/fuzamei/entity/Enterprise.java

@@ -0,0 +1,82 @@
+package com.fuzamei.entity;
+
+/**
+ * Created by fuzamei95 on 2018/5/14.
+ */
+public class Enterprise {
+
+
+    private String enterpriseName;
+
+    private String enterpriseAccount;
+
+    private String legalName;
+
+    private String identityID;
+
+    private String bank;
+
+    private String bankAccount;
+
+
+
+    public String getEnterpriseName() {
+        return enterpriseName;
+    }
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
+    }
+
+    public String getEnterpriseAccount() {
+        return enterpriseAccount;
+    }
+
+    public void setEnterpriseAccount(String enterpriseAccount) {
+        this.enterpriseAccount = enterpriseAccount;
+    }
+
+    public String getLegalName() {
+        return legalName;
+    }
+
+    public void setLegalName(String legalName) {
+        this.legalName = legalName;
+    }
+
+    public String getIdentityID() {
+        return identityID;
+    }
+
+    public void setIdentityID(String identityID) {
+        this.identityID = identityID;
+    }
+
+    public String getBank() {
+        return bank;
+    }
+
+    public void setBank(String bank) {
+        this.bank = bank;
+    }
+
+    public String getBankAccount() {
+        return bankAccount;
+    }
+
+    public void setBankAccount(String bankAccount) {
+        this.bankAccount = bankAccount;
+    }
+
+    @Override
+    public String toString() {
+        return "enterprise{" +
+                ", enterpriseName='" + enterpriseName + '\'' +
+                ", enterpriseAccount='" + enterpriseAccount + '\'' +
+                ", legalName='" + legalName + '\'' +
+                ", identityID='" + identityID + '\'' +
+                ", bank='" + bank + '\'' +
+                ", bankAccount='" + bankAccount + '\'' +
+                '}';
+    }
+}

+ 184 - 0
src/main/java/com/fuzamei/entity/Market.java

@@ -0,0 +1,184 @@
+package com.fuzamei.entity;
+
+
+
+public class Market extends SearchBean {
+
+    private Integer id; //市场id
+    private Integer orderId; //单据id
+    private Integer operatorEnterpriseId; //操作企业
+    private String operatorEnterprise; //操作企业
+    private String outEnterprise;   //出账企业
+    private Long deadline;   //承兑日期
+    private Double summary; //账单总额
+    private Double transferMoney;  //转让金额
+    private Double annualRate;   //年化利率
+    private Double discountRate;   //贴现利率
+    private Double discountMoney;  //贴现费
+    private Double financingMoney;    //融资金额
+    private Integer orderType;  //单据类型
+    private Integer status; //0买断 1质押
+    private Integer delistStatus;   //0已摘 1未摘
+    private Long createTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Integer orderId) {
+        this.orderId = orderId;
+    }
+
+    public Integer getOperatorEnterpriseId() {
+        return operatorEnterpriseId;
+    }
+
+    public void setOperatorEnterpriseId(Integer operatorEnterpriseId) {
+        this.operatorEnterpriseId = operatorEnterpriseId;
+    }
+
+    public String getOperatorEnterprise() {
+        return operatorEnterprise;
+    }
+
+    public void setOperatorEnterprise(String operatorEnterprise) {
+        this.operatorEnterprise = operatorEnterprise;
+    }
+
+    public String getOutEnterprise() {
+        return outEnterprise;
+    }
+
+    public void setOutEnterprise(String outEnterprise) {
+        this.outEnterprise = outEnterprise;
+    }
+
+    public Long getDeadline() {
+        return deadline;
+    }
+
+    public void setDeadline(Long deadline) {
+        this.deadline = deadline;
+    }
+
+    public Double getSummary() {
+        return summary;
+    }
+
+    public void setSummary(Double summary) {
+        this.summary = summary;
+    }
+
+    public Double getTransferMoney() {
+        return transferMoney;
+    }
+
+    public void setTransferMoney(Double transferMoney) {
+        this.transferMoney = transferMoney;
+    }
+
+    public Double getAnnualRate() {
+        return annualRate;
+    }
+
+    public void setAnnualRate(Double annualRate) {
+        this.annualRate = annualRate;
+    }
+
+    public Double getDiscountRate() {
+        return discountRate;
+    }
+
+    public void setDiscountRate(Double discountRate) {
+        this.discountRate = discountRate;
+    }
+
+    public Double getDiscountMoney() {
+        return discountMoney;
+    }
+
+    public void setDiscountMoney(Double discountMoney) {
+        this.discountMoney = discountMoney;
+    }
+
+    public Double getFinancingMoney() {
+        return financingMoney;
+    }
+
+    public void setFinancingMoney(Double financingMoney) {
+        this.financingMoney = financingMoney;
+    }
+
+    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 Integer getDelistStatus() {
+        return delistStatus;
+    }
+
+    public void setDelistStatus(Integer delistStatus) {
+        this.delistStatus = delistStatus;
+    }
+
+    public Long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
+    }
+
+    @Override
+    public String toString() {
+        return "MarketPO{" +
+                "id=" + id +
+                ", orderId=" + orderId +
+                ", operatorEnterpriseId=" + operatorEnterpriseId +
+                ", operatorEnterprise='" + operatorEnterprise + '\'' +
+                ", outEnterprise='" + outEnterprise + '\'' +
+                ", deadline=" + deadline +
+                ", summary=" + summary +
+                ", transferMoney=" + transferMoney +
+                ", annualRate=" + annualRate +
+                ", discountRate=" + discountRate +
+                ", discountMoney=" + discountMoney +
+                ", financingMoney=" + financingMoney +
+                ", orderType=" + orderType +
+                ", status=" + status +
+                ", delistStatus=" + delistStatus +
+                ", createTime=" + createTime +
+                '}';
+    }
+
+    public static Market toMarket(Order order, BillOrderAct ordersAct) {
+        Market marketPO = new Market();
+        marketPO.setOrderId(ordersAct.getId());
+        marketPO.setOperatorEnterpriseId(ordersAct.getOperatorEnterpriseId());
+        marketPO.setOperatorEnterprise(ordersAct.getOperatorEnterprise());
+        marketPO.setOutEnterprise(order.getOutEnterprise());
+        marketPO.setDeadline(order.getDeadline());
+        marketPO.setSummary(order.getSummary());
+        return marketPO;
+    }
+}

+ 133 - 0
src/main/java/com/fuzamei/entity/Order.java

@@ -0,0 +1,133 @@
+package com.fuzamei.entity;
+
+/**
+ * @file_name: Order
+ * @Description:
+ * @author: 刘林杰
+ * @date: 五月 2018/5/9 11:06
+ * @version:
+ */
+
+public class Order {
+    private int id;
+    private String orderId;
+    private String outEnterprise;
+    private int outEnterpriseId;
+    private String  inEnterprise;
+    private int inEnterpriseId;
+    private double summary;
+    private long deadline;
+    private long createTime;
+    private long outBillTime;
+    private double rate;
+
+
+    public Order() {
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getOutEnterprise() {
+        return outEnterprise;
+    }
+
+    public void setOutEnterprise(String outEnterprise) {
+        this.outEnterprise = outEnterprise;
+    }
+
+    public String getInEnterprise() {
+        return inEnterprise;
+    }
+
+    public void setInEnterprise(String inEnterprise) {
+        this.inEnterprise = inEnterprise;
+    }
+
+    public double getSummary() {
+        return summary;
+    }
+
+    public void setSummary(double summary) {
+        this.summary = summary;
+    }
+
+    public long getDeadline() {
+        return deadline;
+    }
+
+    public void setDeadline(long deadline) {
+        this.deadline = deadline;
+    }
+
+    public long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(long createTime) {
+        this.createTime = createTime;
+    }
+
+    public long getOutBillTime() {
+        return outBillTime;
+    }
+
+    public void setOutBillTime(long outBillTime) {
+        this.outBillTime = outBillTime;
+    }
+
+    public double getRate() {
+        return rate;
+    }
+
+    public void setRate(double rate) {
+        this.rate = rate;
+    }
+
+    public int getOutEnterpriseId() {
+        return outEnterpriseId;
+    }
+
+    public void setOutEnterpriseId(int outEnterpriseId) {
+        this.outEnterpriseId = outEnterpriseId;
+    }
+
+    public int getInEnterpriseId() {
+        return inEnterpriseId;
+    }
+
+    public void setInEnterpriseId(int inEnterpriseId) {
+        this.inEnterpriseId = inEnterpriseId;
+    }
+
+    @Override
+    public String toString() {
+        return "Order{" +
+                "id=" + id +
+                ", orderId='" + orderId + '\'' +
+                ", outEnterprise='" + outEnterprise + '\'' +
+                ", outEnterpriseId='" + outEnterpriseId + '\'' +
+                ", inEnterprise='" + inEnterprise + '\'' +
+                ", inEnterpriseId='" + inEnterpriseId + '\'' +
+                ", summary=" + summary +
+                ", deadline=" + deadline +
+                ", createTime=" + createTime +
+                ", outBillTime=" + outBillTime +
+                ", rate=" + rate +
+                '}';
+    }
+
+}

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott