feat 0 支付工程

payment-base-app/payment-base-app.iml

@@ -0,0 +1,194 @@
+<?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>
+        <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" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.26" level="project" />
+    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.8" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.8" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.17" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.17" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.17" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.16.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="library" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.10" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.10" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.26" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.47" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.6.RELEASE" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.springframework.boot:spring-boot-devtools:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.8" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.6.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.6.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.20" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.6.2" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.7.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
+    <orderEntry type="library" name="Maven: com.github.wechatpay-apiv3:wechatpay-apache-httpclient:0.4.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents:httpmime:4.5.8" level="project" />
+    <orderEntry type="library" name="Maven: commons-net:commons-net:3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.34.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.34.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.34.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.34.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.34.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.34.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.11" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven.plugins:maven-assembly-plugin:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.sisu:sisu-inject-plexus:1.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.sisu:sisu-inject-bean:1.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.sisu:sisu-guice:noaop:2.1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-core:3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-settings:3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-settings-builder:3.3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-builder-support:3.3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-repository-metadata:3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-model-builder:3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.maven:maven-aether-provider:3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.aether:aether-impl:1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.aether:aether-spi:1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.aether:aether-api:1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.aether:aether-util:1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-classworlds:2.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-component-annotations:1.5.5" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-sec-dispatcher:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-cipher:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-artifact:3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-model:3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven.shared:maven-common-artifact-filters:3.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven.shared:maven-shared-utils:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven.shared:maven-artifact-transfer:0.9.0" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-interpolation:1.24" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-archiver:3.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.11" level="project" />
+    <orderEntry type="library" name="Maven: org.iq80.snappy:snappy:0.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.tukaani:xz:1.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven.shared:file-management:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven.shared:maven-shared-io:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-compat:3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven.wagon:wagon-provider-api:2.10" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven.shared:maven-filtering:3.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-build-api:0.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-io:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-archiver:3.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-utils:3.0.24" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.6.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.1" level="project" />
+    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:3.4.0" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ram:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-sts:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ecs:4.2.0" level="project" />
+    <orderEntry type="library" name="Maven: io.minio:minio:8.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
+  </component>
+</module>

payment-base-app/pom.xml

@@ -11,6 +11,10 @@
 
     <artifactId>payment-base-app</artifactId>
 
+    <properties>
+        <aliyun.oss.version>3.6.0</aliyun.oss.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -74,11 +78,18 @@
             <version>2.6.2</version>
         </dependency>
 
+        <!--JWT-->
+        <dependency>
+            <groupId>com.auth0</groupId>
+            <artifactId>java-jwt</artifactId>
+            <version>3.7.0</version>
+        </dependency>
+
         <!-- 添加微信支付jar包 -->
         <dependency>
             <groupId>com.github.wechatpay-apiv3</groupId>
             <artifactId>wechatpay-apache-httpclient</artifactId>
-            <version>0.2.2</version>
+            <version>0.4.2</version>
         </dependency>
 
         <!-- ftp client -->
@@ -95,18 +106,13 @@
         </dependency>-->
 
         <!-- redis -->
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-redis</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.redisson</groupId>
-            <artifactId>redisson-spring-boot-starter</artifactId>
-            <version>3.15.1</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
@@ -119,30 +125,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-feign</artifactId>
-            <version>1.4.7.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.github.openfeign.form</groupId>
-            <artifactId>feign-form-spring</artifactId>
-            <version>3.2.2</version>
-        </dependency>
-        <dependency>
-            <groupId>io.github.openfeign.form</groupId>
-            <artifactId>feign-form</artifactId>
-            <version>3.2.2</version>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.11</version>
+            <version>4.5.12</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-codec</groupId>
@@ -151,42 +138,17 @@
             </exclusions>
         </dependency>
 
-        <!-- 和包支付使用 jar -->
+        <!-- 使用 jar -->
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
-            <version>3.0.1</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.3</version>
+            <version>3.1</version>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
             <version>2.3</version>
         </dependency>
-        <dependency>
-            <groupId>bcprov-ext-jdk15on</groupId>
-            <artifactId>bcprov-ext-jdk15on</artifactId>
-            <version>1.4.6</version>
-        </dependency>
-        <dependency>
-            <groupId>hiiposm_engine_simple</groupId>
-            <artifactId>hiiposm_engine_simple</artifactId>
-            <version>2.3.4</version>
-        </dependency>
-        <dependency>
-            <groupId>securityAPI-client</groupId>
-            <artifactId>securityAPI-client</artifactId>
-            <version>1.0.0</version>
-        </dependency>
 
         <!-- maven plugins -->
         <dependency>
@@ -194,61 +156,96 @@
             <artifactId>maven-assembly-plugin</artifactId>
             <version>3.0.0</version>
         </dependency>
+
+        <!-- aliyun oss -->
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>${aliyun.oss.version}</version>
+        </dependency>
+
+        <!-- minio -->
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+            <version>8.0.3</version>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
+    <repositories>
+        <repository>
+            <id>aliyun</id>
+            <name>aliyun Repository</name>
+            <url>http://maven.aliyun.com/nexus/content/groups/public</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>jeecg</id>
+            <name>jeecg Repository</name>
+            <url>http://maven.jeecg.org/nexus/content/repositories/jeecg</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
     <build>
+        <finalName>rbs-pay</finalName>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-            </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
                     <archive>
                         <manifest>
-                            <mainClass>com.base.app</mainClass>
+                            <!--这里要替换成jar包main方法所在类 -->
+                            <mainClass>com.base.springcloud.PaymentBaseApplication</mainClass>
                         </manifest>
+                        <manifestEntries>
+                            <Class-Path>.</Class-Path>
+                        </manifestEntries>
                     </archive>
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>
                     </descriptorRefs>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <outputDirectory>../target</outputDirectory>
                 </configuration>
-                <!--下面是为了使用 mvn package命令，如果不加则使用mvn assembly-->
                 <executions>
                     <execution>
-                        <id>make-assemble</id>
-                        <phase>package</phase>
+                        <id>make-assembly</id> <!-- this is used for inheritance merges -->
+                        <phase>package</phase> <!-- 指定在打包节点执行jar包合并操作 -->
                         <goals>
                             <goal>single</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <fork>true</fork>
+                    <mainClass>com.base.springcloud.PaymentBaseApplication</mainClass>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
-
-    <repositories>
-        <repository>
-            <id>maven-public</id>
-            <name>maven-public</name>
-            <url>http://maven.hnrr.com.cn/repository/maven-public/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-    <distributionManagement>
-        <repository>
-            <id>nexus-releases</id>
-            <name>maven-releases</name>
-            <url>http://maven.hnrr.com.cn/repository/maven-releases/</url>
-        </repository>
-        <snapshotRepository>
-            <id>nexus-snapshots</id>
-            <name>maven-snapshots</name>
-            <url>http://maven.hnrr.com.cn/repository/maven-snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
 </project>

payment-base-app/src/main/java/com/base/springcloud/aspect/annotation/LoginRequired.java

@@ -0,0 +1,17 @@
+package com.base.springcloud.aspect.annotation;
+
+import java.lang.annotation.*;
+
+@Target(ElementType.METHOD)
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+public @interface LoginRequired {
+	// 用户信息
+	boolean user() default true;
+
+	// 部门 ture - 获取部门信息
+	boolean department() default false;
+
+	// 公司 ture - 获取公司信息
+	boolean company() default false;
+}

payment-base-app/src/main/java/com/base/springcloud/aspect/annotation/Rlock.java

@@ -1,42 +0,0 @@
-package com.base.springcloud.aspect.annotation;
-
-import java.lang.annotation.*;
-import java.util.concurrent.TimeUnit;
-
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-public @interface Rlock {
-
-	/**
-	 * 分布式锁的key前缀
-	 */
-	String prefix() default "redisLockPrefix::";
-
-	/**
-	 * 分布式锁的key动态参数
-	 */
-	String suffix() default "lockDynamicKey";
-
-	/**
-	 * 等待时间 默认五秒
-	 *
-	 * @return
-	 */
-	long waitTime() default 5;
-
-	/**
-	 * 锁释放时间 默认十秒
-	 *
-	 * @return
-	 */
-	long leaseTime() default 10;
-
-	/**
-	 * 时间格式 默认：秒
-	 *
-	 * @return
-	 */
-	TimeUnit timeUnit() default TimeUnit.SECONDS;
-}

payment-base-app/src/main/java/com/base/springcloud/aspect/aspect/RlockAspect.java

@@ -1,118 +0,0 @@
-package com.base.springcloud.aspect.aspect;
-
-import com.base.springcloud.aspect.annotation.Rlock;
-import com.base.springcloud.handle.RBSQueueHandler;
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.redisson.api.RLock;
-import org.redisson.api.RedissonClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.DefaultParameterNameDiscoverer;
-import org.springframework.expression.EvaluationContext;
-import org.springframework.expression.Expression;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.expression.spel.support.StandardEvaluationContext;
-import org.springframework.stereotype.Component;
-
-import java.lang.reflect.Method;
-
-@Aspect
-@Component
-@Slf4j
-public class RlockAspect {
-
-	Logger logger = LoggerFactory.getLogger(RBSQueueHandler.class);
-
-	@Autowired
-	private RedissonClient redissonClient;
-
-	/**
-	 * 用于SpEL表达式解析.
-	 */
-	private SpelExpressionParser parser = new SpelExpressionParser();
-	/**
-	 * 用于获取方法参数定义名字.
-	 */
-	private DefaultParameterNameDiscoverer nameDiscoverer = new DefaultParameterNameDiscoverer();
-
-
-
-	@Pointcut("@annotation(com.base.springcloud.aspect.annotation.Rlock)")
-	public void RlockAspect() {
-	}
-
-	@Around("RlockAspect()")
-	public Object arround(ProceedingJoinPoint proceedingJoinPoint) throws Throwable {
-		Object object = null;
-		RLock lock = null;
-		try {
-			// 获取注解信息
-			Rlock rlockInfo = getRlockInfo(proceedingJoinPoint);
-			String key = getLocalKey(proceedingJoinPoint, rlockInfo);
-			// 根据名字获取锁实例
-			lock = redissonClient.getLock(key);
-			if (lock != null) {
-				final boolean status = lock.tryLock(rlockInfo.waitTime(), rlockInfo.leaseTime(), rlockInfo.timeUnit());
-				if (status) {
-					logger.info("锁获取成功,加锁成功 : {}........",key);
-					object = proceedingJoinPoint.proceed();
-				} else {
-					logger.info("锁被占用,加锁失败 : {} .........",key);
-					throw new RuntimeException("加锁失败");
-				}
-			}
-		} finally {
-			// 方法执行完成释放锁
-			if (lock != null && lock.isHeldByCurrentThread()) {
-				lock.unlock();
-			}
-		}
-		return object;
-	}
-
-	public Rlock getRlockInfo(ProceedingJoinPoint proceedingJoinPoint) {
-		MethodSignature methodSignature = (MethodSignature) proceedingJoinPoint.getSignature();
-		return methodSignature.getMethod().getAnnotation(Rlock.class);
-	}
-
-	/**
-	 * @param proceedingJoinPoint
-	 * @return
-	 */
-	public String getLocalKey(ProceedingJoinPoint proceedingJoinPoint, Rlock rlockInfo) {
-		StringBuilder localKey = new StringBuilder();
-		//获取注解参数值
-		String prefix = rlockInfo.prefix();
-		String spELString = rlockInfo.suffix();
-		String key = generateKeyBySpEL(spELString,proceedingJoinPoint);
-		localKey.append(prefix).append(key);
-		logger.info("加锁 key :{}",localKey.toString());
-		return localKey.toString();
-	}
-
-	public String generateKeyBySpEL(String spELString, ProceedingJoinPoint joinPoint) {
-		// 通过joinPoint获取被注解方法
-		MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
-		Method method = methodSignature.getMethod();
-		// 使用spring的DefaultParameterNameDiscoverer获取方法形参名数组
-		String[] paramNames = nameDiscoverer.getParameterNames(method);
-		// 解析过后的Spring表达式对象
-		Expression expression = parser.parseExpression(spELString);
-		// spring的表达式上下文对象
-		EvaluationContext context = new StandardEvaluationContext();
-		// 通过joinPoint获取被注解方法的形参
-		Object[] args = joinPoint.getArgs();
-		// 给上下文赋值
-		for(int i = 0 ; i < args.length ; i++) {
-			context.setVariable(paramNames[i], args[i]);
-		}
-		// 表达式从上下文中计算出实际参数值
-		return expression.getValue(context).toString();
-	}
-}

payment-base-app/src/main/java/com/base/springcloud/aspect/config/JimuMinioConfig.java

@@ -0,0 +1,172 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by Fernflower decompiler)
+//
+
+package com.base.springcloud.aspect.config;
+
+import com.base.springcloud.util.MinioUtil;
+import com.base.springcloud.util.oConvertUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+@Component("jimuMinioConfig")
+@ConfigurationProperties(
+        prefix = "jeecg.minio"
+)
+@ConditionalOnProperty(
+        value = {"jeecg.uploadType"},
+        havingValue = "minio",
+        matchIfMissing = true
+)
+public class JimuMinioConfig {
+    private static final Logger log = LoggerFactory.getLogger(JimuMinioConfig.class);
+    private String minioUrl;
+    private String minioName;
+    private String minioPass;
+    private String bucketName;
+
+    @Bean
+    public JimuMinioConfig initJimuMinio() {
+        if (oConvertUtils.isNotEmpty(this.minioUrl)) {
+            if (!this.minioUrl.startsWith("http")) {
+                this.minioUrl = "http://" + this.minioUrl;
+            }
+
+            if (!this.minioUrl.endsWith("/")) {
+                this.minioUrl = this.minioUrl.concat("/");
+            }
+        }
+
+        try {
+            MinioUtil.setMinioUrl(this.minioUrl);
+            MinioUtil.setMinioName(this.minioName);
+            MinioUtil.setMinioPass(this.minioPass);
+            MinioUtil.setBucketName(this.bucketName);
+        } catch (NoClassDefFoundError var2) {
+            log.error("[JimuReport] 加载上传配置失败，Minio版本不匹配，请升级Minio依赖到8.0.3+", var2);
+        }
+
+        return new JimuMinioConfig();
+    }
+
+    public JimuMinioConfig() {
+    }
+
+    public String getMinioUrl() {
+        return this.minioUrl;
+    }
+
+    public String getMinioName() {
+        return this.minioName;
+    }
+
+    public String getMinioPass() {
+        return this.minioPass;
+    }
+
+    public String getBucketName() {
+        return this.bucketName;
+    }
+
+    public void setMinioUrl(String minioUrl) {
+        this.minioUrl = minioUrl;
+    }
+
+    public void setMinioName(String minioName) {
+        this.minioName = minioName;
+    }
+
+    public void setMinioPass(String minioPass) {
+        this.minioPass = minioPass;
+    }
+
+    public void setBucketName(String bucketName) {
+        this.bucketName = bucketName;
+    }
+
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (!(o instanceof JimuMinioConfig)) {
+            return false;
+        } else {
+            JimuMinioConfig var2 = (JimuMinioConfig)o;
+            if (!var2.canEqual(this)) {
+                return false;
+            } else {
+                label59: {
+                    String var3 = this.getMinioUrl();
+                    String var4 = var2.getMinioUrl();
+                    if (var3 == null) {
+                        if (var4 == null) {
+                            break label59;
+                        }
+                    } else if (var3.equals(var4)) {
+                        break label59;
+                    }
+
+                    return false;
+                }
+
+                String var5 = this.getMinioName();
+                String var6 = var2.getMinioName();
+                if (var5 == null) {
+                    if (var6 != null) {
+                        return false;
+                    }
+                } else if (!var5.equals(var6)) {
+                    return false;
+                }
+
+                String var7 = this.getMinioPass();
+                String var8 = var2.getMinioPass();
+                if (var7 == null) {
+                    if (var8 != null) {
+                        return false;
+                    }
+                } else if (!var7.equals(var8)) {
+                    return false;
+                }
+
+                String var9 = this.getBucketName();
+                String var10 = var2.getBucketName();
+                if (var9 == null) {
+                    if (var10 != null) {
+                        return false;
+                    }
+                } else if (!var9.equals(var10)) {
+                    return false;
+                }
+
+                return true;
+            }
+        }
+    }
+
+    protected boolean canEqual(Object other) {
+        return other instanceof JimuMinioConfig;
+    }
+
+    public int hashCode() {
+        boolean var1 = true;
+        byte var2 = 1;
+        String var3 = this.getMinioUrl();
+        int var7 = var2 * 59 + (var3 == null ? 43 : var3.hashCode());
+        String var4 = this.getMinioName();
+        var7 = var7 * 59 + (var4 == null ? 43 : var4.hashCode());
+        String var5 = this.getMinioPass();
+        var7 = var7 * 59 + (var5 == null ? 43 : var5.hashCode());
+        String var6 = this.getBucketName();
+        var7 = var7 * 59 + (var6 == null ? 43 : var6.hashCode());
+        return var7;
+    }
+
+    public String toString() {
+        return "JimuMinioConfig(minioUrl=" + this.getMinioUrl() + ", minioName=" + this.getMinioName() + ", minioPass=" + this.getMinioPass() + ", bucketName=" + this.getBucketName() + ")";
+    }
+}

payment-base-app/src/main/java/com/base/springcloud/aspect/config/JimuOssConfiguration.java

@@ -0,0 +1,179 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by Fernflower decompiler)
+//
+
+package com.base.springcloud.aspect.config;
+
+import com.base.springcloud.util.OssBootUtil;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+@Component("jimuOssConfiguration")
+@ConfigurationProperties(
+        prefix = "jeecg.oss"
+)
+@ConditionalOnProperty(
+        value = {"jeecg.uploadType"},
+        havingValue = "alioss",
+        matchIfMissing = true
+)
+public class JimuOssConfiguration {
+    private String endpoint;
+    private String accessKey;
+    private String secretKey;
+    private String bucketName;
+    private String staticDomain;
+
+    @Bean
+    public OssBootUtil initJimuOssBootConfiguration() {
+        OssBootUtil.setEndPoint(this.endpoint);
+        OssBootUtil.setAccessKeyId(this.accessKey);
+        OssBootUtil.setAccessKeySecret(this.secretKey);
+        OssBootUtil.setBucketName(this.bucketName);
+        OssBootUtil.setStaticDomain(this.staticDomain);
+        return new OssBootUtil();
+    }
+
+    public JimuOssConfiguration() {
+    }
+
+    public String getEndpoint() {
+        return this.endpoint;
+    }
+
+    public String getAccessKey() {
+        return this.accessKey;
+    }
+
+    public String getSecretKey() {
+        return this.secretKey;
+    }
+
+    public String getBucketName() {
+        return this.bucketName;
+    }
+
+    public String getStaticDomain() {
+        return this.staticDomain;
+    }
+
+    public void setEndpoint(String endpoint) {
+        this.endpoint = endpoint;
+    }
+
+    public void setAccessKey(String accessKey) {
+        this.accessKey = accessKey;
+    }
+
+    public void setSecretKey(String secretKey) {
+        this.secretKey = secretKey;
+    }
+
+    public void setBucketName(String bucketName) {
+        this.bucketName = bucketName;
+    }
+
+    public void setStaticDomain(String staticDomain) {
+        this.staticDomain = staticDomain;
+    }
+
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (!(o instanceof JimuOssConfiguration)) {
+            return false;
+        } else {
+            JimuOssConfiguration var2 = (JimuOssConfiguration)o;
+            if (!var2.canEqual(this)) {
+                return false;
+            } else {
+                label71: {
+                    String var3 = this.getEndpoint();
+                    String var4 = var2.getEndpoint();
+                    if (var3 == null) {
+                        if (var4 == null) {
+                            break label71;
+                        }
+                    } else if (var3.equals(var4)) {
+                        break label71;
+                    }
+
+                    return false;
+                }
+
+                String var5 = this.getAccessKey();
+                String var6 = var2.getAccessKey();
+                if (var5 == null) {
+                    if (var6 != null) {
+                        return false;
+                    }
+                } else if (!var5.equals(var6)) {
+                    return false;
+                }
+
+                label57: {
+                    String var7 = this.getSecretKey();
+                    String var8 = var2.getSecretKey();
+                    if (var7 == null) {
+                        if (var8 == null) {
+                            break label57;
+                        }
+                    } else if (var7.equals(var8)) {
+                        break label57;
+                    }
+
+                    return false;
+                }
+
+                String var9 = this.getBucketName();
+                String var10 = var2.getBucketName();
+                if (var9 == null) {
+                    if (var10 != null) {
+                        return false;
+                    }
+                } else if (!var9.equals(var10)) {
+                    return false;
+                }
+
+                String var11 = this.getStaticDomain();
+                String var12 = var2.getStaticDomain();
+                if (var11 == null) {
+                    if (var12 == null) {
+                        return true;
+                    }
+                } else if (var11.equals(var12)) {
+                    return true;
+                }
+
+                return false;
+            }
+        }
+    }
+
+    protected boolean canEqual(Object other) {
+        return other instanceof JimuOssConfiguration;
+    }
+
+    public int hashCode() {
+        boolean var1 = true;
+        byte var2 = 1;
+        String var3 = this.getEndpoint();
+        int var8 = var2 * 59 + (var3 == null ? 43 : var3.hashCode());
+        String var4 = this.getAccessKey();
+        var8 = var8 * 59 + (var4 == null ? 43 : var4.hashCode());
+        String var5 = this.getSecretKey();
+        var8 = var8 * 59 + (var5 == null ? 43 : var5.hashCode());
+        String var6 = this.getBucketName();
+        var8 = var8 * 59 + (var6 == null ? 43 : var6.hashCode());
+        String var7 = this.getStaticDomain();
+        var8 = var8 * 59 + (var7 == null ? 43 : var7.hashCode());
+        return var8;
+    }
+
+    public String toString() {
+        return "JimuOssConfiguration(endpoint=" + this.getEndpoint() + ", accessKey=" + this.getAccessKey() + ", secretKey=" + this.getSecretKey() + ", bucketName=" + this.getBucketName() + ", staticDomain=" + this.getStaticDomain() + ")";
+    }
+}

payment-base-app/src/main/java/com/base/springcloud/aspect/config/PayConfigurer.java

@@ -0,0 +1,27 @@
+package com.base.springcloud.aspect.config;
+
+import com.base.springcloud.aspect.interceptor.PayInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Component
+public class PayConfigurer implements WebMvcConfigurer {
+
+	@Autowired
+	private PayInterceptor payInterceptor;
+
+	// 拦截器请求 ：'/merchant/**','/payment/**'
+	@Override
+	public void addInterceptors(InterceptorRegistry registry){
+		registry.addInterceptor(payInterceptor).addPathPatterns("/merchant/**","/payment/**");
+	}
+
+	// 跨域配置
+	@Override
+	public void addCorsMappings(CorsRegistry registry) {
+		registry.addMapping("/**").allowCredentials(true).allowedOrigins("*").allowedMethods("GET", "PUT", "DELETE", "POST", "OPTIONS").maxAge(3600);
+	}
+}

payment-base-app/src/main/java/com/base/springcloud/aspect/config/RedisConfig.java

@@ -0,0 +1,51 @@
+package com.base.springcloud.aspect.config;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper.DefaultTyping;
+import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+import javax.annotation.Resource;
+
+@Configuration
+@EnableCaching // 开启缓存支持
+public class RedisConfig extends CachingConfigurerSupport {
+
+	@Resource
+	private LettuceConnectionFactory lettuceConnectionFactory;
+
+	/**
+	 * RedisTemplate配置
+	 *
+	 * @param lettuceConnectionFactory
+	 * @return
+	 */
+	@Bean
+	public RedisTemplate<String, Object> redisTemplate(LettuceConnectionFactory lettuceConnectionFactory) {
+		// 设置序列化
+		Jackson2JsonRedisSerializer<Object> jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer<Object>(Object.class);
+		ObjectMapper om = new ObjectMapper();
+		om.setVisibility(PropertyAccessor.ALL, Visibility.ANY);
+		om.enableDefaultTyping(DefaultTyping.NON_FINAL);
+		jackson2JsonRedisSerializer.setObjectMapper(om);
+		// 配置redisTemplate
+		RedisTemplate<String, Object> redisTemplate = new RedisTemplate<String, Object>();
+		redisTemplate.setConnectionFactory(lettuceConnectionFactory);
+		RedisSerializer<?> stringSerializer = new StringRedisSerializer();
+		redisTemplate.setKeySerializer(stringSerializer);// key序列化
+		redisTemplate.setValueSerializer(jackson2JsonRedisSerializer);// value序列化
+		redisTemplate.setHashKeySerializer(stringSerializer);// Hash key序列化
+		redisTemplate.setHashValueSerializer(jackson2JsonRedisSerializer);// Hash value序列化
+		redisTemplate.afterPropertiesSet();
+		return redisTemplate;
+	}
+}

payment-base-app/src/main/java/com/base/springcloud/aspect/interceptor/PayInterceptor.java

@@ -0,0 +1,58 @@
+package com.base.springcloud.aspect.interceptor;
+
+import com.base.springcloud.aspect.annotation.LoginRequired;
+import com.base.springcloud.entity.User;
+import com.base.springcloud.util.TokenUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.lang.Nullable;
+import org.springframework.stereotype.Component;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Component
+public class PayInterceptor implements HandlerInterceptor {
+
+	@Autowired
+	private TokenUtils tokenUtils;
+
+	// 在业务处理器处理请求之前被调用
+	@Override
+	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+		LoginRequired loginRequired;
+		// 根据注解拦截请求
+		if (handler instanceof HandlerMethod)
+			loginRequired = ((HandlerMethod)handler).getMethodAnnotation(LoginRequired.class);
+		else
+			return true;
+		// 说明此方法没有LoginRequired注解
+		if (loginRequired == null)
+			return true;
+		// token数据验证
+		User user = tokenUtils.verifyToken(request);
+		// 用户信息
+		if(loginRequired.user())
+			tokenUtils.userInfo(request,user.getId());
+		// 部门信息获取
+		if(loginRequired.department())
+			tokenUtils.departmentInfo(request,user.getId());
+		// 公司信息获取
+		if(loginRequired.company())
+			tokenUtils.companyInfo(request,user.getCtCompanyId());
+		return true;
+	}
+
+	// 在业务处理器处理请求执行完成后
+	@Override
+	public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, @Nullable ModelAndView modelAndView){
+
+	};
+
+	// 在DispatcherServlet完全处理完请求后被调用
+	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, @Nullable Exception ex){
+
+	}
+}

payment-base-app/src/main/java/com/base/springcloud/base/MchConfigEntity.java

@@ -0,0 +1,22 @@
+package com.base.springcloud.base;
+
+import lombok.Data;
+
+@Data
+public class MchConfigEntity {
+
+	// 商户编号
+	private String mchId;
+
+	// 商户私钥
+	private String mchPrivateKey;
+
+	// 微信平台证书
+	private String certificate;
+
+	// 证书序列号
+	private String serialNo;
+
+	// 公众号Id
+	private String appId;
+}

payment-base-app/src/main/java/com/base/springcloud/bo/CodePayBO.java

@@ -0,0 +1,32 @@
+package com.base.springcloud.bo;
+
+import com.base.springcloud.base.MchConfigEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class CodePayBO extends MchConfigEntity implements Serializable {
+
+	// 商品描述
+	private String body;
+
+	// 附加数据
+	private String attach;
+
+	// 订单号
+	private String orderNo;
+
+	// 订单金额
+	private BigDecimal amount;
+
+	// 微信付款码
+	private String authCode;
+
+	// 设备号
+	private String deviceInfo;
+
+	// 终端IP
+	private String spbillCreateIp;
+}

payment-base-app/src/main/java/com/base/springcloud/bo/DepartBO.java

@@ -0,0 +1,18 @@
+package com.base.springcloud.bo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DepartBO {
+
+	// 创建人Id
+	private String createId;
+
+	// 商户支付配置Id
+	private String merchantConfigureId;
+
+	// 部门id集合
+	private List<String> departIdList;
+}

payment-base-app/src/main/java/com/base/springcloud/bo/MerchantConfigBO.java

@@ -4,6 +4,7 @@ import lombok.Data;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
+import java.util.List;
 
 @Data
 public class MerchantConfigBO {
@@ -37,4 +38,24 @@ public class MerchantConfigBO {
 	 * 支付证书文件
 	 */
 	private MultipartFile certFile;
+
+	/**
+	 * 创建人
+	 */
+	private String createId;
+
+	/**
+	 * 部门List
+	 */
+	private List<String> departIdList;
+
+	/**
+	 * 公司Id
+	 */
+	private String companyId;
+
+	/**
+	 * 证书
+	 */
+	private String certificate;
 }

payment-base-app/src/main/java/com/base/springcloud/bo/OrderBO.java

@@ -1,25 +1,37 @@
 package com.base.springcloud.bo;
 
+import com.base.springcloud.base.MchConfigEntity;
 import com.base.springcloud.entity.Order;
 import com.base.springcloud.entity.SaleBill;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
 
 @Data
-public class OrderBO implements Serializable {
+public class OrderBO extends MchConfigEntity implements Serializable {
 
-	// 商户编号
-	private String mchId;
+	// 创建人ID
+	private String createId;
 
-	// 商户私钥
-	private String mchPrivateKey;
+	// 是否合并销售单据标志
+	private Boolean mergeFlag;
 
-	// 销售单据号
-	private String billNo;
+	// 销售单据号：可用逗号分隔
+	private String billIds;
+
+	// 销售单据编号List
+	private List<String> billIdList;
+
+	// 子销售单据编号List
+	private List<String> childIdList;
+
+	// 订单金额
+	private BigDecimal amount;
 
 	// 销售单
-	private SaleBill saleBill;
+	private List<SaleBill> saleBillList;
 
 	// 支付订单
 	private Order order;

payment-base-app/src/main/java/com/base/springcloud/bo/RefundBO.java

@@ -0,0 +1,40 @@
+package com.base.springcloud.bo;
+
+import com.base.springcloud.base.MchConfigEntity;
+import com.base.springcloud.entity.Order;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class RefundBO extends MchConfigEntity implements Serializable {
+
+	// 退款订单Id
+	private String refundId;
+
+	// 创建人
+	private String createId;
+
+	// 退款单据编号
+	private String billId;
+
+	// 原订单编号
+	private String origOrderNo;
+
+	// 原订单创建时间
+	private Date origCreateTime;
+
+	// 退款订单号
+	private String refundNo;
+
+	// 退款原因
+	private String reason;
+
+	// 退款金额
+	private BigDecimal refundAmount;
+
+	// 退款通知地址
+	private String notifyUrl;
+}

payment-base-app/src/main/java/com/base/springcloud/bo/SaleBillBO.java

@@ -0,0 +1,13 @@
+package com.base.springcloud.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class SaleBillBO {
+
+	private String id;
+
+	private BigDecimal payAmount;
+}

payment-base-app/src/main/java/com/base/springcloud/client/PaymentClient.java

@@ -1,14 +0,0 @@
-package com.base.springcloud.client;
-
-import com.base.springcloud.base.CommonResult;
-import com.base.springcloud.dto.MerchantConfigReqDTO;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-@FeignClient(value = "payment-service-client")
-public interface PaymentClient {
-
-	@PostMapping(value = "/merchant/merchantConfig")
-	CommonResult paymentConfigure(@RequestBody MerchantConfigReqDTO merchantConfigDTO);
-}

payment-base-app/src/main/java/com/base/springcloud/constant/ErrorConstant.java

@@ -2,8 +2,35 @@ package com.base.springcloud.constant;
 
 public enum ErrorConstant {
 
-	SUECCESS("RBS00000","交易成功"),
-	NULL_OBJ("RBS00001","参数异常");
+	SUECCESS("RBS00000","交易成功！"),
+	INVALID_TOKEN("RBS00001","无效TOKEN！"),
+	ILLEGAL_TOKEN("RBS00002","非法TOKEN！"),
+	NULL_OBJ("RBS00003","参数异常！"),
+	MCH_ID_PARAM_ERR("RBS00004","商户支付配置异常！"),
+	BILL_AMOUNT_ERR("RBS00005","销售单合计结算金额异常！"),
+	BILL_INVALID("RBS00006","无效销售单据！"),
+	BILL_WRITE_OFF_FAIL("RBS00007","销售单据核销失败！"),
+	USER_ERROR("RBS00008","请核对用户信息！"),
+	USER_LOCKING("RBS00009","账号已被锁定,请联系管理员!"),
+	TOKEN_EXPIRATION_DATE("RBS00010","TOKEN已失效，请重新登录！"),
+	MERCHANT_CONFIGURE_FAIL("RBS00011","商户支付信息配置失败！"),
+	MERCHANT_CONFIGURE_UPD_FAIL("RBS00012","商户支付信息修改失败！"),
+	MERCHANT_CONFIGURE_DEL_FAIL("RBS00013","商户支付信息删除失败！"),
+	MERCHANT_CONFIGURE_INVALID("RBS00014","无效商户支付信息配置修改！"),
+	USER_DEPART_RELATION_NEED("RBS00015","请用户先关联部门信息！"),
+	SAVE_PAY_DEPART_CONFIG_FAIL("RBS00016","添加部门商户支付配置信息失败！"),
+	SALE_BILL_INVALID("RBS00017","无有效销售单据！"),
+	MERCHANT_PAY_CERT_READ_FAIL("RBS00018","支付证书读取失败！"),
+	PAY_ORDER_NOT_FOUND("RBS00019","无有效支付订单！"),
+	ORDER_STATE_NOT_SUPPORT_REFUND("RBS00020","订单状态不支持退款！"),
+	REGISTER_REFUND_FAIL("RBS00021","退款订单登记失败！"),
+	SYNC_WEC_REFUND_STATE_FAIL("RBS00022","同步微信退款状态失败！"),
+	BILL_COMPLETE_PAYMENT("RBS00023","销售单据已完成付款！"),
+	ALL_BILL_COMPLETE_PAYMENT("RBS00024","所有销售单据已完成付款！"),
+	MISTAKE_TARGET("RBS00025","要提供的对象不是数组！"),
+	SUPER_REFUND_ORDER_COUNT_FAIL("RBS00026","退款订单次数累计失败!"),
+	SUPER_PAY_ORDER_COUNT_FAIL("RBS00027","支付订单次数累计失败!"),
+	ORDER_SYNC_FAIL("RBS00027","订单信息同步失败!");
 
 	private String code;
 	private String message;

payment-base-app/src/main/java/com/base/springcloud/constant/PaymentConstant.java

@@ -2,29 +2,33 @@ package com.base.springcloud.constant;
 
 public interface PaymentConstant {
 
-	String CHARACTER_SET = "00";   					// 字符集默认 : 00 - GBK
-	String CALLBACK_URL = "www.baidu.com"; 			// 页面通知地址
-	String NOTIFY_URL = "www.baidu.com";			// 后台通知地址
-	String SIGN_TYPE = "RSA";						// 签名类型
 
+	String TOKEN_PREFIX = "prefix_user_token_";		// TOKEN前缀
+	String MECHANT_CERTIFICATE_SAVE_PATH = "merchant/paymentConfigure"; // 商户证书保存路径
+	String SLASH = "/";								// 斜杆
 	String WAIT 	= "W";							// 等待付款
-	String SUECCESS = "S";							// 支付成功
-	String REFUND 	= "R";							// 退款成功
-	String CANCLE 	= "C";							// 撤销
-
-	String WEC = "WEC";								// 微信
-	String QRCWC  = "QRCWC";
-
-	String AL = "AL";								// 支付宝
-	String QRCAL = "QRCAL";
-
-	String CP = "CP";								// 云闪付
-	String QRCCP  = "QRCCP";
+	String SUCCESS 	= "S";							// 支付完成
+	String WX_SUCCESS = "SUCCESS";					// 微信支付成功状态
 
 	String NATIVE = "Native";						// Native支付
 	String H5 = "H5";								// H5支付
 	String JSAPI = "Jsapi";							// JSAPI支付
 
-	String ORDER_QUEUE = "order_queue";				// 订单队列
+
+	Integer REFUND_WAIT = 0;						// 等待退款
+	Integer REFUND_SUCCESS = 1;						// 完成退款
+	Integer REFUND_PART = 2;						// 部分退款
+	Integer START_REFUND_COUNT = 1;					// 退款起始次数
+	Integer END_REFUND_COUNT = 6;					// 退款结束次数
+
 	String ORDER_LOCK_PREFIX = "ORDER_KEY:";		// 订单锁前缀
+	String DEFAULT_MCH_ID = "1537100771";			// 默认商户ID
+
+	String PAY_ORDER = "PAY";						// 支付订单
+	String REFUND_ORDER = "REFUND";					// 退款订单
+
+	// 微信订单查询请求地址
+	String WX_ORDER_PAY_URL = "https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/";
+	String WX_ORDER_REFUND_URL = "https://api.mch.weixin.qq.com/v3/refund/domestic/refunds/";
+
 }

payment-base-app/src/main/java/com/base/springcloud/constant/RedisConfig.java

@@ -1,58 +0,0 @@
-package com.base.springcloud.constant;
-
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.redisson.Redisson;
-import org.redisson.config.Config;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cache.annotation.CachingConfigurerSupport;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-
-@Configuration
-@EnableCaching
-public class RedisConfig extends CachingConfigurerSupport {
-
-	@Value("${spring.redis.host}")
-	private String host;
-
-	@Value("${spring.redis.port}")
-	private String port;
-
-	@Value("${spring.redis.password}")
-	private String password;
-
-	@Bean
-	@SuppressWarnings(value = {"unchecked", "rawtypes"})
-	public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
-		RedisTemplate<Object, Object> template = new RedisTemplate<>();
-		template.setConnectionFactory(redisConnectionFactory);
-
-		FastJson2JsonRedisSerializer serializer = new FastJson2JsonRedisSerializer(Object.class);
-
-		ObjectMapper mapper = new ObjectMapper();
-		mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
-		mapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
-		serializer.setObjectMapper(mapper);
-
-		template.setValueSerializer(serializer);
-		// 使用StringRedisSerializer来序列化和反序列化redis的key值
-		template.setKeySerializer(new StringRedisSerializer());
-		template.afterPropertiesSet();
-		return template;
-	}
-
-	@Bean
-	public Redisson redisson() {
-		Config config = new Config();
-		config.useSingleServer().setAddress("redis://" + host + ":" + port);
-		config.useSingleServer().setPassword(password);
-		return (Redisson) Redisson.create(config);
-	}
-}

payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java

@@ -1,5 +1,6 @@
 package com.base.springcloud.controller;
 
+import com.base.springcloud.aspect.annotation.LoginRequired;
 import com.base.springcloud.base.CommonResult;
 import com.base.springcloud.bo.MerchantConfigBO;
 import com.base.springcloud.constant.ErrorConstant;
@@ -13,6 +14,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -27,9 +29,16 @@ public class MerchantController {
 
 	@ApiOperation(value = "商户支付信息配置", notes = "商户信息配置新增接口")
 	@PostMapping("/merchantConfig")
-	public CommonResult paymentConfigure(MerchantConfigReqDTO merchantConfigDTO) {
+	@LoginRequired(department = true,company = true)
+	public CommonResult paymentConfigure(MerchantConfigReqDTO merchantConfigDTO, HttpServletRequest request) {
+		List<String> departIdList = (List<String>) request.getAttribute("departIdList");
+		String companyId = (String) request.getAttribute("companyId");
+		String createId = (String) request.getAttribute("createId");
 		MerchantConfigBO merchantConfigBO = new MerchantConfigBO();
 		BeanUtils.copyProperties(merchantConfigDTO, merchantConfigBO);
+		merchantConfigBO.setDepartIdList(departIdList);
+		merchantConfigBO.setCompanyId(companyId);
+		merchantConfigBO.setCreateId(createId);
 		merchantService.paymentConfigure(merchantConfigBO);
 		return new CommonResult(ErrorConstant.SUECCESS.getCode(), ErrorConstant.SUECCESS.getMessage(), null);
 	}

payment-base-app/src/main/java/com/base/springcloud/controller/NoticeController.java

@@ -2,6 +2,8 @@ package com.base.springcloud.controller;
 
 import com.base.springcloud.dto.NoticeReqDTO;
 import com.base.springcloud.dto.NoticeRspDTO;
+import com.base.springcloud.dto.RefundNoticeReqDTO;
+import com.base.springcloud.dto.RefundNoticeRspDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -23,4 +25,11 @@ public class NoticeController {
 
 		return new NoticeRspDTO();
 	}
+
+	@ApiOperation(value = "退款通知", notes = "退款结果通知接口")
+	@PostMapping("/returnNotice")
+	public RefundNoticeRspDTO returnNotice(@RequestBody RefundNoticeReqDTO noticeReqDTO) {
+
+		return new RefundNoticeRspDTO();
+	}
 }

payment-base-app/src/main/java/com/base/springcloud/controller/PaymentController.java

@@ -1,13 +1,14 @@
 package com.base.springcloud.controller;
 
+import com.base.springcloud.aspect.annotation.LoginRequired;
 import com.base.springcloud.base.CommonResult;
 import com.base.springcloud.base.ReportResult;
 import com.base.springcloud.bo.OrderBO;
+import com.base.springcloud.bo.RefundBO;
 import com.base.springcloud.constant.ErrorConstant;
-import com.base.springcloud.dto.NativePlaceOrderDTO;
-import com.base.springcloud.entity.Order;
 import com.base.springcloud.service.PaymentService;
-import com.base.springcloud.util.DateUtil;
+import com.base.springcloud.service.RefundService;
+import com.base.springcloud.util.ParameterUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -17,9 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 @RestController
@@ -28,20 +27,41 @@ import java.util.List;
 @RequestMapping("/payment")
 public class PaymentController {
 
+	@Autowired
+	private ParameterUtil parameterUtil;
+
 	@Autowired
 	private PaymentService paymentService;
 
+	@Autowired
+	private RefundService refundService;
+
 	@ApiOperation(value = "native下单", notes = "微信native下单")
+	@LoginRequired(department=true)
 	@GetMapping("/nativePlaceOrder")
-	public ReportResult nativePlaceOrder(@RequestParam String salesBill,@RequestParam String mchId) {
-		OrderBO orderBO = new OrderBO();
-		orderBO.setBillNo(salesBill);
-		orderBO.setMchId(mchId);
+	public ReportResult nativePlaceOrder(@RequestParam String salesBillId, HttpServletRequest request) {
+		String createId = (String)request.getAttribute("createId");
+		OrderBO orderBO = parameterUtil.nativePlaceOrderBefore(salesBillId,createId);
+		String codeUrl = paymentService.placeOrder(orderBO);
+		return new ReportResult(parameterUtil.nativePlaceOrderAfter(codeUrl));
+	}
+
+	@ApiOperation(value = "销售单合并native下单", notes = "销售单合并native下单")
+	@LoginRequired(department=true)
+	@GetMapping("/mergeNative")
+	public ReportResult mergeNative(@RequestParam String billIds,HttpServletRequest request) {
+		String createId = (String)request.getAttribute("createId");
+		OrderBO orderBO = parameterUtil.mergeNativeBefore(billIds,createId);
 		String codeUrl = paymentService.placeOrder(orderBO);
-		List<NativePlaceOrderDTO> array = new ArrayList<>();
-		NativePlaceOrderDTO nativePlaceOrderDTO = new NativePlaceOrderDTO();
-		nativePlaceOrderDTO.setCodeUrl(codeUrl);
-		array.add(nativePlaceOrderDTO);
-		return new ReportResult(array);
+		return new ReportResult(parameterUtil.mergeNativeAfter(codeUrl));
+	}
+
+
+	@ApiOperation(value = "退款", notes = "微信退款")
+	@GetMapping("/refund")
+	public CommonResult refund(@RequestParam String billId) {
+		RefundBO refundBO = parameterUtil.refundBefore(billId);
+		refundService.refund(refundBO);
+		return new CommonResult(ErrorConstant.SUECCESS.getCode(), ErrorConstant.SUECCESS.getMessage(),null);
 	}
 }

payment-base-app/src/main/java/com/base/springcloud/dao/DepartMapper.java

@@ -0,0 +1,24 @@
+package com.base.springcloud.dao;
+
+import com.base.springcloud.entity.Depart;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface DepartMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(Depart record);
+
+    int insertSelective(Depart record);
+
+    Depart selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(Depart record);
+
+    int updateByPrimaryKey(Depart record);
+
+    List<String> getUserDepart(@Param("userId")String useId);
+}

payment-base-app/src/main/java/com/base/springcloud/dao/OrderBillMapper.java

@@ -0,0 +1,26 @@
+package com.base.springcloud.dao;
+
+import com.base.springcloud.entity.OrderBill;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface OrderBillMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(OrderBill record);
+
+    int insertSelective(OrderBill record);
+
+    OrderBill selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(OrderBill record);
+
+    int updateByPrimaryKey(OrderBill record);
+
+	List<String> getBillId(@Param("orderId") String orderId);
+
+	String getOrderId(@Param("billId") String billId);
+}

payment-base-app/src/main/java/com/base/springcloud/dao/OrderMapper.java

@@ -1,6 +1,7 @@
 package com.base.springcloud.dao;
 
 import com.base.springcloud.entity.Order;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.Date;
@@ -24,4 +25,8 @@ public interface OrderMapper {
 	List<Order> queryOrder(Date date);
 
 	int updateOrderSuccess(String orderNo);
+
+	Order origOrderInfo(@Param("orderId") String orderId);
+
+	int superPayCount(String id);
 }

payment-base-app/src/main/java/com/base/springcloud/dao/PayDepartConfigMapper.java

@@ -0,0 +1,19 @@
+package com.base.springcloud.dao;
+
+import com.base.springcloud.entity.PayDepartConfig;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PayDepartConfigMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(PayDepartConfig record);
+
+    int insertSelective(PayDepartConfig record);
+
+    PayDepartConfig selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(PayDepartConfig record);
+
+    int updateByPrimaryKey(PayDepartConfig record);
+}

payment-base-app/src/main/java/com/base/springcloud/dao/RefundMapper.java

@@ -0,0 +1,30 @@
+package com.base.springcloud.dao;
+
+import com.base.springcloud.bo.RefundBO;
+import com.base.springcloud.entity.Refund;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.Date;
+import java.util.List;
+
+@Repository
+public interface RefundMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(Refund record);
+
+    int insertSelective(Refund record);
+
+    Refund selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(Refund record);
+
+    int updateByPrimaryKey(Refund record);
+
+    int updateRefundSuccess(Refund refund);
+
+	List<Refund> queryRefundData(Date date);
+
+	int superRefundCount(@Param("id") String refundId);
+}

payment-base-app/src/main/java/com/base/springcloud/dao/SaleBillMapper.java

@@ -1,8 +1,11 @@
 package com.base.springcloud.dao;
 
 import com.base.springcloud.entity.SaleBill;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface SaleBillMapper {
 
@@ -19,4 +22,12 @@ public interface SaleBillMapper {
     int updateByPrimaryKey(SaleBill record);
 
     SaleBill queryBillInfo(SaleBill saleBill);
+
+	int writeOffBill(@Param("orderId") String orderId);
+
+	// 合并销售单据金额
+	List<SaleBill> mergeBill(@Param("ids") String[] billIdArray);
+
+	// 获取子销售单据
+	List<SaleBill> childBill(@Param("ids") List<String> billIdList);
 }

payment-base-app/src/main/java/com/base/springcloud/dao/UserMapper.java

@@ -0,0 +1,22 @@
+package com.base.springcloud.dao;
+
+import com.base.springcloud.entity.User;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface UserMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(User record);
+
+    int insertSelective(User record);
+
+    User selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(User record);
+
+    int updateByPrimaryKey(User record);
+
+    User getUser(@Param("userName") String userName);
+}

payment-base-app/src/main/java/com/base/springcloud/dto/NoticeReqDTO.java

@@ -1,38 +1,7 @@
 package com.base.springcloud.dto;
 
 import lombok.Data;
-import org.springframework.web.multipart.MultipartFile;
 
 @Data
 public class NoticeReqDTO {
-
-	/**
-	 * 微信支付证书文件
-	 */
-	private MultipartFile certFile;
-
-	/**
-	 * 公众号
-	 */
-	private String appId;
-
-	/**
-	 * 商户私钥
-	 */
-	private String apiKey;
-
-	/**
-	 * 证书序列号
-	 */
-	private String serialNo;
-
-	/**
-	 * 商户号
-	 */
-	private String mchId;
-
-	/**
-	 * 商户私钥
-	 */
-	private String mchPrivateKey;
 }

payment-base-app/src/main/java/com/base/springcloud/dto/NoticeRspDTO.java

@@ -2,38 +2,7 @@ package com.base.springcloud.dto;
 
 import lombok.Data;
 
-import java.io.File;
-
 @Data
 public class NoticeRspDTO {
 
-	/**
-	 * 微信支付证书文件
-	 */
-	private File certFile;
-
-	/**
-	 * 公众号
-	 */
-	private String appId;
-
-	/**
-	 * 商户私钥
-	 */
-	private String apiKey;
-
-	/**
-	 * 证书序列号
-	 */
-	private String serialNo;
-
-	/**
-	 * 商户号
-	 */
-	private String mchId;
-
-	/**
-	 * 商户私钥
-	 */
-	private String mchPrivateKey;
 }

payment-base-app/src/main/java/com/base/springcloud/dto/RefundNoticeReqDTO.java

@@ -0,0 +1,8 @@
+package com.base.springcloud.dto;
+
+import lombok.Data;
+
+@Data
+public class RefundNoticeReqDTO {
+
+}

payment-base-app/src/main/java/com/base/springcloud/dto/RefundNoticeRspDTO.java

@@ -0,0 +1,39 @@
+package com.base.springcloud.dto;
+
+import lombok.Data;
+
+import java.io.File;
+
+@Data
+public class RefundNoticeRspDTO {
+
+	/**
+	 * 微信支付证书文件
+	 */
+	private File certFile;
+
+	/**
+	 * 公众号
+	 */
+	private String appId;
+
+	/**
+	 * 商户私钥
+	 */
+	private String apiKey;
+
+	/**
+	 * 证书序列号
+	 */
+	private String serialNo;
+
+	/**
+	 * 商户号
+	 */
+	private String mchId;
+
+	/**
+	 * 商户私钥
+	 */
+	private String mchPrivateKey;
+}

payment-base-app/src/main/java/com/base/springcloud/entity/Depart.java

@@ -0,0 +1,50 @@
+package com.base.springcloud.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class Depart {
+    private String id;
+
+    private String parentId;
+
+    private String departName;
+
+    private String departNameEn;
+
+    private String departNameAbbr;
+
+    private Integer departOrder;
+
+    private String description;
+
+    private String orgCategory;
+
+    private String orgType;
+
+    private String orgCode;
+
+    private String mobile;
+
+    private String fax;
+
+    private String address;
+
+    private String memo;
+
+    private String status;
+
+    private String delFlag;
+
+    private String createBy;
+
+    private Date createTime;
+
+    private String updateBy;
+
+    private Date updateTime;
+
+    private String ctCompanyId;
+}

payment-base-app/src/main/java/com/base/springcloud/entity/MerchantConfig.java

@@ -46,9 +46,9 @@ public class MerchantConfig extends BaseEntity {
     private String createId;
 
     /**
-     * 创建部门ID
+     * 创建公司ID
      */
-    private String createDepartId;
+    private String createCompanyId;
 
     /**
      * 创建时间

payment-base-app/src/main/java/com/base/springcloud/entity/Order.java

@@ -33,6 +33,8 @@ public class Order extends BaseEntity {
 
     private String goodId;
 
+    private String sourceBillId;
+
     private String orderType;
 
     private String orderState;

payment-base-app/src/main/java/com/base/springcloud/entity/OrderBill.java

@@ -0,0 +1,21 @@
+package com.base.springcloud.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class OrderBill {
+
+    private String id;
+
+    private String orderId;
+
+    private String billId;
+
+    private String soureBillId;
+
+    private String createId;
+
+    private Date createTime;
+}

payment-base-app/src/main/java/com/base/springcloud/entity/PayDepartConfig.java

@@ -0,0 +1,55 @@
+package com.base.springcloud.entity;
+
+import java.util.Date;
+
+public class PayDepartConfig {
+    private String id;
+
+    private String mechantConfigId;
+
+    private String departId;
+
+    private String createId;
+
+    private Date createTime;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getMechantConfigId() {
+        return mechantConfigId;
+    }
+
+    public void setMechantConfigId(String mechantConfigId) {
+        this.mechantConfigId = mechantConfigId;
+    }
+
+    public String getDepartId() {
+        return departId;
+    }
+
+    public void setDepartId(String departId) {
+        this.departId = departId;
+    }
+
+    public String getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(String createId) {
+        this.createId = createId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

payment-base-app/src/main/java/com/base/springcloud/entity/Refund.java

@@ -0,0 +1,33 @@
+package com.base.springcloud.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class Refund {
+    private String id;
+
+    private String mchId;
+
+    private String refundOrderNo;
+
+    private Date refundTime;
+
+    private String createId;
+
+    private Date createTime;
+
+    private String origOrderNo;
+
+    private Date origOrderTime;
+
+    private String sourceBillId;
+
+    private String reason;
+
+    // 0 - 退款未完成  1 - 退款完成  2 - 退款部分完成
+    private Integer refundState;
+
+    private Integer refundRetryCount;
+}

payment-base-app/src/main/java/com/base/springcloud/entity/User.java

@@ -0,0 +1,63 @@
+package com.base.springcloud.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class User implements Serializable {
+    private String id;
+
+    private String userName;
+
+    private String realName;
+
+    private String password;
+
+    private String salt;
+
+    private String avatar;
+
+    private Date birthday;
+
+    private Integer sex;
+
+    private String email;
+
+    private String phone;
+
+    private String orgCode;
+
+    private Integer status;
+
+    private Integer delFlag;
+
+    private String thirdId;
+
+    private String thirdType;
+
+    private Integer activitiSync;
+
+    private String workNo;
+
+    private String post;
+
+    private String telephone;
+
+    private String createBy;
+
+    private Date createTime;
+
+    private String updateBy;
+
+    private Date updateTime;
+
+    private Integer userIdentity;
+
+    private String departIds;
+
+    private String ctCompanyId;
+
+    private Integer accountType;
+}

payment-base-app/src/main/java/com/base/springcloud/entity/WxpayRefundVo.java

@@ -3,6 +3,7 @@ package com.base.springcloud.entity;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * 微信退款预下单-主体信息
@@ -13,9 +14,8 @@ import java.io.Serializable;
 public class WxpayRefundVo implements Serializable {
 
 	private static final long serialVersionUID = 8189139771687842957L;
-	// 原支付交易对应的微信订单号
-	// 示例值：1217752501201407033233368018
-	private String transaction_id;
+	// 原支付订单对应商户订单号
+	private String out_trade_no;
 	// 若商户传入，会在下发给用户的退款消息中体现退款原因
 	// 示例值：商品已售完
 	private String reason;
@@ -36,10 +36,10 @@ public class WxpayRefundVo implements Serializable {
 	public static class WxRefundAmountVo {
 		// 退款金额，币种的最小单位，只能为整数，不能超过原订单支付金额。
 		// 示例值：888
-		private long refund;
+		private BigDecimal refund;
 		// 原支付交易的订单总金额，币种的最小单位，只能为整数。
 		// 示例值：888
-		private long total;
+		private BigDecimal total;
 		// CNY：人民币，境内商户号仅支持人民币。
 		// 示例值：CNY
 		private String currency = "CNY";
@@ -48,7 +48,7 @@ public class WxpayRefundVo implements Serializable {
 			super();
 		}
 
-		public WxRefundAmountVo(long refund, long total) {
+		public WxRefundAmountVo(BigDecimal refund, BigDecimal total) {
 			super();
 			this.refund = refund;
 			this.total = total;

payment-base-app/src/main/java/com/base/springcloud/entity/WxpayTradeVo.java

@@ -3,6 +3,7 @@ package com.base.springcloud.entity;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * 微信支付预下单-主体信息
@@ -63,7 +64,7 @@ public class WxpayTradeVo implements Serializable {
 	public static class WxTradeAmountVo {
 		// 订单总金额，单位为分。
 		// 示例值：100
-		private long total;
+		private BigDecimal total;
 		// CNY：人民币，境内商户号仅支持人民币。
 		// 示例值：CNY
 		private String currency = "CNY";
@@ -71,7 +72,7 @@ public class WxpayTradeVo implements Serializable {
 		public WxTradeAmountVo() {
 			super();
 		}
-		public WxTradeAmountVo(long total) {
+		public WxTradeAmountVo(BigDecimal total) {
 			super();
 			this.total = total;
 		}

payment-base-app/src/main/java/com/base/springcloud/schedule/OrderTask.java

@@ -21,4 +21,10 @@ public class OrderTask {
 	public void syncOrderInfo(){
 		paymentService.syncOrderInfo(new Date());
 	}
+
+
+	@Scheduled(fixedDelay = 30 * 6000)
+	public void syncRefundInfo(){
+		paymentService.syncRefundInfo(new Date());
+	}
 }

payment-base-app/src/main/java/com/base/springcloud/service/BillService.java

@@ -1,6 +1,11 @@
 package com.base.springcloud.service;
 
 import com.base.springcloud.bo.OrderBO;
+import com.base.springcloud.bo.RefundBO;
+import com.base.springcloud.bo.SaleBillBO;
+import com.base.springcloud.entity.SaleBill;
+
+import java.math.BigDecimal;
 
 public interface BillService {
 
@@ -9,4 +14,28 @@ public interface BillService {
 	 * @param orderBO
 	 */
 	void billCheck(OrderBO orderBO);
+
+	/**
+	 * 合并销售单据金额
+	 * @param orderBO
+	 */
+	void mergeBillAmount(OrderBO orderBO);
+
+	/**
+	 * 获取子销售单据
+	 * @param orderBO
+	 */
+	void childBill(OrderBO orderBO,Boolean rootFlag);
+
+	/**
+	 * 核销销售单据金额
+	 * @param id
+	 */
+	void writeOffAmount(String id);
+
+	/**
+	 * 退款金额获取
+	 * @param refundBO
+	 */
+	void refundFront(RefundBO refundBO);
 }

payment-base-app/src/main/java/com/base/springcloud/service/DepartService.java

@@ -0,0 +1,21 @@
+package com.base.springcloud.service;
+
+import com.base.springcloud.bo.DepartBO;
+
+import java.util.List;
+
+public interface DepartService {
+
+	/**
+	 * 获取用户部门
+	 * @param userId
+	 * @return
+	 */
+	List<String> getUserDepart(String userId);
+
+	/**
+	 * 保存商户部门信息
+	 * @param departBO
+	 */
+	void savePayDepart(DepartBO departBO);
+}

payment-base-app/src/main/java/com/base/springcloud/service/MerchantService.java

@@ -32,7 +32,7 @@ public interface MerchantService {
 
 	/**
 	 * 获取商户支付信息配置
-	 * @param orderBO
+	 * @param mchId
 	 */
-	void claimMerchantConfig(OrderBO orderBO);
+	MerchantConfigBO claimMerchantConfig(String mchId);
 }

payment-base-app/src/main/java/com/base/springcloud/service/OrderBillService.java

@@ -0,0 +1,30 @@
+package com.base.springcloud.service;
+
+import com.base.springcloud.bo.OrderBO;
+import com.base.springcloud.bo.SaleBillBO;
+
+import java.util.List;
+
+public interface OrderBillService {
+
+
+	/**
+	 * 登记销售单据和订单关联
+	 * @param orderBO
+	 */
+	void registerOrderBill(OrderBO orderBO);
+
+
+	/**
+	 * 获取销售单据号
+	 * @param orderId
+	 */
+	List<String> getBillId(String orderId);
+
+	/**
+	 * 查询销售单据对应订单
+	 * @param billId
+	 * @return
+	 */
+	String queryOrderNo(String billId);
+}

payment-base-app/src/main/java/com/base/springcloud/service/orderService.java → payment-base-app/src/main/java/com/base/springcloud/service/OrderService.java

@@ -1,8 +1,10 @@
 package com.base.springcloud.service;
 
 import com.base.springcloud.bo.OrderBO;
+import com.base.springcloud.bo.RefundBO;
 import com.base.springcloud.entity.Order;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -16,4 +18,10 @@ public interface OrderService {
 
 	// 同步订单状态
 	void updateOrderSuccess(String orderNo);
+
+	// 查询原支付订单
+	void origOrderCheck(RefundBO refundBO);
+
+	// 叠加次数
+	void superPayCount(String id);
 }

payment-base-app/src/main/java/com/base/springcloud/service/PaymentService.java

@@ -24,4 +24,10 @@ public interface PaymentService {
 	 * @param orderBO
 	 */
 	void queryOrder(OrderBO orderBO);
+
+	/**
+	 * 退款订单查询
+	 * @param
+	 */
+	void syncRefundInfo(Date date);
 }

payment-base-app/src/main/java/com/base/springcloud/service/RefundService.java

@@ -0,0 +1,28 @@
+package com.base.springcloud.service;
+
+import com.base.springcloud.bo.RefundBO;
+
+import java.util.Date;
+import java.util.List;
+
+public interface RefundService {
+
+	/**
+	 * 退款
+	 * @param refundBO
+	 */
+	void refund(RefundBO refundBO);
+
+	/**
+	 * 退款列表查询
+	 * @param date
+	 * @return
+	 */
+	List<RefundBO> queryRefund(Date date);
+
+	/**
+	 * 查询退款订单
+	 * @param o
+	 */
+	void queryRefundOrder(RefundBO o);
+}

payment-base-app/src/main/java/com/base/springcloud/service/UserService.java

@@ -0,0 +1,14 @@
+package com.base.springcloud.service;
+
+import com.base.springcloud.entity.User;
+
+public interface UserService {
+
+	/**
+	 * 获取用户信息
+	 *
+	 * @param userName
+	 */
+	User getUser(String userName);
+
+}

payment-base-app/src/main/java/com/base/springcloud/service/WecPaymentService.java

@@ -1,16 +1,27 @@
 package com.base.springcloud.service;
 
+import com.base.springcloud.bo.CodePayBO;
 import com.base.springcloud.bo.OrderBO;
-import com.base.springcloud.entity.Order;
+import com.base.springcloud.bo.RefundBO;
 
 public interface WecPaymentService {
 
 	/**
-	 * Native支付
+	 * 微信Native支付
 	 * @param orderBO
-	 * @return
 	 */
-	String nativePay(OrderBO orderBO);
+	String wecNativePay(OrderBO orderBO);
+
+	/**
+	 * 微信APIv3退款
+	 * @param refundBO
+	 */
+	Boolean wecRefund(RefundBO refundBO);
+
+	/**
+	 * 微信付款码支付
+	 */
+	void codePay(CodePayBO codePayBO);
 
 	/**
 	 * 查询微信订单结果
@@ -18,4 +29,11 @@ public interface WecPaymentService {
 	 * @return true - 成功  false - 未成功
 	 */
 	Boolean orderResult(OrderBO orderBO);
+
+	/**
+	 * 微信退款查询
+	 * @param refundBO
+	 * @return
+	 */
+	Boolean wecRefundQuery(RefundBO refundBO);
 }

payment-base-app/src/main/java/com/base/springcloud/service/imp/BillServiceImp.java

@@ -1,15 +1,21 @@
 package com.base.springcloud.service.imp;
 
+import com.base.springcloud.aspect.annotation.BusinessException;
 import com.base.springcloud.bo.OrderBO;
+import com.base.springcloud.bo.RefundBO;
+import com.base.springcloud.constant.ErrorConstant;
 import com.base.springcloud.dao.SaleBillMapper;
 import com.base.springcloud.entity.SaleBill;
 import com.base.springcloud.service.BillService;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 
 @Service
@@ -20,15 +26,119 @@ public class BillServiceImp implements BillService {
 	@Autowired
 	private SaleBillMapper saleBillMapper;
 
+	/**
+	 * 销售单据核查
+	 * @param orderBO
+	 */
 	@Override
 	public void billCheck(OrderBO orderBO) {
 		SaleBill saleBill = new SaleBill();
-		saleBill.setBillNo(orderBO.getBillNo());
+		saleBill.setId(orderBO.getBillIds());
 		SaleBill queryResult = saleBillMapper.queryBillInfo(saleBill);
 		if(!Optional.ofNullable(queryResult).isPresent()){
-			saleBill.setTotalAmount(new BigDecimal(1));
-			logger.warn("==================销售单据查询失败！=============================");
+			throw new BusinessException(ErrorConstant.BILL_INVALID);
 		}
-		orderBO.setSaleBill(queryResult);
+		BigDecimal payAmount = Optional.ofNullable(queryResult.getPayAmount()).orElse(BigDecimal.ZERO);
+		if(payAmount.compareTo(queryResult.getTotalAmount()) >= 0)
+			throw new BusinessException(ErrorConstant.BILL_COMPLETE_PAYMENT);
+		orderBO.setAmount(queryResult.getTotalAmount());
+		List<SaleBill> saleBillList = new ArrayList<>();
+		saleBillList.add(queryResult);
+		List<String> billIdList = new ArrayList<>();
+		billIdList.add(queryResult.getId());
+		orderBO.setBillIdList(billIdList);
+		orderBO.setSaleBillList(saleBillList);
+	}
+
+	/**
+	 * 销售单据合并
+	 * @param orderBO
+	 */
+	@Override
+	public void mergeBillAmount(OrderBO orderBO) {
+		String billIds = orderBO.getBillIds();
+		if(StringUtils.isBlank(billIds)){
+			throw new BusinessException(ErrorConstant.NULL_OBJ);
+		}
+		String[] billIdArray =  billIds.split(",");
+		List<SaleBill> billAmountList = saleBillMapper.mergeBill(billIdArray);
+		if(!Optional.ofNullable(billAmountList).isPresent())
+			throw new BusinessException(ErrorConstant.SALE_BILL_INVALID);
+		BigDecimal orderAmount = new BigDecimal(0);
+		List<String> billIdList = new ArrayList<>();
+		for (SaleBill bill : billAmountList){
+			BigDecimal payAmount = Optional.ofNullable(bill.getPayAmount()).orElse(BigDecimal.ZERO);
+			if(payAmount.compareTo(bill.getTotalAmount()) >= 0)
+				continue;
+			billIdList.add(bill.getId());
+			orderAmount = orderAmount.add(bill.getTotalAmount());
+		}
+		if(orderAmount.compareTo(BigDecimal.ZERO) <= 0){
+			throw new BusinessException(ErrorConstant.ALL_BILL_COMPLETE_PAYMENT);
+		}
+		orderBO.setAmount(orderAmount);
+		orderBO.setSaleBillList(billAmountList);
+		orderBO.setBillIdList(billIdList);
+	}
+
+	/**
+	 * 获取子销售单据
+	 * @param orderBO
+	 */
+	@Override
+	public void childBill(OrderBO orderBO,Boolean rootFlag) {
+		List<String> billIdList = orderBO.getBillIdList();
+		List<String> queryBillIdList;
+		if(rootFlag)
+			queryBillIdList = billIdList;
+		else
+			queryBillIdList = orderBO.getChildIdList();
+		if(null == queryBillIdList || queryBillIdList.size() == 0) return;
+		List<SaleBill> saleBillList = saleBillMapper.childBill(queryBillIdList);
+		// 查询结果不存在结束流程
+		if(null == saleBillList || saleBillList.size() == 0) return;
+		List<String> childBillIdList = new ArrayList<>();
+		BigDecimal amount = orderBO.getAmount();
+		for (SaleBill saleBill: saleBillList) {
+			amount = amount.add(saleBill.getTotalAmount());
+			billIdList.add(saleBill.getId());
+			childBillIdList.add(saleBill.getId());
+		}
+		// 金额设置
+		orderBO.setAmount(amount);
+		// 所有的子单据编号需要存储
+		orderBO.setBillIdList(billIdList);
+		// 重置需作为父节点查询的单据编号
+		orderBO.setChildIdList(childBillIdList);
+		// 递归
+		childBill(orderBO,false);
+	}
+
+	/**
+	 * 销售单据金额核销
+	 * @param orderId
+	 */
+	@Override
+	public void writeOffAmount(String orderId) {
+		int count = saleBillMapper.writeOffBill(orderId);
+		if(count > 0) return;
+		throw new BusinessException(ErrorConstant.BILL_WRITE_OFF_FAIL);
+	}
+
+	/**
+	 * 退款金额获取
+	 * @param refundBO
+	 */
+	@Override
+	public void refundFront(RefundBO refundBO) {
+		String billId = refundBO.getBillId();
+		if(StringUtils.isBlank(billId))
+			throw  new BusinessException(ErrorConstant.BILL_INVALID);
+		SaleBill saleBill = new SaleBill();
+		saleBill.setId(billId);
+		saleBill = saleBillMapper.queryBillInfo(saleBill);
+		if(Optional.ofNullable(saleBill).isPresent())
+			return;
+		throw  new BusinessException(ErrorConstant.BILL_INVALID);
 	}
 }

payment-base-app/src/main/java/com/base/springcloud/service/imp/DepartServiceImp.java

@@ -0,0 +1,60 @@
+package com.base.springcloud.service.imp;
+
+import com.base.springcloud.aspect.annotation.BusinessException;
+import com.base.springcloud.bo.DepartBO;
+import com.base.springcloud.constant.ErrorConstant;
+import com.base.springcloud.dao.DepartMapper;
+import com.base.springcloud.dao.PayDepartConfigMapper;
+import com.base.springcloud.entity.PayDepartConfig;
+import com.base.springcloud.service.DepartService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+@Service
+public class DepartServiceImp implements DepartService {
+
+	@Autowired
+	private DepartMapper departMapper;
+
+	@Autowired
+	private PayDepartConfigMapper payDepartConfigMapper;
+
+	/**
+	 * 获取用户部门
+	 * @param userId
+	 * @return
+	 */
+	@Override
+	public List<String> getUserDepart(String userId) {
+		return departMapper.getUserDepart(userId);
+	}
+
+	/**
+	 *  保存商户部门信息
+	 * @param departBO
+	 */
+	@Override
+	public void savePayDepart(DepartBO departBO) {
+		List<String> departIdList = departBO.getDepartIdList();
+		if(!Optional.ofNullable(departIdList).isPresent())
+			throw new BusinessException(ErrorConstant.USER_DEPART_RELATION_NEED);
+		for (String depart : departIdList){
+			PayDepartConfig payDepartConfig = new PayDepartConfig();
+			payDepartConfig.setId(UUID.randomUUID().toString().replace("-", ""));
+			payDepartConfig.setCreateId(departBO.getCreateId());
+			payDepartConfig.setCreateTime(new Date());
+			payDepartConfig.setDepartId(depart);
+			payDepartConfig.setMechantConfigId(departBO.getMerchantConfigureId());
+			int count =	payDepartConfigMapper.insert(payDepartConfig);
+			if(count < 1)
+				throw new BusinessException(ErrorConstant.SAVE_PAY_DEPART_CONFIG_FAIL);
+		}
+	}
+}

payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java

@@ -1,28 +1,26 @@
 package com.base.springcloud.service.imp;
 
+import com.base.springcloud.aspect.annotation.BusinessException;
+import com.base.springcloud.bo.DepartBO;
 import com.base.springcloud.bo.MerchantConfigBO;
-import com.base.springcloud.bo.OrderBO;
+import com.base.springcloud.constant.ErrorConstant;
 import com.base.springcloud.constant.PaymentConstant;
 import com.base.springcloud.dao.MerchantConfigMapper;
 import com.base.springcloud.entity.MerchantConfig;
-import com.base.springcloud.entity.WxpayTradeVo;
+import com.base.springcloud.service.DepartService;
 import com.base.springcloud.service.MerchantService;
-import com.base.springcloud.util.FtpUtil;
-import com.base.springcloud.util.WxpayUtils;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.wechat.pay.contrib.apache.httpclient.WechatPayHttpClientBuilder;
-import org.apache.commons.lang.StringUtils;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.util.EntityUtils;
+import com.base.springcloud.util.OssBootUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
@@ -32,14 +30,13 @@ import java.util.stream.Collectors;
 @Service
 public class MerchantServiceImp implements MerchantService {
 
+	private Logger logger = LoggerFactory.getLogger(MerchantServiceImp.class);
+
 	@Autowired
 	private MerchantConfigMapper merchantConfigMapper;
 
 	@Autowired
-	private FtpUtil ftpUtil;
-
-	@Value("${test_ftp.file_path}")
-	public String FTP_BASEPATH;
+	private DepartService departService;
 
 	/**
 	 * 支付信息配置
@@ -48,16 +45,35 @@ public class MerchantServiceImp implements MerchantService {
 	@Override
 	public void paymentConfigure(MerchantConfigBO merchantConfigBO) {
 		// 证书上传服务器
-		String certPath = uplodWecWindow(merchantConfigBO.getMchId(),merchantConfigBO.getCertFile());
+		String certPath = uploadCertificate(merchantConfigBO.getCertFile());
 		// 商户支付信息保存
 		MerchantConfig merchantConfig = new MerchantConfig();
 		merchantConfig.setId(UUID.randomUUID().toString().replace("-", ""));
+		merchantConfig.setCreateId(merchantConfigBO.getCreateId());
 		merchantConfig.setCreateTime(new Date());
+		merchantConfig.setCreateCompanyId(merchantConfigBO.getCompanyId());
 		merchantConfig.setCertPath(certPath);
 		BeanUtils.copyProperties(merchantConfigBO,merchantConfig);
 		int count = merchantConfigMapper.insert(merchantConfig);
-		if(count > 0) return;
-		// TODO 抛出业务异常
+		if(count < 1)
+			throw new BusinessException(ErrorConstant.MERCHANT_CONFIGURE_FAIL);
+		// 保存商户部门信息
+		DepartBO departBO = new DepartBO();
+		departBO.setDepartIdList(merchantConfigBO.getDepartIdList());
+		departBO.setMerchantConfigureId(merchantConfig.getId());
+		departBO.setCreateId(merchantConfigBO.getCreateId());
+		departService.savePayDepart(departBO);
+	}
+
+	/**
+	 * 证书上传
+	 * @param certFile
+	 * @return
+	 */
+	private String uploadCertificate(MultipartFile certFile) {
+		String filePath = OssBootUtil.upload(certFile, PaymentConstant.MECHANT_CERTIFICATE_SAVE_PATH);
+		String[] temp = filePath.split("/");
+		return PaymentConstant.MECHANT_CERTIFICATE_SAVE_PATH + PaymentConstant.SLASH + temp[temp.length - 1];
 	}
 
 	/**
@@ -68,12 +84,14 @@ public class MerchantServiceImp implements MerchantService {
 	public void removeMerchantConfig(String mchId) {
 		// 查询商户支付信息配置记录
 		MerchantConfig merchantConfig = merchantConfigMapper.claimMerchantConfig(mchId);
-		// 删除证书文件
-		delWecWindow(merchantConfig.getCertPath());
+		if(!Optional.ofNullable(merchantConfig).isPresent())
+			throw new BusinessException(ErrorConstant.MERCHANT_CONFIGURE_INVALID);
+		// 删除原证书
+		removeCertificate(merchantConfig.getCertPath());
 		// 删除商户支付信息配置记录
 		int count = merchantConfigMapper.removeMerchantConfig(mchId);
 		if(count > 0) return;
-		// TODO 抛业务异常
+		throw new BusinessException(ErrorConstant.MERCHANT_CONFIGURE_DEL_FAIL);
 	}
 
 	/**
@@ -82,16 +100,35 @@ public class MerchantServiceImp implements MerchantService {
 	 */
 	@Override
 	public void updateMerchantConfig(MerchantConfigBO merchantConfigBO) {
-		// 证书上传服务器
-		String certPath = uplodWecWindow(merchantConfigBO.getMchId(),merchantConfigBO.getCertFile());
+		String mchId = merchantConfigBO.getMchId();
+		if(StringUtils.isBlank(mchId))
+			throw new BusinessException(ErrorConstant.NULL_OBJ);
+		// 查询商户信息
+		MerchantConfig merchantConfig = merchantConfigMapper.claimMerchantConfig(mchId);
+		if(!Optional.ofNullable(merchantConfig).isPresent())
+			throw new BusinessException(ErrorConstant.MERCHANT_CONFIGURE_INVALID);
+		// 删除原证书
+		removeCertificate(merchantConfig.getCertPath());
+		// 新证书上传服务器
+		String certPath = uploadCertificate(merchantConfigBO.getCertFile());
 		// 商户支付信息保存
-		MerchantConfig merchantConfig = new MerchantConfig();
+		MerchantConfig updateConfig = new MerchantConfig();
+		BeanUtils.copyProperties(merchantConfigBO,updateConfig);
 		merchantConfig.setCertPath(certPath);
-		BeanUtils.copyProperties(merchantConfigBO,merchantConfig);
 		merchantConfig.setUpdateTime(new Date());
 		int count = merchantConfigMapper.updateMerchantConfig(merchantConfig);
 		if(count > 0) return;
-		// TODO 抛业务异常
+		throw new BusinessException(ErrorConstant.MERCHANT_CONFIGURE_UPD_FAIL);
+	}
+
+	/**
+	 * 移除原证书
+	 * @param certPath
+	 */
+	private void removeCertificate(String certPath) {
+		if(StringUtils.isBlank(certPath))
+			return;
+		OssBootUtil.delete(certPath);
 	}
 
 	/**
@@ -104,110 +141,63 @@ public class MerchantServiceImp implements MerchantService {
 		MerchantConfig merchantConfig = new MerchantConfig();
 		BeanUtils.copyProperties(merchantConfigBO,merchantConfig);
 		List<MerchantConfig> merchantConfigList = merchantConfigMapper.queryMerchantConfig(merchantConfig);
-		if(!Optional.ofNullable(merchantConfigList).isPresent()){
 		// TODO 抛出业务异常
-		}
-		List<MerchantConfigBO> merchantConfigBOList = merchantConfigList.stream().map(o -> {
+		assert merchantConfigList != null;
+		return merchantConfigList.stream().map(o -> {
 			MerchantConfigBO result = new MerchantConfigBO();
 			BeanUtils.copyProperties(o, result);
 			return result;
 		}).collect(Collectors.toList());
-		return merchantConfigBOList;
 	}
 
+	/**
+	 * 商户支付配置信息查询
+	 * @param mchId
+	 */
 	@Override
-	public void claimMerchantConfig(OrderBO orderBO) {
-		if(!Optional.ofNullable(orderBO).map(o->orderBO.getMchId()).isPresent()){
-			// TODO 抛出业务异常
-			return;
+	public MerchantConfigBO claimMerchantConfig(String mchId) {
+		if(StringUtils.isBlank(mchId)){
+			throw new BusinessException(ErrorConstant.MCH_ID_PARAM_ERR);
 		}
-		MerchantConfig merchantConfig = merchantConfigMapper.claimMerchantConfig(orderBO.getMchId());
+		MerchantConfig merchantConfig = merchantConfigMapper.claimMerchantConfig(mchId);
 		if(!Optional.ofNullable(merchantConfig).isPresent()){
-			// TODO 抛出业务异常
-			return;
+			throw new BusinessException(ErrorConstant.MCH_ID_PARAM_ERR);
 		}
-		orderBO.setMchPrivateKey(merchantConfig.getMchPrivateKey());
+		MerchantConfigBO merchantConfigBO = new MerchantConfigBO();
+		merchantConfigBO.setAppId(merchantConfig.getAppId());
+		merchantConfigBO.setMchPrivateKey(merchantConfig.getMchPrivateKey());
+		merchantConfigBO.setSerialNo(merchantConfig.getSerialNo());
+		String certificate = readCertificate(merchantConfig.getCertPath());
+		merchantConfigBO.setCertificate(certificate);
+		return merchantConfigBO;
 	}
 
 	/**
-	 * 测试文件上传
+	 * 证书文件内容读取
+	 * @param certPath
+	 * @return
 	 */
-	private String uplodWecWindow(String mchId, MultipartFile certfile){
-		if (certfile.isEmpty()) {
-			// TODO 抛出业务异常
-			return  "文件上传失败！";
-		}
-
-		String fileName = certfile.getOriginalFilename();
-		String suffixName = fileName.substring(fileName.lastIndexOf("."));
-		File file = new File(FTP_BASEPATH + mchId + suffixName);
+	private String readCertificate(String certPath) {
+		InputStream is = OssBootUtil.getOssFile(certPath);
+		StringBuilder sb = new StringBuilder();
 		try{
-			certfile.transferTo(file);
-			return file.getPath();
-		} catch (IOException e) {
-			// TODO 抛出业务异常
-		}
-		return "文件上传失败！";
+			byte[] buf = new byte[1024];
+			int length;
+			//循环读取文件内容，输入流中将最多buf.length个字节的数据读入一个buf数组中,返回类型是读取到的字节数。
+			while((length = is.read(buf)) != -1){
+				sb.append(new String(buf,0,length));
 			}
+		}catch (IOException e){
+			logger.info("read_certificate_exception : {}",e.getMessage());
+			throw new BusinessException(ErrorConstant.MERCHANT_PAY_CERT_READ_FAIL);
+		}finally {
+			try{
+				is.close();
+			}catch (IOException ignored){
 
-	/**
-	 * 测试文件删除
-	 * @param filePath
-	 * @return
-	 */
-	private Boolean delWecWindow(String filePath){
-		if(StringUtils.isEmpty(filePath)){
-			return true;
-		}
-		File file = new File(filePath);
-		if(file.exists()) {
-			file.delete();
-			return true;
-		}
-		return true;
 			}
 
-	/**
-	 * 证书上传服务器
-	 * @param mchId
-	 * @param certfile
-	 * @return
-	 */
-	private String uplodWecPayCert(String mchId,File certfile){
-		//获取文件名
-		String fileName = certfile.getName();
-		//获取文件的后缀名
-		String suffixName = fileName.substring(fileName.lastIndexOf("."));
-		fileName = mchId + suffixName;
-		//上传的文件名也需要加上后缀，不然虚拟机不知道文件格式
-		try{
-			InputStream inputStream = new FileInputStream(certfile);
-			Boolean flag = ftpUtil.uploadFile(fileName, inputStream);
-			if (flag == true) {
-				return ftpUtil.FTP_BASEPATH + fileName;
-			}
-		}catch (FileNotFoundException e) {
-			e.printStackTrace();
 		}
-		return null;
+		return sb.toString();
 	}
-
-	/*public static void main(String[] args) {
-		WxpayTradeVo wxpayTradeVo = new WxpayTradeVo();
-		wxpayTradeVo.setAppid("wxa91984b310053c3d");
-		wxpayTradeVo.setMchid("1610494969");
-		wxpayTradeVo.setDescription("Image形象店-深圳腾大-QQ公仔");
-		wxpayTradeVo.setOut_trade_no("20220301095644");
-		wxpayTradeVo.setNotify_url("https://www.weixin.qq.com/wxpay/pay.php");
-		WxpayTradeVo.WxTradeAmountVo wxTradeAmountVo = new WxpayTradeVo.WxTradeAmountVo();
-		wxTradeAmountVo.setTotal(1l);
-		wxTradeAmountVo.setCurrency("CNY");
-		wxpayTradeVo.setAmount(wxTradeAmountVo);
-		ObjectNode objectNode = WxpayUtils.getWxpay(wxpayTradeVo,
-				PaymentConstant.NATIVE,
-				"MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCVVy4CUrRTPJZ49vuK9Tr5Rurd3dE3eiz7lsnWPAYgZtdWsC6TORUaP0Px/ZMtaJYNURMpVKC5koXZSPTNr9ROHa6B6IX4lTMERzHgiVzGIqLlE/twBYXbSuh8yXy3k59adFDYZZNN+2THWdst2Ao7pD+GXlDby8gfF67ax9CbWq5yyx6MYMKHwOVe3H/ON2pcmZR6I809Lwa4zfmUyOez1U5pwNiwv2cyorM5UXzVMsvK5jfIKDaskNVIV/+ax15tf+OQ/6t9iaWzRAV1zeeJd/TuVVGB/QU5slg5xyIwaqKzJM1H3n64er5QNRKpU31Ru0dHzJTW7ljtILWCQZubAgMBAAECggEAVga6QixSJACqzVO44vsQ1be8Y8H7WvHOJ79c1UQOY2vab91ddwFS3qPDCAsCVQ4CIfmqCAzv6PY2lEwqeLHooncGp17Cjcekc7pvSODXyGr7Wup/1K/Zw9EKy5dleHpZOUn3qDAbArjl/NAOKgJhIqoizcxW18YzqXWDDBQ+Xr6kqmjWXWZ3Kj6ghZNoSkdoynTQ7Ti0C2lq0UeXg611ea6Zs3fgjOgYEBMSSI7v4zE/6RN7jFGlZe5Z1NgO15rl8r3YdDnXTCIpEiTV+yHsDkluqJquB0E1Xrr1AXl9AGMuq6lYEB4houJUPtGgQ6bLs93MrnyzgnGTLbLSnXDNwQKBgQDD6Z+0xZ8lApXZylI2N4zuSrCsi6wB6Qp/64jr+C7GAdmC7w9WRoIlIF7Q2s9p5ulGyxD2hAbrajY5CsjV3S0uIDAaULoG3dw5vxYFEdvcKgxphf8j0gcajUnPGzCxF5vm29B9D+o1mrylr04dtWHlP0KpKwQ6HiTX7if+DcXMhwKBgQDDJOFpoCcVdZ0clfpvJPZpgRTu3I4HFTs27elCQ98g1UWav/VY7729YLAKU27d6lG+iqH1X5lVu2lr/du8wdJoMbpBPD34V+V6ye8gV9lCG7wSCgsNnPqM/HoyBSe6+JUgwG+vCRh1KMhNBmqEMCqPRAtbW3wfDdCShfTBHAjxTQKBgCjYrNOj4Gp2/4dJB5sGOfv01qEi/dnoHKhPE10fgaEHAbKq5Se3y6qx9RLWjCgoXLrF2+OJ42dx3ZxHA1iTpLfZPi4+ZorH9wKTNKQZ9R0SJ0RZC7kMMS74BkuH/77sjTS03+MzTkGe4XYp9r968c46QkvDDD6Ryly66tutQ3BBAoGBAJiE/MDncWSuVit/dQrlYso3HztJmqAikfNuoz8tePlad1pp6cKnLi8ToMORTjeX6mf4RnlXTKrbHZxP/yxaeK8DHsXZ5b1yRWNg7MrknmOy9Z1LyDPNm24R7xelO9ZAb533idLOUxVO2K6K8zl5w+nRjubKbAqBa6D5ncBIvxyJAoGAP9cSun39cFuzjdTaWojmbQMM8k5pyvFWr2UdY50GFrFCdajkAxqoTLkFEUP5fx8InIU/X9aSbVE6Va5fdOKiifbx5KaSKFrH/xZS6XykAbIkWDWqOPMovHoMWj3lGO96wDInry9YZNy7JA8AuZsLSBUA7Xb33FqZ2WU5ePeFOAA=",
-				"MIID9jCCAt6gAwIBAgIUHPQVmPutv7O6ub4lOfSWhLWhflowDQYJKoZIhvcNAQELBQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsTFFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3QgQ0EwHhcNMjEwNjA5MDMzMjQ5WhcNMjYwNjA4MDMzMjQ5WjCBhzETMBEGA1UEAwwKMTYxMDQ5NDk2OTEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMTMwMQYDVQQLDCrotLXlt57pgJrnqIvlhYTlvJ/lt6XnqIvmnLrmorDmnInpmZDlhazlj7gxCzAJBgNVBAYMAkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJVXLgJStFM8lnj2+4r1OvlG6t3d0Td6LPuWydY8BiBm11awLpM5FRo/Q/H9ky1olg1REylUoLmShdlI9M2v1E4droHohfiVMwRHMeCJXMYiouUT+3AFhdtK6HzJfLeTn1p0UNhlk037ZMdZ2y3YCjukP4ZeUNvLyB8XrtrH0JtarnLLHoxgwofA5V7cf843alyZlHojzT0vBrjN+ZTI57PVTmnA2LC/ZzKiszlRfNUyy8rmN8goNqyQ1UhX/5rHXm1/45D/q32JpbNEBXXN54l39O5VUYH9BTmyWDnHIjBqorMkzUfefrh6vlA1EqlTfVG7R0fMlNbuWO0gtYJBm5sCAwEAAaOBgTB/MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMGUGA1UdHwReMFwwWqBYoFaGVGh0dHA6Ly9ldmNhLml0cnVzLmNvbS5jbi9wdWJsaWMvaXRydXNjcmw/Q0E9MUJENDIyMEU1MERCQzA0QjA2QUQzOTc1NDk4NDZDMDFDM0U4RUJEMjANBgkqhkiG9w0BAQsFAAOCAQEACoG5Uf3X33UlDY6VWxgvN6Kg1W9ZRwcwcxSPuURv7OVO1o1JH0c1lPRqY3H8A+TeVI4/5wt5GPRRkSOtecPhMikgvhUjxJZnM0b30sxEv7hoqgEqNcsu2Kc60W6hGzVW0Fw8qimjOmoREBAaOOpYNr/zIrZZiW4vJd//ESNXvpTlwwK1xE9VW3VJGHW7mMZ+Whr3S13esH7rds5mLE6OQvrL6B2weEcVlzP1oEZAbaZW5bgz2gQBR5WheU8QGySnU/e38nzLsdwY0r7ztaWQ39z7fsOeY2gupB8cZ251pWZ9oYvUu4u0VFflrbJiMdLLEZDej02MYtgO6o9xb8BNmw==",
-				"1CF41598FBADBFB3BAB9BE2539F49684B5A17E5A");
-		System.out.println(objectNode);
-	}*/
 }

payment-base-app/src/main/java/com/base/springcloud/service/imp/OrderBillServiceImp.java

@@ -0,0 +1,66 @@
+package com.base.springcloud.service.imp;
+
+import com.base.springcloud.bo.OrderBO;
+import com.base.springcloud.bo.SaleBillBO;
+import com.base.springcloud.dao.OrderBillMapper;
+import com.base.springcloud.entity.Order;
+import com.base.springcloud.entity.OrderBill;
+import com.base.springcloud.entity.SaleBill;
+import com.base.springcloud.service.OrderBillService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class OrderBillServiceImp implements OrderBillService {
+
+	Logger logger = LoggerFactory.getLogger(OrderBillServiceImp.class);
+
+	@Autowired
+	private OrderBillMapper orderBillMapper;
+
+	/**
+	 * 登记销售单据和订单关联
+	 *
+	 * @param orderBO
+	 */
+	@Override
+	public void registerOrderBill(OrderBO orderBO) {
+		Order order = orderBO.getOrder();
+		List<SaleBill> saleBillList = orderBO.getSaleBillList();
+		saleBillList.forEach(item -> {
+			OrderBill orderBill = new OrderBill();
+			orderBill.setId(UUID.randomUUID().toString().replace("-", ""));
+			orderBill.setCreateTime(new Date());
+			orderBill.setSoureBillId(item.getSourceId());
+			orderBill.setBillId(item.getId());
+			orderBill.setOrderId(order.getId());
+			orderBillMapper.insert(orderBill);
+		});
+	}
+
+	/**
+	 * 获取销售单据Id
+	 * @param orderId
+	 */
+	@Override
+	public List<String> getBillId(String orderId) {
+		return orderBillMapper.getBillId(orderId);
+	}
+
+	/**
+	 * 查询原支付订单
+	 * @param billId
+	 * @return
+	 */
+	@Override
+	public String queryOrderNo(String billId) {
+		return orderBillMapper.getOrderId(billId);
+	}
+
+}

payment-base-app/src/main/java/com/base/springcloud/service/imp/OrderServiceImp.java

@@ -1,18 +1,26 @@
 package com.base.springcloud.service.imp;
 
+import com.base.springcloud.aspect.annotation.BusinessException;
 import com.base.springcloud.bo.OrderBO;
+import com.base.springcloud.bo.RefundBO;
+import com.base.springcloud.constant.ErrorConstant;
 import com.base.springcloud.constant.PaymentConstant;
 import com.base.springcloud.dao.OrderMapper;
 import com.base.springcloud.entity.Order;
+import com.base.springcloud.service.OrderBillService;
 import com.base.springcloud.service.OrderService;
 import com.base.springcloud.util.DateUtil;
 import com.base.springcloud.util.DecimalUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 @Service
@@ -21,26 +29,42 @@ public class OrderServiceImp implements OrderService {
 	@Autowired
 	private OrderMapper orderMapper;
 
+	@Autowired
+	private OrderBillService orderBillService;
+
+	/**
+	 * 登记订单
+	 * @param orderBO
+	 */
 	@Override
 	public void registerOrder(OrderBO orderBO) {
+		BigDecimal amount = orderBO.getAmount();
+		if(amount.compareTo(BigDecimal.ZERO) <= 0){
+			throw new BusinessException(ErrorConstant.BILL_AMOUNT_ERR);
+		}
 		Order order = new Order();
 		order.setId(UUID.randomUUID().toString().replace("-", ""));
 		order.setCreateTime(new Date());
-		order.setExpireTime(new Date());
+		//order.setExpireTime(new Date());
 		order.setTimeStamp(new Date());
 		order.setOrderNo(DateUtil.getDateString(new Date(),25));
-		order.setOrderType("AL");
+		order.setOrderType("WEC");
 		order.setRequestNo(DateUtil.getDateString(new Date(),25));
 		order.setGoodName("maomaogongzai");
 		order.setReserved("memo");
 		order.setTimeStamp(new Date());
 		order.setMchId(orderBO.getMchId());
 		order.setOrderState(PaymentConstant.WAIT);
-		order.setOrderAmount(DecimalUtil.divide(orderBO.getSaleBill().getTotalAmount(),new BigDecimal(100)));
+		order.setOrderAmount(DecimalUtil.multiply(amount,new BigDecimal(100)).setScale(0,BigDecimal.ROUND_DOWN));
 		orderMapper.insert(order);
 		orderBO.setOrder(order);
 	}
 
+	/**
+	 * 查询订单
+	 * @param date
+	 * @return
+	 */
 	@Override
 	public List<OrderBO> queryOrder(Date date) {
 		List<Order>  orderList = orderMapper.queryOrder(date);
@@ -57,10 +81,50 @@ public class OrderServiceImp implements OrderService {
 		}).collect(Collectors.toList());
 	}
 
+	/**
+	 * 同步订单状态
+	 * @param orderNo
+	 */
 	@Override
 	public void updateOrderSuccess(String orderNo) {
 		int count = orderMapper.updateOrderSuccess(orderNo);
-		if(count > 0) return;
-		// TODO 抛出业务异常
+		if(count > 0)
+			return;
+		throw  new BusinessException(ErrorConstant.ORDER_SYNC_FAIL);
+	}
+
+	/**
+	 * 查询原支付订单
+	 * @param refundBO
+	 * @return
+	 */
+	@Override
+	public void origOrderCheck(RefundBO refundBO) {
+		String billId = refundBO.getBillId();
+		String orderId = orderBillService.queryOrderNo(billId);
+		if(StringUtils.isBlank(orderId))
+			throw new BusinessException(ErrorConstant.BILL_INVALID);
+		Order order = orderMapper.origOrderInfo(orderId);
+		if (!Optional.ofNullable(order).isPresent())
+			throw  new BusinessException(ErrorConstant.PAY_ORDER_NOT_FOUND);
+		if(!PaymentConstant.SUCCESS.equals(order.getOrderState()))
+			throw  new BusinessException(ErrorConstant.ORDER_STATE_NOT_SUPPORT_REFUND);
+		refundBO.setOrigOrderNo(order.getOrderNo());
+		refundBO.setOrigCreateTime(order.getCreateTime());
+		refundBO.setRefundAmount(order.getOrderAmount());
+		refundBO.setMchId(order.getMchId());
+	}
+
+	/**
+	 * 查询次数叠加
+	 * @param id
+	 */
+	@Override
+	public void superPayCount(String id) {
+		if(StringUtils.isBlank(id))
+			return;
+		int count = orderMapper.superPayCount(id);
+		if(count <= 0)
+			throw new BusinessException(ErrorConstant.SUPER_PAY_ORDER_COUNT_FAIL);
 	}
 }

payment-base-app/src/main/java/com/base/springcloud/service/imp/PaymentServiceImp.java

@@ -1,23 +1,30 @@
 package com.base.springcloud.service.imp;
 
-import com.base.springcloud.aspect.annotation.Rlock;
+import com.base.springcloud.aspect.annotation.BusinessException;
+import com.base.springcloud.bo.MerchantConfigBO;
 import com.base.springcloud.bo.OrderBO;
-import com.base.springcloud.constant.PaymentConstant;
+import com.base.springcloud.bo.RefundBO;
+import com.base.springcloud.bo.SaleBillBO;
 import com.base.springcloud.entity.Order;
 import com.base.springcloud.service.*;
+import com.base.springcloud.util.DecimalUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 @Service
 public class PaymentServiceImp implements PaymentService {
 
-	Logger logger = LoggerFactory.getLogger(PaymentServiceImp.class);
+	private Logger logger = LoggerFactory.getLogger(PaymentServiceImp.class);
 
 	@Autowired
 	private MerchantService merchantService;
@@ -31,23 +38,45 @@ public class PaymentServiceImp implements PaymentService {
 	@Autowired
 	private WecPaymentService wecPaymentService;
 
-	//@Autowired
-	//private AmqpTemplate amqpTemplate;
+	@Autowired
+	private OrderBillService orderBillService;
 
+	@Autowired
+	private RefundService refundService;
 
 	@Override
 	public String placeOrder(OrderBO orderBO){
 		// 参数检查
 		parameterCheck(orderBO);
+		if(orderBO.getMergeFlag())
+			// 销售单据合并
+		 	billService.mergeBillAmount(orderBO);
+		else
 			// 销售单据核查
 			billService.billCheck(orderBO);
-		// 查询商户支付信息配置
-		merchantService.claimMerchantConfig(orderBO);
+		// 获取子销售单据
+		//billService.childBill(orderBO,true);
 		// 登记订单
 		orderService.registerOrder(orderBO);
+		// 登记销售单据和订单关联
+		orderBillService.registerOrderBill(orderBO);
+		// 查询商户支付配置信息
+		claimMerchantConfig(orderBO);
 		// 请求微信生成二维码
-		String codeUrl = wecPaymentService.nativePay(orderBO);
-		return codeUrl;
+		return wecPaymentService.wecNativePay(orderBO);
+	}
+
+	/**
+	 * 查询商户支付配置信息
+	 * @param orderBO
+	 */
+	private void claimMerchantConfig(OrderBO orderBO) {
+		MerchantConfigBO merchantConfigBO = merchantService.claimMerchantConfig(orderBO.getMchId());
+		orderBO.setAppId(merchantConfigBO.getAppId());
+		orderBO.setMchPrivateKey(merchantConfigBO.getMchPrivateKey());
+		orderBO.setSerialNo(merchantConfigBO.getSerialNo());
+		orderBO.setCertificate(merchantConfigBO.getCertificate());
+
 	}
 
 	/**
@@ -59,11 +88,8 @@ public class PaymentServiceImp implements PaymentService {
 		List<OrderBO> orderList = orderService.queryOrder(date);
 		if(!Optional.ofNullable(orderList).isPresent()) return;
 		// 遍历查询第三方订单信息
-		for (OrderBO  orderBO : orderList){
-			// 异步处理数据
-			queryOrder(orderBO);
 		//amqpTemplate.convertSendAndReceive(PaymentConstant.ORDER_QUEUE,orderBO);
-		}
+		orderList.forEach(this::queryOrder);
 	}
 
 	/**
@@ -71,19 +97,45 @@ public class PaymentServiceImp implements PaymentService {
 	 * @param orderBO
 	 */
 	@Override
-	@Rlock(prefix = PaymentConstant.ORDER_LOCK_PREFIX, suffix = "#orderBO.order.orderNo",waitTime = 0,leaseTime = 60)
 	public void queryOrder(OrderBO orderBO) {
 		// 参数检查
 		Order order = Optional.ofNullable(orderBO).map(o->orderBO.getOrder()).orElse(null);
 		if(!Optional.ofNullable(order).isPresent()) return;
+		try{
 			// 获取商户支付配置信息
-		merchantService.claimMerchantConfig(orderBO);
+			claimMerchantConfig(orderBO);
 			// 查询微信订单结果
 			Boolean state = wecPaymentService.orderResult(orderBO);
 			if(!state) return;
 			// 同步订单状态
 			String orderNo = order.getOrderNo();
 			orderService.updateOrderSuccess(orderNo);
+			// 核销销售单据金额
+			billService.writeOffAmount(order.getId());
+		}catch (BusinessException e){
+			logger.info("订单 : {} 业务异常信息 : {}",order.getOrderNo(),e.getCode());
+		}catch (Exception e){
+			logger.info("订单 : {} 系统异常信息 : {}",order.getOrderNo(),e.getMessage());
+		}finally {
+			// 叠加查询次数
+			orderService.superPayCount(order.getId());
+		}
+	}
+
+	/**
+	 * 退款订单信息查询
+	 * @param date
+	 */
+	@Override
+	public void syncRefundInfo(Date date) {
+		// 获取退款未明确状态订单列表
+		List<RefundBO> refundBOList = refundService.queryRefund(date);
+		if(!Optional.ofNullable(refundBOList).isPresent()) return;
+		// 遍历查询第三方订单信息
+		refundBOList.forEach(o ->{
+			// FIXME 异步并列处理退款同步状态数据
+			refundService.queryRefundOrder(o);
+		});
 	}
 
 	// 参数检查

payment-base-app/src/main/java/com/base/springcloud/service/imp/RefundServiceImp.java

@@ -0,0 +1,181 @@
+package com.base.springcloud.service.imp;
+
+import com.base.springcloud.aspect.annotation.BusinessException;
+import com.base.springcloud.bo.MerchantConfigBO;
+import com.base.springcloud.bo.RefundBO;
+import com.base.springcloud.constant.ErrorConstant;
+import com.base.springcloud.constant.PaymentConstant;
+import com.base.springcloud.dao.RefundMapper;
+import com.base.springcloud.entity.Refund;
+import com.base.springcloud.service.*;
+import com.base.springcloud.util.DateUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+@Service
+public class RefundServiceImp implements RefundService {
+
+	private Logger logger = LoggerFactory.getLogger(RefundServiceImp.class);
+
+	@Autowired
+	private OrderService orderService;
+
+	@Autowired
+	private WecPaymentService wecPaymentService;
+
+	@Autowired
+	private RefundMapper refundMapper;
+
+	@Autowired
+	private BillService billService;
+
+	@Autowired
+	private MerchantService merchantService;
+
+	/**
+	 * 退款
+	 * @param refundBO
+	 */
+	@Override
+	public void refund(RefundBO refundBO) {
+		// RBS-退款金额获取 FIXME 金额暂定支付金额
+		billService.refundFront(refundBO);
+		// TODO 退款限制检查
+		// 查询原支付订单
+		orderService.origOrderCheck(refundBO);
+		// 商户支付信息配置
+		claimMerchantConfig(refundBO);
+		// 登记退款信息
+		registerRfund(refundBO);
+		// 发送微信退款
+		Boolean refundResult = wecPaymentService.wecRefund(refundBO);
+		// 同步退款信息
+		if(refundResult)
+			updateRefundSuccess(refundBO);
+		// TODO RBS-业务逻辑处理
+	}
+
+	/**
+	 * 商户支付信息查询
+	 * @param refundBO
+	 */
+	private void claimMerchantConfig(RefundBO refundBO) {
+		MerchantConfigBO merchantConfigBO = merchantService.claimMerchantConfig(refundBO.getMchId());
+		refundBO.setAppId(merchantConfigBO.getAppId());
+		refundBO.setMchPrivateKey(merchantConfigBO.getMchPrivateKey());
+		refundBO.setSerialNo(merchantConfigBO.getSerialNo());
+		refundBO.setCertificate(merchantConfigBO.getCertificate());
+	}
+
+	/**
+	 * 退款列表查询
+	 * @param date
+	 * @return
+	 */
+	@Override
+	public List<RefundBO> queryRefund(Date date) {
+		List<Refund> refundList = refundMapper.queryRefundData(date);
+		if(!Optional.ofNullable(refundList).isPresent())
+			return null;
+		return refundList.stream().map(o -> {
+			RefundBO refundBO = new RefundBO();
+			refundBO.setMchId(o.getMchId());
+			refundBO.setOrigOrderNo(o.getOrigOrderNo());
+			refundBO.setOrigCreateTime(o.getOrigOrderTime());
+			refundBO.setRefundNo(o.getRefundOrderNo());
+			return refundBO;
+		}).collect(Collectors.toList());
+	}
+
+	/**
+	 * 退款订单状态查询
+	 * @param refundBO
+	 */
+	@Override
+	public void queryRefundOrder(RefundBO refundBO) {
+		try{
+			// 参数检查
+			String refundOrderNo = Optional.ofNullable(refundBO).map(o->refundBO.getRefundNo()).orElse(null);
+			String mchId = Optional.ofNullable(refundBO).map(o->refundBO.getMchId()).orElse(null);
+			if(StringUtils.isBlank(refundOrderNo))
+				return;
+			if(StringUtils.isBlank(mchId))
+				return;
+			// 商户支付配置信息查询
+			claimMerchantConfig(refundBO);
+			// 微信退款查询
+			Boolean refundResult = wecPaymentService.wecRefundQuery(refundBO);
+			// 同步退款信息
+			if(refundResult)
+				updateRefundSuccess(refundBO);
+		}catch (BusinessException e){
+			logger.info("退款订单 : {} 业务异常信息 : {}",refundBO.getRefundNo(),e.getCode());
+		}catch (Exception e){
+			logger.info("退款订单 : {} 系统异常信息 : {}",refundBO.getRefundNo(),e.getMessage());
+		}finally {
+			// 叠加退款查询次数
+			superRefundCount(refundBO);
+		}
+	}
+
+	/**
+	 * 登记退款
+	 * @param refundBO
+	 */
+	private void registerRfund(RefundBO refundBO) {
+		Refund refund = new Refund();
+		refund.setId(UUID.randomUUID().toString().replace("-", ""));
+		refund.setCreateId(refundBO.getCreateId());
+		refund.setCreateTime(new Date());
+		refund.setReason(refundBO.getReason());
+		refund.setMchId(refundBO.getMchId());
+		refund.setRefundOrderNo(DateUtil.getDateString(25));
+		refund.setRefundTime(new Date());
+		refund.setRefundState(PaymentConstant.REFUND_WAIT);
+		refund.setRefundRetryCount(PaymentConstant.START_REFUND_COUNT);
+		refund.setOrigOrderNo(refundBO.getOrigOrderNo());
+		refund.setOrigOrderTime(refundBO.getOrigCreateTime());
+		// FIXME 原销售单据id
+		// refund.setSourceBillId();
+		int count = refundMapper.insert(refund);
+		if(count < 1)
+			throw  new BusinessException(ErrorConstant.REGISTER_REFUND_FAIL);
+		refundBO.setRefundNo(refund.getRefundOrderNo());
+	}
+
+	/**
+	 * 同步退款状态
+	 * @param refundBO
+	 */
+	private void updateRefundSuccess(RefundBO refundBO) {
+		Refund refund = new Refund();
+		refund.setRefundOrderNo(refundBO.getRefundNo());
+		refund.setRefundState(PaymentConstant.REFUND_SUCCESS);
+		int count = refundMapper.updateRefundSuccess(refund);
+		if(count < 1)
+			throw new BusinessException(ErrorConstant.SYNC_WEC_REFUND_STATE_FAIL);
+	}
+
+	/**
+	 * 叠加查询次数
+	 * @param refundBO
+	 */
+	private void superRefundCount(RefundBO refundBO) {
+		String refundId = Optional.ofNullable(refundBO).map(RefundBO::getRefundId).orElse(null);
+		if(StringUtils.isBlank(refundId))
+			return;
+		int count = refundMapper.superRefundCount(refundId);
+		if(count < 1)
+			throw new BusinessException(ErrorConstant.SUPER_REFUND_ORDER_COUNT_FAIL);
+	}
+
+}

payment-base-app/src/main/java/com/base/springcloud/service/imp/UserServiceImp.java

@@ -0,0 +1,45 @@
+package com.base.springcloud.service.imp;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.base.springcloud.aspect.annotation.BusinessException;
+import com.base.springcloud.constant.ErrorConstant;
+import com.base.springcloud.constant.PaymentConstant;
+import com.base.springcloud.dao.UserMapper;
+import com.base.springcloud.entity.User;
+import com.base.springcloud.service.UserService;
+import com.base.springcloud.util.JwtUtil;
+import com.base.springcloud.util.RedisUtil;
+import com.google.gson.JsonObject;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+import java.util.Optional;
+
+@Service
+public class UserServiceImp implements UserService {
+
+	@Autowired
+	private UserMapper userMapper;
+
+	/**
+	 * 获取用户信息
+	 * @param userName
+	 * @return
+	 */
+	@Override
+	@Cacheable(cacheNames="cache:pay:user", key="#userName")
+	public User getUser(String userName) {
+		User user = userMapper.getUser(userName);
+		if(!Optional.ofNullable(user).isPresent()){
+			throw new BusinessException(ErrorConstant.USER_ERROR);
+		}
+		// 判断用户状态
+		if (user.getStatus() != 1) {
+			throw new BusinessException(ErrorConstant.USER_LOCKING);
+		}
+		return user;
+	}
+}

payment-base-app/src/main/java/com/base/springcloud/service/imp/WecPaymentServiceImp.java

@@ -1,115 +1,114 @@
 package com.base.springcloud.service.imp;
 
+import com.alibaba.fastjson.JSONObject;
+import com.base.springcloud.bo.CodePayBO;
 import com.base.springcloud.bo.OrderBO;
+import com.base.springcloud.bo.RefundBO;
 import com.base.springcloud.constant.PaymentConstant;
 import com.base.springcloud.entity.Order;
+import com.base.springcloud.entity.WxpayRefundVo;
+import com.base.springcloud.entity.WxpayTradeVo;
+import com.base.springcloud.entity.WxpayTradeVo.WxTradeAmountVo;
 import com.base.springcloud.service.WecPaymentService;
 import com.base.springcloud.util.DateUtil;
-import com.base.springcloud.util.DecimalUtil;
-import com.hisun.iposm.HiCASignUtil2;
-import com.hisun.iposm.HiiposmUtil;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.text.StrBuilder;
+import com.base.springcloud.wxsdk.MyConfig;
+import com.base.springcloud.wxsdk.WXPay;
+import com.base.springcloud.wxsdk.WXPayUtil;
+import com.base.springcloud.wxsdk.WxpayUtils;
+import lombok.SneakyThrows;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 @Service
 public class WecPaymentServiceImp implements WecPaymentService {
 
-	Logger logger = LoggerFactory.getLogger(WecPaymentServiceImp.class);
+	private Logger logger = LoggerFactory.getLogger(WecPaymentServiceImp.class);
 
 	/**
-	 * Native支付
-	 *
+	 * 微信Native支付
 	 * @param orderBO
-	 * @return
 	 */
+	@SneakyThrows
 	@Override
-	public String nativePay(OrderBO orderBO) {
-		String res = "";
-		HiiposmUtil util = new HiiposmUtil();
-		String merchantId = orderBO.getMchId();
-		String privateKey = orderBO.getMchPrivateKey();
-		String req_url = "https://ipos.10086.cn/cps/cmpayService";
-		String type = "AggregPayAmt";
-		String version = "1.0.0";
-		String deviceInfo = "sb001";
-		String spbillCreateIp = "8.8.8.8";
-		String storeBrand = "RBS-MD";
-		String cityBranchNm = "RBS-PP";
-		String createDate = DateUtil.getYearMonthDay2();
-
-
-		// 签名数据
+	public String wecNativePay(OrderBO orderBO) {
 		Order order = orderBO.getOrder();
-		StringBuilder signDate = new StringBuilder();
-		signDate.append(PaymentConstant.CHARACTER_SET);
-		signDate.append(PaymentConstant.CALLBACK_URL);
-		signDate.append(PaymentConstant.NOTIFY_URL);
-		signDate.append(merchantId);
-		signDate.append(order.getRequestNo());
-		signDate.append(PaymentConstant.SIGN_TYPE);
-		signDate.append(type);
-		signDate.append(version);
-		signDate.append(DecimalUtil.stripTrailingZeros(orderBO.getSaleBill().getTotalAmount()));
-		signDate.append(createDate);
-		switch (order.getOrderType()) {
-			case PaymentConstant.WEC:
-				signDate.append(PaymentConstant.QRCWC);
-				break;
-			case PaymentConstant.AL:
-				signDate.append(PaymentConstant.QRCAL);
-				break;
-			case PaymentConstant.CP:
-				signDate.append(PaymentConstant.QRCCP);
-				break;
+		WxpayTradeVo wxpayTradeVo = new WxpayTradeVo();
+		wxpayTradeVo.setAppid(orderBO.getAppId());
+		wxpayTradeVo.setMchid(orderBO.getMchId());
+		wxpayTradeVo.setDescription(order.getGoodName());
+		wxpayTradeVo.setOut_trade_no(order.getOrderNo());
+		// FIXME 待定为商户系统||RBS系统回调接收
+		wxpayTradeVo.setNotify_url("https://www.weixin.qq.com/wxpay/pay.php");
+	    WxTradeAmountVo wxTradeAmountVo = new WxTradeAmountVo();
+		wxTradeAmountVo.setTotal(order.getOrderAmount());
+		wxpayTradeVo.setAmount(wxTradeAmountVo);
+		JSONObject jsonObject = WxpayUtils.getWxpay(
+				wxpayTradeVo,
+				PaymentConstant.NATIVE,
+				orderBO.getMchPrivateKey(),
+				orderBO.getCertificate(),
+				orderBO.getSerialNo());
+		logger.info("Native支付订单 ：{} 接收响应数据 ：{}",order.getOrderNo(),jsonObject.toString());
+		return jsonObject.get("code_url").toString();
 	}
-		signDate.append(order.getOrderNo());
-		signDate.append(order.getGoodName());
-		signDate.append(order.getReserved());
-		logger.warn("signData:{}", signDate.toString());
-		try {
-			HiCASignUtil2 rsa = new HiCASignUtil2(privateKey, "111");
-			StrBuilder requestParam = new StrBuilder();
-			requestParam.append("hmac=").append(rsa.sign(signDate.toString()));
-			requestParam.append("&characterSet=").append(PaymentConstant.CHARACTER_SET);
-			requestParam.append("&callbackUrl=").append(PaymentConstant.CALLBACK_URL);
-			requestParam.append("&notifyUrl=").append(PaymentConstant.NOTIFY_URL);
-			requestParam.append("&merchantId=").append(merchantId);
-			requestParam.append("&requestId=").append(order.getRequestNo());
-			requestParam.append("&signType=").append(PaymentConstant.SIGN_TYPE);
-			requestParam.append("&type=").append(type);
-			requestParam.append("&version=").append(version);
-			requestParam.append("&amount=").append(DecimalUtil.stripTrailingZeros(orderBO.getSaleBill().getTotalAmount()));
-			requestParam.append("&orderDate=").append(createDate);
-			requestParam.append("&payWay=");
-			switch (order.getOrderType()) {
-				case PaymentConstant.WEC:
-					requestParam.append(PaymentConstant.QRCWC);
-					break;
-				case PaymentConstant.AL:
-					requestParam.append(PaymentConstant.QRCAL);
-					break;
-				case PaymentConstant.CP:
-					requestParam.append(PaymentConstant.QRCCP);
-					break;
+
+	/**
+	 * 微信APIv3退款
+	 * @param refundBO
+	 */
+	@Override
+	public Boolean wecRefund(RefundBO refundBO) {
+		WxpayRefundVo wxpayRefundVo = new WxpayRefundVo();
+		wxpayRefundVo.setReason(refundBO.getReason());
+		wxpayRefundVo.setNotify_url("https://www.weixin.qq.com/wxpay/pay.php");
+		wxpayRefundVo.setOut_trade_no(refundBO.getOrigOrderNo());
+		wxpayRefundVo.setOut_refund_no(refundBO.getRefundNo());
+		WxpayRefundVo.WxRefundAmountVo wxRefundAmountVo = new WxpayRefundVo.WxRefundAmountVo();
+		wxRefundAmountVo.setTotal(refundBO.getRefundAmount());
+		wxRefundAmountVo.setRefund(refundBO.getRefundAmount());
+		wxpayRefundVo.setAmount(wxRefundAmountVo);
+		String refundRsp = WxpayUtils.refund(wxpayRefundVo,refundBO.getMchId(),refundBO.getMchPrivateKey(),refundBO.getCertificate(),refundBO.getSerialNo());
+		JSONObject jsonObject = JSONObject.parseObject(refundRsp);
+		return PaymentConstant.WX_SUCCESS.equals(jsonObject.getString("status"));
 	}
-			requestParam.append("&orderId=").append(order.getOrderNo());
-			requestParam.append("&productName=").append(order.getGoodName());
-			requestParam.append("&reserved1=").append(order.getReserved());
-			requestParam.append("&deviceInfo=").append(deviceInfo);
-			requestParam.append("&spbillCreateIp=").append(spbillCreateIp);
-			requestParam.append("&storeBrand=").append(storeBrand);
-			requestParam.append("&cityBranchNm=").append(cityBranchNm);
-			res = util.sendAndRecv(req_url, requestParam.toString(), PaymentConstant.CHARACTER_SET);
-			logger.info("Native支付下单参数响应: {}" , res);
+
+	/**
+	 * 微信付款码支付
+	 * @param codePayBO
+	 */
+	@Override
+	public void codePay(CodePayBO codePayBO) {
+		String appId = codePayBO.getAppId();
+		String mchId = codePayBO.getMchId();
+		String key = codePayBO.getMchPrivateKey();
+		String certificate = codePayBO.getCertificate();
+		MyConfig config = new MyConfig(appId,mchId,key,certificate);
+		WXPay wxPay = new WXPay(config);
+		Map<String, String> data = new HashMap();
+		//公众账号ID (微信分配的公众账号ID（企业号corpid即为此appId）)
+		data.put("appid", "wxa91984b310053c3d");
+		//商户号 (微信支付分配的商户号)
+		data.put("mch_id", "1610494969");
+		data.put("device_info", "sb0001");
+		//商品描述 (商品简单描述，该字段须严格按照规范传递) 店名-销售商品类目 例 小张南山店-超市
+		data.put("body", "Image形象店-深圳腾大-QQ公仔");
+		//商户系统内部订单号，要求32个字符内，只能是数字、大小写字母_-|*且在同一个商户号下唯一
+		data.put("out_trade_no", DateUtil.getDateString(25));
+		//订单总金额，单位为分，只能为整数
+		data.put("total_fee", "1");
+		data.put("auth_code", "135080797699902868");
+		data.put("spbill_create_ip", "8.8.8.8");
+		try {
+			//付款码 (扫码支付付款码，设备读取用户微信中的条码或者二维码信息（注：用户付款码条形码规则：18位纯数字，以10、11、12、13、14、15开头）)
+			data.put("sign", WXPayUtil.generateSignature(data,"yDXt3Jczcs2dSKvwUxGkYYfHzCe8SXtY"));
+			Map<String, String> responseMap = wxPay.microPay(data);
 		}catch (Exception e){
 			e.printStackTrace();
 		}
-		return StringUtils.isNotBlank(res) ? util.getValue(res, "sessionId") : "";
 	}
 
 	/**
@@ -121,51 +120,19 @@ public class WecPaymentServiceImp implements WecPaymentService {
 	@Override
 	public Boolean orderResult(OrderBO orderBO) {
 		Order order = orderBO.getOrder();
-		String orderId = order.getOrderNo();
-		String req_url = "https://ipos.10086.cn/cps/cmpayService";
-		String type = "AggregQueryCPS";
-		String version = "1.0.0";
-		String reserved = order.getReserved();
-		String signType = PaymentConstant.SIGN_TYPE;
-		String requestId = DateUtil.getDateString(25);
-		String merchantId = order.getMchId();
-		String privateKey = orderBO.getMchPrivateKey();
-		String characterSet = PaymentConstant.CHARACTER_SET;
-
-		StringBuilder signData = new StringBuilder();
-		signData.append(merchantId);
-		signData.append(requestId);
-		signData.append(signType);
-		signData.append(type);
-		signData.append(version);
-		signData.append(orderId);
-		signData.append(reserved);
-		try {
-			StrBuilder requestParam = new StrBuilder();
-			HiCASignUtil2 rsa = new HiCASignUtil2(privateKey, "111");
-			requestParam.append("hmac=").append(rsa.sign(signData.toString()));
-			requestParam.append("&characterSet=").append(PaymentConstant.CHARACTER_SET);
-			requestParam.append("&merchantId=").append(merchantId);
-			requestParam.append("&requestId=").append(requestId);
-			requestParam.append("&signType=").append(signType);
-			requestParam.append("&type=").append(type);
-			requestParam.append("&version=").append(version);
-			requestParam.append("&orderId=").append(orderId);
-			requestParam.append("&reserved1=").append(reserved);
-
-			HiiposmUtil util = new HiiposmUtil();
-			String res = util.sendAndRecv(req_url, requestParam.toString(), characterSet);
-			logger.info("订单: {} 查询参数响应: {}",order.getOrderNo(),res);
-			if(util.getValue(res, "status").equals("SUCCESS")){
-				return true;
-			}
-			return false;
-		} catch (IOException e) {
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return false;
+		String url = PaymentConstant.WX_ORDER_PAY_URL + order.getOrderNo() + "?mchid=" + order.getMchId();
+		return WxpayUtils.queryWxOrder(PaymentConstant.PAY_ORDER,url,orderBO.getMchId(),orderBO.getMchPrivateKey(),orderBO.getCertificate(),orderBO.getSerialNo());
 	}
 
+	/**
+	 * 微信退款查询
+	 * @param refundBO
+	 * @return
+	 */
+	@Override
+	public Boolean wecRefundQuery(RefundBO refundBO) {
+		String refundNo = refundBO.getRefundNo();
+		String url = PaymentConstant.WX_ORDER_REFUND_URL + refundNo;
+		return WxpayUtils.queryWxOrder(PaymentConstant.REFUND_ORDER,url,refundBO.getMchId(),refundBO.getMchPrivateKey(),refundBO.getCertificate(),refundBO.getSerialNo());
+	}
 }

payment-base-app/src/main/java/com/base/springcloud/util/CommonUtils.java

@@ -0,0 +1,431 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by Fernflower decompiler)
+//
+
+package com.base.springcloud.util;
+
+//import org.jeecgframework.minidao.util.MiniDaoUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+//import javax.sql.DataSource;
+import java.lang.reflect.Array;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+public class CommonUtils {
+    private static final Logger log = LoggerFactory.getLogger(CommonUtils.class);
+    public static ThreadLocal<SimpleDateFormat> dateFormat = new ThreadLocal<SimpleDateFormat>() {
+        protected SimpleDateFormat initialValue() {
+            return new SimpleDateFormat("yyyy-MM-dd");
+        }
+    };
+    public static ThreadLocal<SimpleDateFormat> dateTimeFormat = new ThreadLocal<SimpleDateFormat>() {
+        protected SimpleDateFormat initialValue() {
+            return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        }
+    };
+    private static String DB_TYPE = "";
+
+    public CommonUtils() {
+    }
+
+    public static String getCurrentDateTimeString(Date now) {
+        if (now == null) {
+            now = new Date();
+        }
+
+        return ((SimpleDateFormat)dateTimeFormat.get()).format(now);
+    }
+
+    public static String getCurrentDateString(Date now) {
+        if (now == null) {
+            now = new Date();
+        }
+
+        return ((SimpleDateFormat)dateFormat.get()).format(now);
+    }
+
+    public static String getFileName(String fileName) {
+        int var1 = fileName.lastIndexOf(47);
+        int var2 = fileName.lastIndexOf(92);
+        int var3 = var2 > var1 ? var2 : var1;
+        if (var3 != -1) {
+            fileName = fileName.substring(var3 + 1);
+        }
+
+        fileName = fileName.replace("=", "").replace(",", "").replace("&", "").replace("#", "");
+        String var4 = "[`_《》~!@%^&*()+=|{}':;',\\[\\]<>?~！@#￥%……&*（）——+|{}【】‘；：”“’。，、？]";
+        Pattern var5 = Pattern.compile(var4);
+        Matcher var6 = var5.matcher(fileName);
+        return var6.replaceAll("").trim();
+    }
+
+    public static String upload(MultipartFile file, String bizPath, String uploadType) {
+        String var3 = "";
+        if ("minio".equals(uploadType)) {
+            var3 = MinioUtil.upload(file, bizPath);
+        } else {
+            var3 = OssBootUtil.upload(file, bizPath);
+        }
+
+        return var3;
+    }
+
+    public static String upload(MultipartFile file, String bizPath, String uploadType, String customBucket) {
+        String var4 = "";
+        if ("minio".equals(uploadType)) {
+            var4 = MinioUtil.upload(file, bizPath, customBucket);
+        } else {
+            var4 = OssBootUtil.upload(file, bizPath, customBucket);
+        }
+
+        return var4;
+    }
+
+    /*public static String getDatabaseType() {
+        if (oConvertUtils.isNotEmpty(DB_TYPE)) {
+            return DB_TYPE;
+        } else {
+            try {
+                DataSource var0 = (DataSource)JimuSpringContextUtils.getApplicationContext().getBean(DataSource.class);
+                return MiniDaoUtil.getDbType(var0);
+            } catch (Exception var1) {
+                log.warn(var1.getMessage(), var1);
+                return "";
+            }
+        }
+    }*/
+
+    /*public static Integer getIntParameter(String params, Integer def) {
+        HttpServletRequest var2 = JimuSpringContextUtils.getHttpServletRequest();
+        String var3 = var2.getParameter(params);
+        return isNotEmpty(var3) ? Integer.parseInt(var3.toString()) : def;
+    }*/
+
+    public static Integer getIntParameter(HttpServletRequest request, String params, Integer def) {
+        String var3 = request.getParameter(params);
+        return isNotEmpty(var3) ? Integer.parseInt(var3.toString()) : def;
+    }
+
+    public static String filter(String str) throws PatternSyntaxException {
+        String var1 = "[`_《》~!@#$%^&*()+=|{}':;',\\[\\].<>?~！@#￥%……&*（）——+|{}【】‘；：”“’。，、？]";
+        Pattern var2 = Pattern.compile(var1);
+        Matcher var3 = var2.matcher(str);
+        return var3.replaceAll("").trim();
+    }
+
+    public static boolean anyOneIsNull(Object... objs) {
+        int var1 = objs.length;
+
+        for(int var2 = 0; var2 < var1; ++var2) {
+            Object var3 = objs[var2];
+            if (isEmpty(var3)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public static boolean anyOneIsNotNull(Object... objs) {
+        int var1 = objs.length;
+
+        for(int var2 = 0; var2 < var1; ++var2) {
+            Object var3 = objs[var2];
+            if (isNotEmpty(var3)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public static boolean allIsNull(Object... objs) {
+        int var1 = objs.length;
+        int var2 = 0;
+
+        for(int var3 = 0; var3 < var1; ++var3) {
+            Object var4 = objs[var3];
+            if (isEmpty(var4)) {
+                ++var2;
+            }
+        }
+
+        if (var2 == var1) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public static <T> Long[] listToLong(List<T> list) {
+        Long[] var1 = (Long[])list.toArray(new Long[list.size()]);
+        return var1;
+    }
+
+    public static Boolean gt(BigDecimal v1, BigDecimal v2) {
+        Boolean var2 = false;
+        if (v1.compareTo(v2) == 1) {
+            var2 = true;
+        }
+
+        return var2;
+    }
+
+    public static Boolean ge(BigDecimal v1, BigDecimal v2) {
+        Boolean var2 = false;
+        if (v1.compareTo(v2) == 1) {
+            var2 = true;
+        }
+
+        if (v1.compareTo(v2) == 0) {
+            var2 = true;
+        }
+
+        return var2;
+    }
+
+    public static Boolean lt(BigDecimal v1, BigDecimal v2) {
+        Boolean var2 = false;
+        if (v1.compareTo(v2) == -1) {
+            var2 = true;
+        }
+
+        return var2;
+    }
+
+    public static Boolean eq(BigDecimal v1, BigDecimal v2) {
+        Boolean var2 = false;
+        if (isNotEmpty(v1) && v1.compareTo(v2) == 0) {
+            var2 = true;
+        }
+
+        return var2;
+    }
+
+    public static Boolean le(BigDecimal v1, BigDecimal v2) {
+        Boolean var2 = false;
+        if (isNotEmpty(v1)) {
+            if (v1.compareTo(v2) == -1) {
+                var2 = true;
+            }
+
+            if (v1.compareTo(v2) == 0) {
+                var2 = true;
+            }
+        }
+
+        return var2;
+    }
+
+    public static Boolean gtzero(BigDecimal v) {
+        Boolean var1 = false;
+        if (isNotEmpty(v) && v.doubleValue() > 0.0D) {
+            var1 = true;
+        }
+
+        return var1;
+    }
+
+    public static Boolean gezero(BigDecimal v) {
+        Boolean var1 = false;
+        if (isNotEmpty(v) && (v.compareTo(BigDecimal.ZERO) == 0 || v.compareTo(BigDecimal.ZERO) == 1)) {
+            var1 = true;
+        }
+
+        return var1;
+    }
+
+    public static Boolean eqzero(BigDecimal v) {
+        Boolean var1 = false;
+        if (isNotEmpty(v) && v.compareTo(BigDecimal.ZERO) == 0) {
+            var1 = true;
+        }
+
+        return var1;
+    }
+
+    public static Boolean nezero(BigDecimal v) {
+        Boolean var1 = true;
+        if (isNotEmpty(v) && v.compareTo(BigDecimal.ZERO) == 0) {
+            var1 = false;
+        }
+
+        return var1;
+    }
+
+    public static Boolean ltzero(BigDecimal v) {
+        Boolean var1 = false;
+        if (isNotEmpty(v) && v.doubleValue() < 0.0D) {
+            var1 = true;
+        }
+
+        return var1;
+    }
+
+    public static Boolean lezero(BigDecimal v) {
+        Boolean var1 = false;
+        if (isNotEmpty(v)) {
+            if (v.compareTo(BigDecimal.ZERO) == 0) {
+                var1 = true;
+            }
+
+            if (v.compareTo(BigDecimal.ZERO) == -1) {
+                var1 = true;
+            }
+        }
+
+        return var1;
+    }
+
+    public static boolean contains(String[] stringArray, String source) {
+        List var2 = Arrays.asList(stringArray);
+        return var2.contains(source);
+    }
+
+    public static boolean contains(List<String> stringArray, String source) {
+        return stringArray.contains(source);
+    }
+
+    public static boolean allNotNull(Object... obj) {
+        return !anyOneIsNull(obj);
+    }
+
+    public static boolean isNotEmpty(Object obj) {
+        return !isEmpty(obj);
+    }
+
+    public static boolean isEmpty(Object obj) {
+        if (obj == null) {
+            return true;
+        } else if (obj.getClass().isArray()) {
+            return Array.getLength(obj) == 0;
+        } else if (obj instanceof CharSequence) {
+            return ((CharSequence)obj).length() == 0;
+        } else if (obj instanceof String) {
+            return ((String)obj).trim().equals("");
+        } else if (obj instanceof Collection) {
+            return ((Collection)obj).isEmpty();
+        } else {
+            return obj instanceof Map ? ((Map)obj).isEmpty() : false;
+        }
+    }
+
+    public static String renamePic(String fileName) {
+        String var1 = fileName.substring(fileName.lastIndexOf("."));
+        return UUID.randomUUID().toString().replace("-", "") + var1;
+    }
+
+    public static BigDecimal getBigDecimal(BigDecimal v, String def) {
+        return isEmpty(v) ? new BigDecimal(def) : v;
+    }
+
+    public static BigDecimal getBigDecimal(BigDecimal v, BigDecimal def) {
+        return isEmpty(v) ? def : v;
+    }
+
+    public static String getString(String v) {
+        return isEmpty(v) ? "" : v;
+    }
+
+    public static String getString(String v, String defval) {
+        return isEmpty(v) ? defval : v;
+    }
+
+    public static Integer getInteger(Integer v, Integer defval) {
+        return isEmpty(v) ? defval : v;
+    }
+
+    public static Integer getInteger(String v, Integer defval) {
+        return isEmpty(v) ? defval : Integer.parseInt(v);
+    }
+
+    public static String chineseNumber2Int(String chineseNumber) {
+        String[] var1 = new String[]{"零", "一", "二", "三", "四", "五", "六", "七", "八", "九"};
+        String[] var2 = new String[]{"十", "百", "千", "万", "十", "百", "千", "亿", "十", "百", "千"};
+        String var3 = "";
+        int var4 = chineseNumber.length();
+
+        for(int var5 = 0; var5 < var4; ++var5) {
+            int var6 = chineseNumber.charAt(var5) - 48;
+            if (var5 != var4 - 1 && var6 != 0) {
+                var3 = var3 + var1[var6] + var2[var4 - 2 - var5];
+            } else {
+                var3 = var3 + var1[var6];
+            }
+
+            System.out.println("  " + var3);
+        }
+
+        return var3;
+    }
+
+    public static String getAlias(String tableName) {
+        String[] var1 = tableName.split("_");
+        String var2 = "";
+        if (var1.length > 2) {
+            String[] var3 = var1;
+            int var4 = var1.length;
+
+            for(int var5 = 0; var5 < var4; ++var5) {
+                String var6 = var3[var5];
+                var2 = var2 + var6.substring(0, 1);
+            }
+        } else {
+            var2 = var1[var1.length - 1];
+        }
+
+        return var2;
+    }
+
+    public static String string2Unicode(String string) {
+        String var1 = "";
+        if (isNotEmpty(string)) {
+            StringBuffer var2 = new StringBuffer();
+
+            for(int var3 = 0; var3 < string.length(); ++var3) {
+                char var4 = string.charAt(var3);
+                var2.append("\\u" + Integer.toHexString(var4));
+            }
+
+            var1 = var2.toString();
+        }
+
+        return var1;
+    }
+
+    public static Long[] StringArray2LongArray(String[] stringArray) {
+        ArrayList var1 = new ArrayList();
+        String[] var2 = stringArray;
+        int var3 = stringArray.length;
+
+        for(int var4 = 0; var4 < var3; ++var4) {
+            String var5 = var2[var4];
+
+            try {
+                var1.add(Long.parseLong(var5));
+            } catch (NumberFormatException var7) {
+                var7.printStackTrace();
+            }
+        }
+
+        Long[] var8 = (Long[])var1.toArray(new Long[var1.size()]);
+        return var8;
+    }
+
+    public static String getString(Object obj, String def) {
+        return oConvertUtils.isNotEmpty(obj) ? obj.toString() : def;
+    }
+
+    public static Long getLong(Object obj, Long def) {
+        return oConvertUtils.isNotEmpty(obj) ? Long.parseLong(obj.toString()) : def;
+    }
+}

payment-base-app/src/main/java/com/base/springcloud/util/DecimalUtil.java

@@ -1,9 +1,12 @@
 package com.base.springcloud.util;
 
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 
 public class DecimalUtil {
 
+	private DecimalFormat df = new DecimalFormat("#.00");
+
 	/**
 	 * 加法计算（result = x + y）
 	 *

payment-base-app/src/main/java/com/base/springcloud/util/FtpUtil.java

@@ -1,71 +0,0 @@
-package com.base.springcloud.util;
-
-import org.apache.commons.net.ftp.FTPClient;
-import org.apache.commons.net.ftp.FTPReply;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-@Component
-public class FtpUtil {
-
-	Logger logger = LoggerFactory.getLogger(FtpUtil.class);
-
-	//ftp服务器ip地址
-	@Value("${ftp.ftp_ip}")
-	private String FTP_ADDRESS;
-	//端口号
-	@Value("${ftp.ftp_prot}")
-	private int FTP_PORT;
-	//用户名
-	@Value("${ftp.ftp_username}")
-	private String FTP_USERNAME;
-	//密码
-	@Value("${ftp.ftp_password}")
-	private String FTP_PASSWORD;
-
-	//路径都是/home/加上用户名
-	@Value("${ftp.ftp_basepath}")
-	public String FTP_BASEPATH;
-
-
-	// 文件上传
-	public boolean uploadFile(String originFileName, InputStream input) {
-		//这是最开始引入的依赖里的方法
-		FTPClient ftp = new FTPClient();
-		ftp.setControlEncoding("utf-8");
-		try {
-			int reply;
-			ftp.connect(FTP_ADDRESS, FTP_PORT);// 连接FTP服务器
-			ftp.login(FTP_USERNAME, FTP_PASSWORD);// 登录
-			reply = ftp.getReplyCode();//连接成功会的到一个返回状态码
-			System.out.println(reply);//可以输出看一下是否连接成功
-			ftp.setFileType(FTPClient.BINARY_FILE_TYPE);//设置文件类型
-			ftp.changeWorkingDirectory(FTP_BASEPATH);//修改操作空间
-			//对了这里说明一下你所操作的文件夹必须要有可读权限，chomd 777 文件夹名//这里我就是用的我的home文件夹
-			ftp.storeFile(originFileName, input);
-			if (!FTPReply.isPositiveCompletion(reply)) {
-				logger.warn("ftp connect fail....");
-				ftp.disconnect();
-				return false;
-			}
-			input.close();
-			ftp.logout();
-			return true;
-		}catch (Exception e){
-			e.printStackTrace();
-		}finally {
-			if (ftp.isConnected()) {
-				try {
-					ftp.disconnect();
-				} catch (IOException ioe) {
-				}
-			}
-		}
-		return false;
-	}
-}

payment-base-app/src/main/java/com/base/springcloud/util/JwtUtil.java

@@ -0,0 +1,101 @@
+package com.base.springcloud.util;
+
+import com.auth0.jwt.JWT;
+import com.auth0.jwt.JWTVerifier;
+import com.auth0.jwt.algorithms.Algorithm;
+import com.auth0.jwt.exceptions.JWTDecodeException;
+import com.auth0.jwt.interfaces.DecodedJWT;
+
+import java.util.Date;
+
+/**
+ * @Author Scott
+ * @Date 2018-07-12 14:23
+ * @Desc JWT工具类
+ **/
+public class JwtUtil {
+
+	/**
+	 * Token过期时间30分钟（用户登录过期时间是此时间的两倍，以token在reids缓存时间为准）
+	 */
+	public static final long EXPIRE_TIME = 30 * 60 * 1000;
+
+	/**
+	 * 校验token是否正确
+	 *
+	 * @param token  密钥
+	 * @param secret 用户的密码
+	 * @return 是否正确
+	 */
+	public static boolean verify(String token, String username, String secret) {
+		try {
+			// 根据密码生成JWT效验器
+			Algorithm algorithm = Algorithm.HMAC256(secret);
+			JWTVerifier verifier = JWT.require(algorithm).withClaim("username", username).build();
+			// 效验TOKEN
+			DecodedJWT jwt = verifier.verify(token);
+			return true;
+		} catch (Exception exception) {
+			return false;
+		}
+	}
+
+	/**
+	 * 获得token中的信息无需secret解密也能获得
+	 *
+	 * @return token中包含的用户名
+	 */
+	public static String getUsername(String token) {
+		try {
+			DecodedJWT jwt = JWT.decode(token);
+			return jwt.getClaim("username").asString();
+		} catch (JWTDecodeException e) {
+			return null;
+		}
+	}
+
+	/**
+	 * 获得token中的信息无需secret解密也能获得
+	 *
+	 * @return token中包含的用户名
+	 */
+	public static String getPlatform(String token) {
+		try {
+			DecodedJWT jwt = JWT.decode(token);
+			return jwt.getClaim("platform").asString();
+		} catch (JWTDecodeException e) {
+			return null;
+		}
+	}
+
+	/**
+	 * 生成签名,5min后过期
+	 *
+	 * @param username 用户名
+	 * @param secret   用户的密码
+	 * @return 加密的token
+	 */
+	public static String sign(String username, String secret) {
+		Date date = new Date(System.currentTimeMillis() + EXPIRE_TIME);
+		Algorithm algorithm = Algorithm.HMAC256(secret);
+		// 附带username信息
+		return JWT.create().withClaim("username", username).withExpiresAt(date).sign(algorithm);
+
+	}
+
+	/**
+	 * 生成签名,5min后过期
+	 *
+	 * @param username 用户名
+	 * @param secret   用户的密码
+	 * @return 加密的token
+	 */
+	public static String sign(String username, String secret,String platform) {
+		Date date = new Date(System.currentTimeMillis() + EXPIRE_TIME);
+		Algorithm algorithm = Algorithm.HMAC256(secret);
+		// 附带username信息
+		return JWT.create().withClaim("username", username).withClaim("platform",platform).withExpiresAt(date).sign(algorithm);
+	}
+
+
+}

payment-base-app/src/main/java/com/base/springcloud/util/MinioUtil.java

@@ -0,0 +1,160 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by Fernflower decompiler)
+//
+
+package com.base.springcloud.util;
+
+import io.minio.*;
+import io.minio.BucketExistsArgs.Builder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.InputStream;
+import java.net.URLDecoder;
+
+public class MinioUtil {
+    private static final Logger log = LoggerFactory.getLogger(MinioUtil.class);
+    private static String minioUrl;
+    private static String minioName;
+    private static String minioPass;
+    private static String bucketName;
+    private static MinioClient minioClient = null;
+
+    public MinioUtil() {
+    }
+
+    public static void setMinioUrl(String minioUrl) {
+        MinioUtil.minioUrl = minioUrl;
+    }
+
+    public static void setMinioName(String minioName) {
+        MinioUtil.minioName = minioName;
+    }
+
+    public static void setMinioPass(String minioPass) {
+        MinioUtil.minioPass = minioPass;
+    }
+
+    public static void setBucketName(String bucketName) {
+        MinioUtil.bucketName = bucketName;
+    }
+
+    public static String getMinioUrl() {
+        return minioUrl;
+    }
+
+    public static String getBucketName() {
+        return bucketName;
+    }
+
+    public static String upload(MultipartFile file, String bizPath, String customBucket) {
+        String var3 = "";
+        bizPath = CommonUtils.filter(bizPath);
+        String var4 = bucketName;
+        if (oConvertUtils.isNotEmpty(customBucket)) {
+            var4 = customBucket;
+        }
+
+        try {
+            initMinio(minioUrl, minioName, minioPass);
+            if (minioClient.bucketExists((BucketExistsArgs)((Builder)BucketExistsArgs.builder().bucket(var4)).build())) {
+                log.debug("Bucket already exists.");
+            } else {
+                minioClient.makeBucket((MakeBucketArgs)((io.minio.MakeBucketArgs.Builder)MakeBucketArgs.builder().bucket(var4)).build());
+                log.debug("create a new bucket.");
+            }
+
+            InputStream var5 = file.getInputStream();
+            String var6 = file.getOriginalFilename();
+            if ("".equals(var6)) {
+                var6 = file.getName();
+            }
+
+            var6 = CommonUtils.getFileName(var6);
+            String var7 = bizPath + "/" + var6.substring(0, var6.lastIndexOf(".")) + "_" + System.currentTimeMillis() + var6.substring(var6.indexOf("."));
+            if (var7.startsWith("/")) {
+                var7 = var7.substring(1);
+            }
+
+            PutObjectArgs var8 = (PutObjectArgs)((io.minio.PutObjectArgs.Builder)((io.minio.PutObjectArgs.Builder)PutObjectArgs.builder().object(var7)).bucket(var4)).contentType("application/octet-stream").stream(var5, (long)var5.available(), -1L).build();
+            minioClient.putObject(var8);
+            var5.close();
+            var3 = minioUrl + var4 + "/" + var7;
+        } catch (Exception var9) {
+            log.error(var9.getMessage(), var9);
+        }
+
+        return var3;
+    }
+
+    public static String upload(MultipartFile file, String bizPath) {
+        return upload(file, bizPath, (String)null);
+    }
+
+    public static InputStream getMinioFile(String bucketName, String objectName) {
+        GetObjectResponse var2 = null;
+
+        try {
+            initMinio(minioUrl, minioName, minioPass);
+            GetObjectArgs var3 = (GetObjectArgs)((io.minio.GetObjectArgs.Builder)((io.minio.GetObjectArgs.Builder)GetObjectArgs.builder().object(objectName)).bucket(bucketName)).build();
+            var2 = minioClient.getObject(var3);
+        } catch (Exception var4) {
+            log.error("文件获取失败" + var4.getMessage(), var4);
+        }
+
+        return var2;
+    }
+
+    public static void removeObject(String bucketName, String objectName) {
+        try {
+            initMinio(minioUrl, minioName, minioPass);
+            RemoveObjectArgs var2 = (RemoveObjectArgs)((io.minio.RemoveObjectArgs.Builder)((io.minio.RemoveObjectArgs.Builder)RemoveObjectArgs.builder().object(objectName)).bucket(bucketName)).build();
+            minioClient.removeObject(var2);
+        } catch (Exception var3) {
+            log.error("文件删除失败" + var3.getMessage(), var3);
+        }
+
+    }
+
+    public static String getObjectURL(String bucketName, String objectName, Integer expires) {
+        initMinio(minioUrl, minioName, minioPass);
+
+        try {
+            GetPresignedObjectUrlArgs var3 = (GetPresignedObjectUrlArgs)((io.minio.GetPresignedObjectUrlArgs.Builder)((io.minio.GetPresignedObjectUrlArgs.Builder)GetPresignedObjectUrlArgs.builder().object(objectName)).bucket(bucketName)).expiry(expires).build();
+            String var4 = minioClient.getPresignedObjectUrl(var3);
+            return URLDecoder.decode(var4, "UTF-8");
+        } catch (Exception var5) {
+            log.error("文件路径获取失败" + var5.getMessage(), var5);
+            return null;
+        }
+    }
+
+    private static MinioClient initMinio(String minioUrl, String minioName, String minioPass) {
+        if (minioClient == null) {
+            try {
+                minioClient = MinioClient.builder().endpoint(minioUrl).credentials(minioName, minioPass).build();
+            } catch (Exception var4) {
+                var4.printStackTrace();
+            }
+        }
+
+        return minioClient;
+    }
+
+    public static String upload(InputStream stream, String relativePath) throws Exception {
+        initMinio(minioUrl, minioName, minioPass);
+        if (minioClient.bucketExists((BucketExistsArgs)((Builder)BucketExistsArgs.builder().bucket(bucketName)).build())) {
+            log.debug("Bucket already exists.");
+        } else {
+            minioClient.makeBucket((MakeBucketArgs)((io.minio.MakeBucketArgs.Builder)MakeBucketArgs.builder().bucket(bucketName)).build());
+            log.debug("create a new bucket.");
+        }
+
+        PutObjectArgs var2 = (PutObjectArgs)((io.minio.PutObjectArgs.Builder)((io.minio.PutObjectArgs.Builder)PutObjectArgs.builder().object(relativePath)).bucket(bucketName)).contentType("application/octet-stream").stream(stream, (long)stream.available(), -1L).build();
+        minioClient.putObject(var2);
+        stream.close();
+        return minioUrl + bucketName + "/" + relativePath;
+    }
+}

payment-base-app/src/main/java/com/base/springcloud/util/OssBootUtil.java

@@ -0,0 +1,254 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by Fernflower decompiler)
+//
+
+package com.base.springcloud.util;
+
+import com.aliyun.oss.ClientConfiguration;
+import com.aliyun.oss.OSSClient;
+import com.aliyun.oss.common.auth.DefaultCredentialProvider;
+import com.aliyun.oss.model.CannedAccessControlList;
+import com.aliyun.oss.model.OSSObject;
+import com.aliyun.oss.model.PutObjectResult;
+import org.apache.tomcat.util.http.fileupload.FileItemStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.util.Date;
+import java.util.UUID;
+
+public class OssBootUtil {
+    private static final Logger log = LoggerFactory.getLogger(OssBootUtil.class);
+    private static String endPoint;
+    private static String accessKeyId;
+    private static String accessKeySecret;
+    private static String bucketName;
+    private static String staticDomain;
+    private static OSSClient ossClient = null;
+
+    public OssBootUtil() {
+    }
+
+    public static void setEndPoint(String endPoint) {
+        OssBootUtil.endPoint = endPoint;
+    }
+
+    public static void setAccessKeyId(String accessKeyId) {
+        OssBootUtil.accessKeyId = accessKeyId;
+    }
+
+    public static void setAccessKeySecret(String accessKeySecret) {
+        OssBootUtil.accessKeySecret = accessKeySecret;
+    }
+
+    public static void setBucketName(String bucketName) {
+        OssBootUtil.bucketName = bucketName;
+    }
+
+    public static void setStaticDomain(String staticDomain) {
+        OssBootUtil.staticDomain = staticDomain;
+    }
+
+    public static String getStaticDomain() {
+        return staticDomain;
+    }
+
+    public static String getEndPoint() {
+        return endPoint;
+    }
+
+    public static String getAccessKeyId() {
+        return accessKeyId;
+    }
+
+    public static String getAccessKeySecret() {
+        return accessKeySecret;
+    }
+
+    public static String getBucketName() {
+        return bucketName;
+    }
+
+    public static OSSClient getOssClient() {
+        return ossClient;
+    }
+
+    public static String upload(MultipartFile file, String fileDir, String customBucket) {
+        String var3 = null;
+        initOSS(endPoint, accessKeyId, accessKeySecret);
+        StringBuilder var4 = new StringBuilder();
+        String var5 = bucketName;
+        if (oConvertUtils.isNotEmpty(customBucket)) {
+            var5 = customBucket;
+        }
+
+        try {
+            if (!ossClient.doesBucketExist(var5)) {
+                ossClient.createBucket(var5);
+            }
+
+            String var6 = file.getOriginalFilename();
+            if ("" == var6) {
+                var6 = file.getName();
+            }
+
+            var6 = CommonUtils.getFileName(var6);
+            String var7 = var6.substring(0, var6.lastIndexOf(".")) + "_" + System.currentTimeMillis() + var6.substring(var6.indexOf("."));
+            if (!fileDir.endsWith("/")) {
+                fileDir = fileDir.concat("/");
+            }
+
+            fileDir = CommonUtils.filter(fileDir);
+            var4 = var4.append(fileDir + var7);
+            if (oConvertUtils.isNotEmpty(staticDomain) && staticDomain.toLowerCase().startsWith("http")) {
+                var3 = staticDomain + "/" + var4;
+            } else {
+                var3 = "https://" + var5 + "." + endPoint + "/" + var4;
+            }
+
+            PutObjectResult var8 = ossClient.putObject(var5, var4.toString(), file.getInputStream());
+            if (var8 != null) {
+                log.debug("------OSS文件上传成功------" + var4);
+            }
+
+            return var3;
+        } catch (IOException var9) {
+            var9.printStackTrace();
+            return null;
+        }
+    }
+
+    public static String upload(MultipartFile file, String fileDir) {
+        return upload(file, fileDir, (String)null);
+    }
+
+    public static String upload(FileItemStream file, String fileDir) {
+        String var2 = null;
+        initOSS(endPoint, accessKeyId, accessKeySecret);
+        StringBuilder var3 = new StringBuilder();
+
+        try {
+            String var4 = file.getName().substring(file.getName().lastIndexOf(46));
+            String var5 = UUID.randomUUID().toString().replace("-", "") + var4;
+            if (!fileDir.endsWith("/")) {
+                fileDir = fileDir.concat("/");
+            }
+
+            fileDir = CommonUtils.filter(fileDir);
+            var3 = var3.append(fileDir + var5);
+            if (oConvertUtils.isNotEmpty(staticDomain) && staticDomain.toLowerCase().startsWith("http")) {
+                var2 = staticDomain + "/" + var3;
+            } else {
+                var2 = "https://" + bucketName + "." + endPoint + "/" + var3;
+            }
+
+            PutObjectResult var6 = ossClient.putObject(bucketName, var3.toString(), file.openStream());
+            ossClient.setBucketAcl(bucketName, CannedAccessControlList.PublicRead);
+            if (var6 != null) {
+                log.debug("------OSS文件上传成功------" + var3);
+            }
+
+            return var2;
+        } catch (IOException var7) {
+            var7.printStackTrace();
+            return null;
+        }
+    }
+
+    public static void deleteUrl(String url) {
+        deleteUrl(url, (String)null);
+    }
+
+    public static void deleteUrl(String url, String bucket) {
+        String var2 = bucketName;
+        if (oConvertUtils.isNotEmpty(bucket)) {
+            var2 = bucket;
+        }
+
+        String var3 = "";
+        if (oConvertUtils.isNotEmpty(staticDomain) && staticDomain.toLowerCase().startsWith("http")) {
+            var3 = staticDomain + "/";
+        } else {
+            var3 = "https://" + var2 + "." + endPoint + "/";
+        }
+
+        url = url.replace(var3, "");
+        ossClient.deleteObject(var2, url);
+    }
+
+    public static void delete(String fileName) {
+        initOSS(endPoint, accessKeyId, accessKeySecret);
+        ossClient.deleteObject(bucketName, fileName);
+    }
+
+    public static InputStream getOssFile(String objectName, String bucket) {
+        BufferedInputStream var2 = null;
+
+        try {
+            String var3 = bucketName;
+            if (oConvertUtils.isNotEmpty(bucket)) {
+                var3 = bucket;
+            }
+
+            initOSS(endPoint, accessKeyId, accessKeySecret);
+            OSSObject var4 = ossClient.getObject(var3, objectName);
+            var2 = new BufferedInputStream(var4.getObjectContent());
+        } catch (Exception var5) {
+            log.error("文件获取失败" + var5.getMessage());
+        }
+
+        return var2;
+    }
+
+    public static InputStream getOssFile(String objectName) {
+        return getOssFile(objectName, (String)null);
+    }
+
+    public static String getObjectURL(String bucketName, String objectName, Date expires) {
+        initOSS(endPoint, accessKeyId, accessKeySecret);
+
+        try {
+            if (ossClient.doesObjectExist(bucketName, objectName)) {
+                URL var3 = ossClient.generatePresignedUrl(bucketName, objectName, expires);
+                return URLDecoder.decode(var3.toString(), "UTF-8");
+            }
+        } catch (Exception var4) {
+            log.error("文件路径获取失败" + var4.getMessage());
+        }
+
+        return null;
+    }
+
+    private static OSSClient initOSS(String endpoint, String accessKeyId, String accessKeySecret) {
+        if (ossClient == null) {
+            ossClient = new OSSClient(endpoint, new DefaultCredentialProvider(accessKeyId, accessKeySecret), new ClientConfiguration());
+        }
+
+        return ossClient;
+    }
+
+    public static String upload(InputStream stream, String relativePath) {
+        String var2 = null;
+        initOSS(endPoint, accessKeyId, accessKeySecret);
+        if (oConvertUtils.isNotEmpty(staticDomain) && staticDomain.toLowerCase().startsWith("http")) {
+            var2 = staticDomain + "/" + relativePath;
+        } else {
+            var2 = "https://" + bucketName + "." + endPoint + "/" + relativePath;
+        }
+
+        PutObjectResult var4 = ossClient.putObject(bucketName, relativePath.toString(), stream);
+        ossClient.setBucketAcl(bucketName, CannedAccessControlList.PublicRead);
+        if (var4 != null) {
+            log.debug("------OSS文件上传成功------" + relativePath);
+        }
+
+        return var2;
+    }
+}

payment-base-app/src/main/java/com/base/springcloud/util/ParameterUtil.java

@@ -0,0 +1,75 @@
+package com.base.springcloud.util;
+
+import com.base.springcloud.bo.OrderBO;
+import com.base.springcloud.bo.RefundBO;
+import com.base.springcloud.constant.PaymentConstant;
+import com.base.springcloud.dto.NativePlaceOrderDTO;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Component
+public class ParameterUtil {
+
+	/**
+	 * native下单入参设置
+	 * @param billId
+	 * @return
+	 */
+	public OrderBO nativePlaceOrderBefore(String billId,String createId){
+		OrderBO orderBO = new OrderBO();
+		orderBO.setBillIds(billId);
+		orderBO.setCreateId(createId);
+		orderBO.setMergeFlag(false);
+		orderBO.setMchId(PaymentConstant.DEFAULT_MCH_ID);
+		return orderBO;
+	}
+
+	/**
+	 * native下单响应设置
+	 * @param codeUrl
+	 * @return
+	 */
+	public List<NativePlaceOrderDTO> nativePlaceOrderAfter(String codeUrl){
+		if(StringUtils.isEmpty(codeUrl)){
+			return null;
+		}
+		List<NativePlaceOrderDTO> nativePlaceOrderDTOList = new ArrayList<>();
+		NativePlaceOrderDTO nativePlaceOrderDTO = new NativePlaceOrderDTO();
+		nativePlaceOrderDTO.setCodeUrl(codeUrl);
+		nativePlaceOrderDTOList.add(nativePlaceOrderDTO);
+		return nativePlaceOrderDTOList;
+	}
+
+	/**
+	 * 退款入参设置
+	 * @param billId
+	 * @return
+	 */
+	public RefundBO refundBefore(String billId) {
+		RefundBO refundBO = new RefundBO();
+		refundBO.setBillId(billId);
+		return refundBO;
+	}
+
+	public OrderBO mergeNativeBefore(String billIds,String createId) {
+		OrderBO orderBO = new OrderBO();
+		orderBO.setMergeFlag(true);
+		orderBO.setBillIds(billIds);
+		orderBO.setCreateId(createId);
+		return orderBO;
+	}
+
+	public List mergeNativeAfter(String codeUrl) {
+		if(StringUtils.isBlank(codeUrl)){
+			return null;
+		}
+		List<NativePlaceOrderDTO> nativePlaceOrderDTOList = new ArrayList<>();
+		NativePlaceOrderDTO nativePlaceOrderDTO = new NativePlaceOrderDTO();
+		nativePlaceOrderDTO.setCodeUrl(codeUrl);
+		nativePlaceOrderDTOList.add(nativePlaceOrderDTO);
+		return nativePlaceOrderDTOList;
+	}
+}

payment-base-app/src/main/java/com/base/springcloud/util/RedisUtil.java

@@ -0,0 +1,568 @@
+package com.base.springcloud.util;
+
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * redis 工具类
+ * @Author Scott
+ *
+ */
+@Component
+public class RedisUtil {
+
+	@Resource
+	private RedisTemplate<String, Object> redisTemplate;
+
+	/**
+	 * 指定缓存失效时间
+	 * 
+	 * @param key  键
+	 * @param time 时间(秒)
+	 * @return
+	 */
+	public boolean expire(String key, long time) {
+		try {
+			if (time > 0) {
+				redisTemplate.expire(key, time, TimeUnit.SECONDS);
+			}
+			return true;
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+	}
+
+	/**
+	 * 根据key 获取过期时间
+	 * 
+	 * @param key 键 不能为null
+	 * @return 时间(秒) 返回0代表为永久有效
+	 */
+	public long getExpire(String key) {
+		return redisTemplate.getExpire(key, TimeUnit.SECONDS);
+	}
+
+	/**
+	 * 判断key是否存在
+	 * 
+	 * @param key 键
+	 * @return true 存在 false不存在
+	 */
+	public boolean hasKey(String key) {
+		try {
+			return redisTemplate.hasKey(key);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+	}
+
+	/**
+	 * 删除缓存
+	 * 
+	 * @param key 可以传一个值 或多个
+	 */
+	@SuppressWarnings("unchecked")
+	public void del(String... key) {
+		if (key != null && key.length > 0) {
+			if (key.length == 1) {
+				redisTemplate.delete(key[0]);
+			} else {
+				redisTemplate.delete((Collection<String>) CollectionUtils.arrayToList(key));
+			}
+		}
+	}
+
+	// ============================String=============================
+	/**
+	 * 普通缓存获取
+	 * 
+	 * @param key 键
+	 * @return 值
+	 */
+	public Object get(String key) {
+		return key == null ? null : redisTemplate.opsForValue().get(key);
+	}
+
+	/**
+	 * 普通缓存放入
+	 * 
+	 * @param key   键
+	 * @param value 值
+	 * @return true成功 false失败
+	 */
+	public boolean set(String key, Object value) {
+		try {
+			redisTemplate.opsForValue().set(key, value);
+			return true;
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+
+	}
+
+	/**
+	 * 普通缓存放入并设置时间
+	 * 
+	 * @param key   键
+	 * @param value 值
+	 * @param time  时间(秒) time要大于0 如果time小于等于0 将设置无限期
+	 * @return true成功 false 失败
+	 */
+	public boolean set(String key, Object value, long time) {
+		try {
+			if (time > 0) {
+				redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS);
+			} else {
+				set(key, value);
+			}
+			return true;
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+	}
+
+	/**
+	 * 递增
+	 * 
+	 * @param key 键
+	 * @return
+	 */
+	public long incr(String key, long delta) {
+		if (delta < 0) {
+			throw new RuntimeException("递增因子必须大于0");
+		}
+		return redisTemplate.opsForValue().increment(key, delta);
+	}
+
+	/**
+	 * 递减
+	 * 
+	 * @param key 键
+	 * @return
+	 */
+	public long decr(String key, long delta) {
+		if (delta < 0) {
+			throw new RuntimeException("递减因子必须大于0");
+		}
+		return redisTemplate.opsForValue().increment(key, -delta);
+	}
+
+	// ================================Map=================================
+	/**
+	 * HashGet
+	 * 
+	 * @param key  键 不能为null
+	 * @param item 项 不能为null
+	 * @return 值
+	 */
+	public Object hget(String key, String item) {
+		return redisTemplate.opsForHash().get(key, item);
+	}
+
+	/**
+	 * 获取hashKey对应的所有键值
+	 * 
+	 * @param key 键
+	 * @return 对应的多个键值
+	 */
+	public Map<Object, Object> hmget(String key) {
+		return redisTemplate.opsForHash().entries(key);
+	}
+
+	/**
+	 * HashSet
+	 * 
+	 * @param key 键
+	 * @param map 对应多个键值
+	 * @return true 成功 false 失败
+	 */
+	public boolean hmset(String key, Map<String, Object> map) {
+		try {
+			redisTemplate.opsForHash().putAll(key, map);
+			return true;
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+	}
+
+	/**
+	 * HashSet 并设置时间
+	 * 
+	 * @param key  键
+	 * @param map  对应多个键值
+	 * @param time 时间(秒)
+	 * @return true成功 false失败
+	 */
+	public boolean hmset(String key, Map<String, Object> map, long time) {
+		try {
+			redisTemplate.opsForHash().putAll(key, map);
+			if (time > 0) {
+				expire(key, time);
+			}
+			return true;
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+	}
+
+	/**
+	 * 向一张hash表中放入数据,如果不存在将创建
+	 * 
+	 * @param key   键
+	 * @param item  项
+	 * @param value 值
+	 * @return true 成功 false失败
+	 */
+	public boolean hset(String key, String item, Object value) {
+		try {
+			redisTemplate.opsForHash().put(key, item, value);
+			return true;
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+	}
+
+	/**
+	 * 向一张hash表中放入数据,如果不存在将创建
+	 * 
+	 * @param key   键
+	 * @param item  项
+	 * @param value 值
+	 * @param time  时间(秒) 注意:如果已存在的hash表有时间,这里将会替换原有的时间
+	 * @return true 成功 false失败
+	 */
+	public boolean hset(String key, String item, Object value, long time) {
+		try {
+			redisTemplate.opsForHash().put(key, item, value);
+			if (time > 0) {
+				expire(key, time);
+			}
+			return true;
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+	}
+
+	/**
+	 * 删除hash表中的值
+	 * 
+	 * @param key  键 不能为null
+	 * @param item 项 可以使多个 不能为null
+	 */
+	public void hdel(String key, Object... item) {
+		redisTemplate.opsForHash().delete(key, item);
+	}
+
+	/**
+	 * 判断hash表中是否有该项的值
+	 * 
+	 * @param key  键 不能为null
+	 * @param item 项 不能为null
+	 * @return true 存在 false不存在
+	 */
+	public boolean hHasKey(String key, String item) {
+		return redisTemplate.opsForHash().hasKey(key, item);
+	}
+
+	/**
+	 * hash递增 如果不存在,就会创建一个 并把新增后的值返回
+	 * 
+	 * @param key  键
+	 * @param item 项
+	 * @param by   要增加几(大于0)
+	 * @return
+	 */
+	public double hincr(String key, String item, double by) {
+		return redisTemplate.opsForHash().increment(key, item, by);
+	}
+
+	/**
+	 * hash递减
+	 * 
+	 * @param key  键
+	 * @param item 项
+	 * @param by   要减少记(小于0)
+	 * @return
+	 */
+	public double hdecr(String key, String item, double by) {
+		return redisTemplate.opsForHash().increment(key, item, -by);
+	}
+
+	// ============================set=============================
+	/**
+	 * 根据key获取Set中的所有值
+	 * 
+	 * @param key 键
+	 * @return
+	 */
+	public Set<Object> sGet(String key) {
+		try {
+			return redisTemplate.opsForSet().members(key);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+	/**
+	 * 根据value从一个set中查询,是否存在
+	 * 
+	 * @param key   键
+	 * @param value 值
+	 * @return true 存在 false不存在
+	 */
+	public boolean sHasKey(String key, Object value) {
+		try {
+			return redisTemplate.opsForSet().isMember(key, value);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+	}
+
+	/**
+	 * 将数据放入set缓存
+	 * 
+	 * @param key    键
+	 * @param values 值 可以是多个
+	 * @return 成功个数
+	 */
+	public long sSet(String key, Object... values) {
+		try {
+			return redisTemplate.opsForSet().add(key, values);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return 0;
+		}
+	}
+
+	/**
+	 * 将set数据放入缓存
+	 * 
+	 * @param key    键
+	 * @param time   时间(秒)
+	 * @param values 值 可以是多个
+	 * @return 成功个数
+	 */
+	public long sSetAndTime(String key, long time, Object... values) {
+		try {
+			Long count = redisTemplate.opsForSet().add(key, values);
+			if (time > 0) {
+				expire(key, time);
+			}
+			return count;
+		} catch (Exception e) {
+			e.printStackTrace();
+			return 0;
+		}
+	}
+
+	/**
+	 * 获取set缓存的长度
+	 * 
+	 * @param key 键
+	 * @return
+	 */
+	public long sGetSetSize(String key) {
+		try {
+			return redisTemplate.opsForSet().size(key);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return 0;
+		}
+	}
+
+	/**
+	 * 移除值为value的
+	 * 
+	 * @param key    键
+	 * @param values 值 可以是多个
+	 * @return 移除的个数
+	 */
+	public long setRemove(String key, Object... values) {
+		try {
+			Long count = redisTemplate.opsForSet().remove(key, values);
+			return count;
+		} catch (Exception e) {
+			e.printStackTrace();
+			return 0;
+		}
+	}
+	// ===============================list=================================
+
+	/**
+	 * 获取list缓存的内容
+	 * 
+	 * @param key   键
+	 * @param start 开始
+	 * @param end   结束 0 到 -1代表所有值
+	 * @return
+	 */
+	public List<Object> lGet(String key, long start, long end) {
+		try {
+			return redisTemplate.opsForList().range(key, start, end);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+	/**
+	 * 获取list缓存的长度
+	 * 
+	 * @param key 键
+	 * @return
+	 */
+	public long lGetListSize(String key) {
+		try {
+			return redisTemplate.opsForList().size(key);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return 0;
+		}
+	}
+
+	/**
+	 * 通过索引 获取list中的值
+	 * 
+	 * @param key   键
+	 * @param index 索引 index>=0时， 0 表头，1 第二个元素，依次类推；index<0时，-1，表尾，-2倒数第二个元素，依次类推
+	 * @return
+	 */
+	public Object lGetIndex(String key, long index) {
+		try {
+			return redisTemplate.opsForList().index(key, index);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+	/**
+	 * 将list放入缓存
+	 * 
+	 * @param key   键
+	 * @param value 值
+	 * @return
+	 */
+	public boolean lSet(String key, Object value) {
+		try {
+			redisTemplate.opsForList().rightPush(key, value);
+			return true;
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+	}
+
+	/**
+	 * 将list放入缓存
+	 * 
+	 * @param key   键
+	 * @param value 值
+	 * @param time  时间(秒)
+	 * @return
+	 */
+	public boolean lSet(String key, Object value, long time) {
+		try {
+			redisTemplate.opsForList().rightPush(key, value);
+			if (time > 0) {
+				expire(key, time);
+			}
+			return true;
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+	}
+
+	/**
+	 * 将list放入缓存
+	 * 
+	 * @param key   键
+	 * @param value 值
+	 * @return
+	 */
+	public boolean lSet(String key, List<Object> value) {
+		try {
+			redisTemplate.opsForList().rightPushAll(key, value);
+			return true;
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+	}
+
+	/**
+	 * 将list放入缓存
+	 * 
+	 * @param key   键
+	 * @param value 值
+	 * @param time  时间(秒)
+	 * @return
+	 */
+	public boolean lSet(String key, List<Object> value, long time) {
+		try {
+			redisTemplate.opsForList().rightPushAll(key, value);
+			if (time > 0) {
+				expire(key, time);
+			}
+			return true;
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+	}
+
+	/**
+	 * 根据索引修改list中的某条数据
+	 * 
+	 * @param key   键
+	 * @param index 索引
+	 * @param value 值
+	 * @return
+	 */
+	public boolean lUpdateIndex(String key, long index, Object value) {
+		try {
+			redisTemplate.opsForList().set(key, index, value);
+			return true;
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+	}
+
+	/**
+	 * 移除N个值为value
+	 * 
+	 * @param key   键
+	 * @param count 移除多少个
+	 * @param value 值
+	 * @return 移除的个数
+	 */
+	public long lRemove(String key, long count, Object value) {
+		try {
+			Long remove = redisTemplate.opsForList().remove(key, count, value);
+			return remove;
+		} catch (Exception e) {
+			e.printStackTrace();
+			return 0;
+		}
+	}
+}

payment-base-app/src/main/java/com/base/springcloud/util/StringHelper.java

@@ -4,10 +4,20 @@ import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
 
+import java.beans.BeanInfo;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
+import java.util.HashMap;
 import java.util.Map;
 
 public class StringHelper {
 
+	/**
+	 * json转Map
+	 * @param str_json
+	 * @return
+	 */
 	public static Map<String, String> json2map(String str_json) {
 		Map<String, String> res = null;
 		try {
@@ -18,4 +28,28 @@ public class StringHelper {
 		}
 		return res;
 	}
+
+	/**
+	 * 对象转Map
+	 * @param obj
+	 * @return
+	 * @throws Exception
+	 */
+	public static Map<String, Object> objectToMap(Object obj) throws Exception {
+		if(obj == null)
+			return null;
+		Map<String, Object> map = new HashMap<String, Object>();
+		BeanInfo beanInfo = Introspector.getBeanInfo(obj.getClass());
+		PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
+		for (PropertyDescriptor property : propertyDescriptors) {
+			String key = property.getName();
+			if (key.compareToIgnoreCase("class") == 0) {
+				continue;
+			}
+			Method getter = property.getReadMethod();
+			Object value = getter!=null ? getter.invoke(obj) : null;
+			map.put(key, value);
+		}
+		return map;
+	}
 }

payment-base-app/src/main/java/com/base/springcloud/util/TokenUtils.java

@@ -0,0 +1,109 @@
+package com.base.springcloud.util;
+
+import com.base.springcloud.aspect.annotation.BusinessException;
+import com.base.springcloud.constant.ErrorConstant;
+import com.base.springcloud.constant.PaymentConstant;
+import com.base.springcloud.entity.User;
+import com.base.springcloud.service.DepartService;
+import com.base.springcloud.service.UserService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Optional;
+
+@Component
+public class TokenUtils {
+
+	@Autowired
+	private UserService userService;
+
+	@Autowired
+	private RedisUtil redisService;
+
+	@Autowired
+	private DepartService departService;
+
+	/**
+	 * Token验证
+	 */
+	public User verifyToken(HttpServletRequest request) {
+		// 从请求头获取token
+		String token = request.getHeader("X-Access-Token");
+
+		// 如果请求头没有token,则从请求参数中取
+		if (StringUtils.isBlank(token))
+			token = request.getParameter("token");
+
+		// 如果还是没有token,则抛异常
+		if (StringUtils.isBlank(token))
+			throw new BusinessException(ErrorConstant.INVALID_TOKEN);
+
+		// 从token里获取用户姓名
+		String username = JwtUtil.getUsername(token);
+		if (StringUtils.isEmpty(username))
+			throw new BusinessException(ErrorConstant.ILLEGAL_TOKEN);
+
+		// 查询用户信息
+		User user = userService.getUser(username);
+
+		// 校验token是否超时失效 & 或者账号密码是否错误
+		TokenValidity(token,user);
+
+		return user;
+	}
+
+	/**
+	 * TOKEN有效期校验
+	 *
+	 * @param token
+	 * @param user
+	 */
+	public void TokenValidity(String token, User user) {
+		String key = PaymentConstant.TOKEN_PREFIX + token;
+		String redisToken = String.valueOf(redisService.get(key));
+		if (StringUtils.isBlank(redisToken))
+			throw new BusinessException(ErrorConstant.TOKEN_EXPIRATION_DATE);
+		if (!JwtUtil.verify(redisToken, user.getUserName(), user.getPassword()))
+			throw new BusinessException(ErrorConstant.ILLEGAL_TOKEN);
+		String newAuthorization = JwtUtil.sign(user.getUserName(), user.getPassword());
+		// 设置Toekn缓存有效时间
+		redisService.set(PaymentConstant.TOKEN_PREFIX + token, newAuthorization);
+		redisService.expire(PaymentConstant.TOKEN_PREFIX + token, JwtUtil.EXPIRE_TIME * 2 / 1000);
+
+	}
+
+	/**
+	 * 获取用户信息
+	 * @param request
+	 * @param userId
+	 */
+	public void userInfo(HttpServletRequest request, String userId) {
+		if(StringUtils.isBlank(userId)) return;
+		request.setAttribute("createId",userId);
+	}
+
+	/**
+	 * 获取用户部门
+	 *
+	 * @param request
+	 * @param userId
+	 */
+	public void departmentInfo(HttpServletRequest request, String userId) {
+		List<String> departIdList = departService.getUserDepart(userId);
+		if (!Optional.ofNullable(departIdList).isPresent()) return;
+		request.setAttribute("departIdList",departIdList);
+	}
+
+	/**
+	 * 获取公司信息
+	 * @param request
+	 * @param companyId
+	 */
+	public void companyInfo(HttpServletRequest request, String companyId) {
+		if(StringUtils.isBlank(companyId)) return;
+		request.setAttribute("companyId",companyId);
+	}
+}

payment-base-app/src/main/java/com/base/springcloud/util/oConvertUtils.java

@@ -0,0 +1,443 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by Fernflower decompiler)
+//
+
+package com.base.springcloud.util;
+
+import com.base.springcloud.aspect.annotation.BusinessException;
+import com.base.springcloud.constant.ErrorConstant;
+import org.apache.commons.codec.binary.Base64;
+//import org.jeecg.modules.jmreport.common.expetion.JimuReportException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.lang.reflect.Array;
+import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.*;
+
+public class oConvertUtils {
+    private static final Logger log = LoggerFactory.getLogger(oConvertUtils.class);
+
+    public oConvertUtils() {
+    }
+
+    public static boolean isEmptyString(CharSequence str) {
+        return str == null || str.length() == 0 || str == "null" || str == "";
+    }
+
+    public static boolean isEmptyMap(Map<?, ?> map) {
+        return null == map || map.isEmpty();
+    }
+
+    public static boolean isEmptyIterable(Iterable<?> iterable) {
+        return null == iterable || isEmpty(iterable.iterator());
+    }
+
+    public static boolean isEmptyIterator(Iterator<?> Iterator) {
+        return null == Iterator || !Iterator.hasNext();
+    }
+
+    public static boolean isArray(Object obj) {
+        return null == obj ? false : obj.getClass().isArray();
+    }
+
+    public static boolean isEmptyArray(Object array) {
+        if (null == array) {
+            return true;
+        } else if (isArray(array)) {
+            return 0 == Array.getLength(array);
+        } else {
+            throw new BusinessException(ErrorConstant.MISTAKE_TARGET);
+        }
+    }
+
+    public static boolean isEmpty(Object obj) {
+        if (null == obj) {
+            return true;
+        } else if (obj instanceof CharSequence) {
+            return isEmptyString((CharSequence)obj);
+        } else if (obj instanceof Map) {
+            return isEmptyMap((Map)obj);
+        } else if (obj instanceof Iterable) {
+            return isEmptyIterable((Iterable)obj);
+        } else if (obj instanceof Iterator) {
+            return isEmptyIterator((Iterator)obj);
+        } else {
+            return isArray(obj) ? isEmptyArray(obj) : false;
+        }
+    }
+
+    public static boolean isNotEmpty(Object object) {
+        return !isEmpty(object);
+    }
+
+    public static String decode(String strIn, String sourceCode, String targetCode) {
+        String var3 = code2code(strIn, sourceCode, targetCode);
+        return var3;
+    }
+
+    public static boolean isNumeric(String str) {
+        return str.matches("-?[0-9]+.?[0-9]*");
+    }
+
+    private static String code2code(String strIn, String sourceCode, String targetCode) {
+        String var3 = null;
+        if (strIn != null && !strIn.trim().equals("")) {
+            try {
+                byte[] var4 = strIn.getBytes(sourceCode);
+
+                for(int var5 = 0; var5 < var4.length; ++var5) {
+                    System.out.print(var4[var5] + "  ");
+                }
+
+                var3 = new String(var4, targetCode);
+                return var3;
+            } catch (Exception var6) {
+                var6.printStackTrace();
+                return null;
+            }
+        } else {
+            return strIn;
+        }
+    }
+
+    public static int getInt(String s, int defval) {
+        if (s != null && s != "") {
+            try {
+                return Integer.parseInt(s);
+            } catch (NumberFormatException var3) {
+                return defval;
+            }
+        } else {
+            return defval;
+        }
+    }
+
+    public static int getInt(String s) {
+        if (s != null && s != "") {
+            try {
+                return Integer.parseInt(s);
+            } catch (NumberFormatException var2) {
+                return 0;
+            }
+        } else {
+            return 0;
+        }
+    }
+
+    public static int getInt(String s, Integer df) {
+        if (s != null && s != "") {
+            try {
+                return Integer.parseInt(s);
+            } catch (NumberFormatException var3) {
+                return 0;
+            }
+        } else {
+            return df;
+        }
+    }
+
+    public static int getInt(Object object, int defval) {
+        if (isEmpty(object)) {
+            return defval;
+        } else {
+            try {
+                return object instanceof Float ? ((Float)object).intValue() : Integer.parseInt(object.toString());
+            } catch (NumberFormatException var3) {
+                return defval;
+            }
+        }
+    }
+
+    public static Integer getInt(Object object) {
+        if (isEmpty(object)) {
+            return null;
+        } else {
+            try {
+                return object instanceof Float ? ((Float)object).intValue() : Integer.parseInt(object.toString());
+            } catch (NumberFormatException var2) {
+                return null;
+            }
+        }
+    }
+
+    public static int getInt(BigDecimal s, int defval) {
+        return s == null ? defval : s.intValue();
+    }
+
+    public static String getString(String s) {
+        return getString(s, "");
+    }
+
+    public static String getString(Object object) {
+        return isEmpty(object) ? "" : object.toString().trim();
+    }
+
+    public static String getString(int i) {
+        return String.valueOf(i);
+    }
+
+    public static String getString(float i) {
+        return String.valueOf(i);
+    }
+
+    public static String getString(String s, String defval) {
+        return isEmpty(s) ? defval : s.trim();
+    }
+
+    public static String getString(Object s, String defval) {
+        return isEmpty(s) ? defval : s.toString().trim();
+    }
+
+    public static String getJmString(Object s) {
+        return isEmpty(s) ? "" : s.toString();
+    }
+
+    public static String getIp() {
+        String var0 = null;
+
+        try {
+            InetAddress var1 = InetAddress.getLocalHost();
+            var0 = var1.getHostAddress();
+        } catch (UnknownHostException var2) {
+            var2.printStackTrace();
+        }
+
+        return var0;
+    }
+
+    public static String camelToUnderline(String para) {
+        if (para.length() < 3) {
+            return para.toLowerCase();
+        } else {
+            StringBuilder var1 = new StringBuilder(para);
+            int var2 = 0;
+
+            for(int var3 = 2; var3 < para.length(); ++var3) {
+                if (Character.isUpperCase(para.charAt(var3))) {
+                    var1.insert(var3 + var2, "_");
+                    ++var2;
+                }
+            }
+
+            return var1.toString().toLowerCase();
+        }
+    }
+
+    public static Field[] getAllFields(Object object) {
+        Class var1 = object.getClass();
+
+        ArrayList var2;
+        for(var2 = new ArrayList(); var1 != null; var1 = var1.getSuperclass()) {
+            var2.addAll(new ArrayList(Arrays.asList(var1.getDeclaredFields())));
+        }
+
+        Field[] var3 = new Field[var2.size()];
+        var2.toArray(var3);
+        return var3;
+    }
+
+    public static String join(Object[] array, String separator, int startIndex, int endIndex) {
+        if (array == null) {
+            return null;
+        } else {
+            if (separator == null) {
+                separator = "";
+            }
+
+            int var4 = endIndex - startIndex;
+            if (var4 <= 0) {
+                return "";
+            } else {
+                StringBuilder var5 = newStringBuilder(var4);
+                if (array[startIndex] != null) {
+                    var5.append(array[startIndex]);
+                }
+
+                for(int var6 = startIndex + 1; var6 < endIndex; ++var6) {
+                    var5.append(separator);
+                    if (array[var6] != null) {
+                        var5.append(array[var6]);
+                    }
+                }
+
+                return var5.toString();
+            }
+        }
+    }
+
+    private static StringBuilder newStringBuilder(int noOfItems) {
+        return new StringBuilder(noOfItems * 16);
+    }
+
+    public static int indexOfIgnoreCase(CharSequence str, CharSequence searchStr, int startPos) {
+        if (str != null && searchStr != null) {
+            if (startPos < 0) {
+                startPos = 0;
+            }
+
+            int var3 = str.length() - searchStr.length() + 1;
+            if (startPos > var3) {
+                return -1;
+            } else if (searchStr.length() == 0) {
+                return startPos;
+            } else {
+                for(int var4 = startPos; var4 < var3; ++var4) {
+                    if (regionMatches(str, true, var4, searchStr, 0, searchStr.length())) {
+                        return var4;
+                    }
+                }
+
+                return -1;
+            }
+        } else {
+            return -1;
+        }
+    }
+
+    public static boolean regionMatches(CharSequence cs, boolean ignoreCase, int thisStart, CharSequence substring, int start, int length) {
+        if (cs instanceof String && substring instanceof String) {
+            return ((String)cs).regionMatches(ignoreCase, thisStart, (String)substring, start, length);
+        } else {
+            int var6 = thisStart;
+            int var7 = start;
+            int var8 = length;
+            int var9 = cs.length() - thisStart;
+            int var10 = substring.length() - start;
+            if (thisStart >= 0 && start >= 0 && length >= 0) {
+                if (var9 >= length && var10 >= length) {
+                    while(var8-- > 0) {
+                        char var11 = cs.charAt(var6++);
+                        char var12 = substring.charAt(var7++);
+                        if (var11 != var12) {
+                            if (!ignoreCase) {
+                                return false;
+                            }
+
+                            if (Character.toUpperCase(var11) != Character.toUpperCase(var12) && Character.toLowerCase(var11) != Character.toLowerCase(var12)) {
+                                return false;
+                            }
+                        }
+                    }
+
+                    return true;
+                } else {
+                    return false;
+                }
+            } else {
+                return false;
+            }
+        }
+    }
+
+    public static byte[] decodeBase64(String base64Str) {
+        byte[] var1 = Base64.decodeBase64(base64Str);
+        return var1;
+    }
+
+    public static <T> List<T> deepCopy(List<T> list) {
+        try {
+            ByteArrayOutputStream var1 = new ByteArrayOutputStream();
+            Throwable var2 = null;
+
+            Object var9;
+            try {
+                ObjectOutputStream var3 = new ObjectOutputStream(var1);
+                Throwable var4 = null;
+
+                try {
+                    var3.writeObject(list);
+                    ByteArrayInputStream var5 = new ByteArrayInputStream(var1.toByteArray());
+                    Throwable var6 = null;
+
+                    try {
+                        ObjectInputStream var7 = new ObjectInputStream(var5);
+                        Throwable var8 = null;
+
+                        try {
+                            var9 = (List)var7.readObject();
+                        } catch (Throwable var85) {
+                            var9 = var85;
+                            var8 = var85;
+                            throw var85;
+                        } finally {
+                            if (var7 != null) {
+                                if (var8 != null) {
+                                    try {
+                                        var7.close();
+                                    } catch (Throwable var84) {
+                                        var8.addSuppressed(var84);
+                                    }
+                                } else {
+                                    var7.close();
+                                }
+                            }
+
+                        }
+                    } catch (Throwable var87) {
+                        var6 = var87;
+                        throw var87;
+                    } finally {
+                        if (var5 != null) {
+                            if (var6 != null) {
+                                try {
+                                    var5.close();
+                                } catch (Throwable var83) {
+                                    var6.addSuppressed(var83);
+                                }
+                            } else {
+                                var5.close();
+                            }
+                        }
+
+                    }
+                } catch (Throwable var89) {
+                    var4 = var89;
+                    throw var89;
+                } finally {
+                    if (var3 != null) {
+                        if (var4 != null) {
+                            try {
+                                var3.close();
+                            } catch (Throwable var82) {
+                                var4.addSuppressed(var82);
+                            }
+                        } else {
+                            var3.close();
+                        }
+                    }
+
+                }
+            } catch (Throwable var91) {
+                var2 = var91;
+                throw var91;
+            } finally {
+                if (var1 != null) {
+                    if (var2 != null) {
+                        try {
+                            var1.close();
+                        } catch (Throwable var81) {
+                            var2.addSuppressed(var81);
+                        }
+                    } else {
+                        var1.close();
+                    }
+                }
+
+            }
+
+            return (List)var9;
+        } catch (Exception var93) {
+            log.warn(var93.getMessage());
+            return Collections.emptyList();
+        }
+    }
+}

payment-base-app/src/main/java/com/base/springcloud/wxsdk/IWXPayDomain.java

@@ -0,0 +1,42 @@
+package com.base.springcloud.wxsdk;
+
+/**
+ * 域名管理，实现主备域名自动切换
+ */
+public abstract interface IWXPayDomain {
+    /**
+     * 上报域名网络状况
+     * @param domain 域名。 比如：api.mch.weixin.qq.com
+     * @param elapsedTimeMillis 耗时
+     * @param ex 网络请求中出现的异常。
+     *           null表示没有异常
+     *           ConnectTimeoutException，表示建立网络连接异常
+     *           UnknownHostException， 表示dns解析异常
+     */
+    abstract void report(final String domain, long elapsedTimeMillis, final Exception ex);
+
+    /**
+     * 获取域名
+     * @param config 配置
+     * @return 域名
+     */
+    abstract DomainInfo getDomain(final WXPayConfig config);
+
+    static class DomainInfo{
+        public String domain;       //域名
+        public boolean primaryDomain;     //该域名是否为主域名。例如:api.mch.weixin.qq.com为主域名
+        public DomainInfo(String domain, boolean primaryDomain) {
+            this.domain = domain;
+            this.primaryDomain = primaryDomain;
+        }
+
+        @Override
+        public String toString() {
+            return "DomainInfo{" +
+                    "domain='" + domain + '\'' +
+                    ", primaryDomain=" + primaryDomain +
+                    '}';
+        }
+    }
+
+}

payment-base-app/src/main/java/com/base/springcloud/wxsdk/MyConfig.java

@@ -0,0 +1,82 @@
+package com.base.springcloud.wxsdk;
+
+import lombok.Data;
+import sun.misc.BASE64Decoder;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class MyConfig extends WXPayConfig  {
+
+	private String appid;
+	private String mchid;
+	private String key;
+	private byte[] certData;
+
+	public MyConfig(String appId,String mchId,String key,String certificate){
+		this.appid = appId;
+		this.mchid = mchId;
+		this.key = key;
+		this.certData = certificate.getBytes(StandardCharsets.UTF_8);
+	}
+
+	@Override
+	String getAppID() {
+		return appid;
+	}
+
+	@Override
+	String getMchID() {
+		return mchid;
+	}
+
+	@Override
+	InputStream getCertStream() {
+		return new ByteArrayInputStream(this.certData);
+	}
+
+	@Override
+	public IWXPayDomain getWXPayDomain() { // 这个方法需要这样实现, 否则无法正常初始化WXPay
+		IWXPayDomain iwxPayDomain = new IWXPayDomain() {
+			@Override
+			public void report(String domain, long elapsedTimeMillis, Exception ex) {
+
+			}
+
+			@Override
+			public DomainInfo getDomain(WXPayConfig config) {
+				return new DomainInfo(WXPayConstants.DOMAIN_API, true);
+			}
+		};
+		return iwxPayDomain;
+	}
+
+	/**
+	 * 获取沙箱密钥
+	 * @return
+	 */
+	public String getSandboxSignKey() {
+		try {
+			WXPay wxPay = new WXPay(this);
+			Map<String, String> params = new HashMap<String, String>();
+			params.put("mch_id", this.getMchID());
+			params.put("nonce_str", WXPayUtil.generateNonceStr());
+			params.put("sign", WXPayUtil.generateSignature(params, this.getKey()));
+			String strXML = wxPay.requestWithoutCert("https://api.mch.weixin.qq.com/sandboxnew/pay/getsignkey",
+					params, this.getHttpConnectTimeoutMs(), this.getHttpReadTimeoutMs());
+			System.out.println(strXML);
+			Map<String, String> result = WXPayUtil.xmlToMap(strXML);
+			if ("SUCCESS".equals(result.get("return_code"))) {
+				return result.get("sandbox_signkey");
+			}
+			return null;
+		} catch (Exception e) {
+			return null;
+		}
+	}
+
+}

payment-base-app/src/main/java/com/base/springcloud/wxsdk/WXPay.java

@@ -0,0 +1,689 @@
+package com.base.springcloud.wxsdk;
+
+import com.base.springcloud.wxsdk.WXPayConstants.SignType;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class WXPay {
+
+    private WXPayConfig config;
+    private SignType signType;
+    private boolean autoReport;
+    private boolean useSandbox;
+    private String notifyUrl;
+    private WXPayRequest wxPayRequest;
+
+    public WXPay(final WXPayConfig config){
+        this(config, null, true, false);
+    }
+
+    public WXPay(final WXPayConfig config, final boolean autoReport) throws Exception {
+        this(config, null, autoReport, false);
+    }
+
+
+    public WXPay(final WXPayConfig config, final boolean autoReport, final boolean useSandbox) throws Exception{
+        this(config, null, autoReport, useSandbox);
+    }
+
+    public WXPay(final WXPayConfig config, final String notifyUrl) throws Exception {
+        this(config, notifyUrl, true, false);
+    }
+
+    public WXPay(final WXPayConfig config, final String notifyUrl, final boolean autoReport) throws Exception {
+        this(config, notifyUrl, autoReport, false);
+    }
+
+    public WXPay(final WXPayConfig config, final String notifyUrl, final boolean autoReport, final boolean useSandbox){
+        this.config = config;
+        this.notifyUrl = notifyUrl;
+        this.autoReport = autoReport;
+        this.useSandbox = useSandbox;
+        if (useSandbox) {
+            this.signType = SignType.MD5; // 沙箱环境
+        }
+        else {
+            this.signType = SignType.HMACSHA256;
+        }
+        this.wxPayRequest = new WXPayRequest(config);
+    }
+
+    private void checkWXPayConfig() throws Exception {
+        if (this.config == null) {
+            throw new Exception("config is null");
+        }
+        if (this.config.getAppID() == null || this.config.getAppID().trim().length() == 0) {
+            throw new Exception("appid in config is empty");
+        }
+        if (this.config.getMchID() == null || this.config.getMchID().trim().length() == 0) {
+            throw new Exception("appid in config is empty");
+        }
+        if (this.config.getCertStream() == null) {
+            throw new Exception("cert stream in config is empty");
+        }
+        if (this.config.getWXPayDomain() == null){
+            throw new Exception("config.getWXPayDomain() is null");
+        }
+
+        if (this.config.getHttpConnectTimeoutMs() < 10) {
+            throw new Exception("http connect timeout is too small");
+        }
+        if (this.config.getHttpReadTimeoutMs() < 10) {
+            throw new Exception("http read timeout is too small");
+        }
+
+    }
+
+    /**
+     * 向 Map 中添加 appid、mch_id、nonce_str、sign_type、sign <br>
+     * 该函数适用于商户适用于统一下单等接口，不适用于红包、代金券接口
+     *
+     * @param reqData
+     * @return
+     * @throws Exception
+     */
+    public Map<String, String> fillRequestData(Map<String, String> reqData) throws Exception {
+        reqData.put("appid", config.getAppID());
+        reqData.put("mch_id", config.getMchID());
+        reqData.put("nonce_str", WXPayUtil.generateNonceStr());
+        if (SignType.MD5.equals(this.signType)) {
+            reqData.put("sign_type", WXPayConstants.MD5);
+        }
+        else if (SignType.HMACSHA256.equals(this.signType)) {
+            reqData.put("sign_type", WXPayConstants.HMACSHA256);
+        }
+        reqData.put("sign", WXPayUtil.generateSignature(reqData, config.getKey(), this.signType));
+        return reqData;
+    }
+
+    /**
+     * 判断xml数据的sign是否有效，必须包含sign字段，否则返回false。
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return 签名是否有效
+     * @throws Exception
+     */
+    public boolean isResponseSignatureValid(Map<String, String> reqData) throws Exception {
+        // 返回数据的签名方式和请求中给定的签名方式是一致的
+        return WXPayUtil.isSignatureValid(reqData, this.config.getKey(), this.signType);
+    }
+
+    /**
+     * 判断支付结果通知中的sign是否有效
+     *
+     * @param reqData 向wxpay post的请求数据
+     * @return 签名是否有效
+     * @throws Exception
+     */
+    public boolean isPayResultNotifySignatureValid(Map<String, String> reqData) throws Exception {
+        String signTypeInData = reqData.get(WXPayConstants.FIELD_SIGN_TYPE);
+        SignType signType;
+        if (signTypeInData == null) {
+            signType = SignType.MD5;
+        }
+        else {
+            signTypeInData = signTypeInData.trim();
+            if (signTypeInData.length() == 0) {
+                signType = SignType.MD5;
+            }
+            else if (WXPayConstants.MD5.equals(signTypeInData)) {
+                signType = SignType.MD5;
+            }
+            else if (WXPayConstants.HMACSHA256.equals(signTypeInData)) {
+                signType = SignType.HMACSHA256;
+            }
+            else {
+                throw new Exception(String.format("Unsupported sign_type: %s", signTypeInData));
+            }
+        }
+        return WXPayUtil.isSignatureValid(reqData, this.config.getKey(), signType);
+    }
+
+
+    /**
+     * 不需要证书的请求
+     * @param urlSuffix String
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 超时时间，单位是毫秒
+     * @param readTimeoutMs 超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public String requestWithoutCert(String urlSuffix, Map<String, String> reqData,
+                                     int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String msgUUID = reqData.get("nonce_str");
+        String reqBody = WXPayUtil.mapToXml(reqData);
+        System.out.println("请求串：" + reqBody);
+        String resp = this.wxPayRequest.requestWithoutCert(urlSuffix, msgUUID, reqBody, connectTimeoutMs, readTimeoutMs, autoReport);
+        return resp;
+    }
+
+
+    /**
+     * 需要证书的请求
+     * @param urlSuffix String
+     * @param reqData 向wxpay post的请求数据  Map
+     * @param connectTimeoutMs 超时时间，单位是毫秒
+     * @param readTimeoutMs 超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public String requestWithCert(String urlSuffix, Map<String, String> reqData,
+                                  int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String msgUUID= reqData.get("nonce_str");
+        String reqBody = WXPayUtil.mapToXml(reqData);
+
+        String resp = this.wxPayRequest.requestWithCert(urlSuffix, msgUUID, reqBody, connectTimeoutMs, readTimeoutMs, this.autoReport);
+        return resp;
+    }
+
+    /**
+     * 处理 HTTPS API返回数据，转换成Map对象。return_code为SUCCESS时，验证签名。
+     * @param xmlStr API返回的XML格式数据
+     * @return Map类型数据
+     * @throws Exception
+     */
+    public Map<String, String> processResponseXml(String xmlStr) throws Exception {
+        String RETURN_CODE = "return_code";
+        String return_code;
+        Map<String, String> respData = WXPayUtil.xmlToMap(xmlStr);
+        if (respData.containsKey(RETURN_CODE)) {
+            return_code = respData.get(RETURN_CODE);
+        }
+        else {
+            throw new Exception(String.format("No `return_code` in XML: %s", xmlStr));
+        }
+
+        if (return_code.equals(WXPayConstants.FAIL)) {
+            return respData;
+        }
+        else if (return_code.equals(WXPayConstants.SUCCESS)) {
+           if (this.isResponseSignatureValid(respData)) {
+               return respData;
+           }
+           else {
+               throw new Exception(String.format("Invalid sign value in XML: %s", xmlStr));
+           }
+        }
+        else {
+            throw new Exception(String.format("return_code value %s is invalid in XML: %s", return_code, xmlStr));
+        }
+    }
+
+    /**
+     * 作用：提交刷卡支付<br>
+     * 场景：刷卡支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> microPay(Map<String, String> reqData) throws Exception {
+        return this.microPay(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：提交刷卡支付<br>
+     * 场景：刷卡支付
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> microPay(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_MICROPAY_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.MICROPAY_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+    /**
+     * 提交刷卡支付，针对软POS，尽可能做成功
+     * 内置重试机制，最多60s
+     * @param reqData
+     * @return
+     * @throws Exception
+     */
+    public Map<String, String> microPayWithPos(Map<String, String> reqData) throws Exception {
+        return this.microPayWithPos(reqData, this.config.getHttpConnectTimeoutMs());
+    }
+
+    /**
+     * 提交刷卡支付，针对软POS，尽可能做成功
+     * 内置重试机制，最多60s
+     * @param reqData
+     * @param connectTimeoutMs
+     * @return
+     * @throws Exception
+     */
+    public Map<String, String> microPayWithPos(Map<String, String> reqData, int connectTimeoutMs) throws Exception {
+        int remainingTimeMs = 60*1000;
+        long startTimestampMs = 0;
+        Map<String, String> lastResult = null;
+        Exception lastException = null;
+
+        while (true) {
+            startTimestampMs = WXPayUtil.getCurrentTimestampMs();
+            int readTimeoutMs = remainingTimeMs - connectTimeoutMs;
+            if (readTimeoutMs > 1000) {
+                try {
+                    lastResult = this.microPay(reqData, connectTimeoutMs, readTimeoutMs);
+                    String returnCode = lastResult.get("return_code");
+                    if (returnCode.equals("SUCCESS")) {
+                        String resultCode = lastResult.get("result_code");
+                        String errCode = lastResult.get("err_code");
+                        if (resultCode.equals("SUCCESS")) {
+                            break;
+                        }
+                        else {
+                            // 看错误码，若支付结果未知，则重试提交刷卡支付
+                            if (errCode.equals("SYSTEMERROR") || errCode.equals("BANKERROR") || errCode.equals("USERPAYING")) {
+                                remainingTimeMs = remainingTimeMs - (int)(WXPayUtil.getCurrentTimestampMs() - startTimestampMs);
+                                if (remainingTimeMs <= 100) {
+                                    break;
+                                }
+                                else {
+                                    WXPayUtil.getLogger().info("microPayWithPos: try micropay again");
+                                    if (remainingTimeMs > 5*1000) {
+                                        Thread.sleep(5*1000);
+                                    }
+                                    else {
+                                        Thread.sleep(1*1000);
+                                    }
+                                    continue;
+                                }
+                            }
+                            else {
+                                break;
+                            }
+                        }
+                    }
+                    else {
+                        break;
+                    }
+                }
+                catch (Exception ex) {
+                    lastResult = null;
+                    lastException = ex;
+                }
+            }
+            else {
+                break;
+            }
+        }
+
+        if (lastResult == null) {
+            throw lastException;
+        }
+        else {
+            return lastResult;
+        }
+    }
+
+
+
+    /**
+     * 作用：统一下单<br>
+     * 场景：公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> unifiedOrder(Map<String, String> reqData) throws Exception {
+        return this.unifiedOrder(reqData, config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：统一下单<br>
+     * 场景：公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> unifiedOrder(Map<String, String> reqData,  int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_UNIFIEDORDER_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.UNIFIEDORDER_URL_SUFFIX;
+        }
+        if(this.notifyUrl != null) {
+            reqData.put("notify_url", this.notifyUrl);
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：查询订单<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> orderQuery(Map<String, String> reqData) throws Exception {
+        return this.orderQuery(reqData, config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：查询订单<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据 int
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> orderQuery(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_ORDERQUERY_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.ORDERQUERY_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：撤销订单<br>
+     * 场景：刷卡支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> reverse(Map<String, String> reqData) throws Exception {
+        return this.reverse(reqData, config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：撤销订单<br>
+     * 场景：刷卡支付<br>
+     * 其他：需要证书
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> reverse(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_REVERSE_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.REVERSE_URL_SUFFIX;
+        }
+        String respXml = this.requestWithCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：关闭订单<br>
+     * 场景：公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> closeOrder(Map<String, String> reqData) throws Exception {
+        return this.closeOrder(reqData, config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：关闭订单<br>
+     * 场景：公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> closeOrder(Map<String, String> reqData,  int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_CLOSEORDER_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.CLOSEORDER_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：申请退款<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> refund(Map<String, String> reqData) throws Exception {
+        return this.refund(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：申请退款<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付<br>
+     * 其他：需要证书
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> refund(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_REFUND_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.REFUND_URL_SUFFIX;
+        }
+        String respXml = this.requestWithCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：退款查询<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> refundQuery(Map<String, String> reqData) throws Exception {
+        return this.refundQuery(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：退款查询<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> refundQuery(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_REFUNDQUERY_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.REFUNDQUERY_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：对账单下载（成功时返回对账单数据，失败时返回XML格式数据）<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> downloadBill(Map<String, String> reqData) throws Exception {
+        return this.downloadBill(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：对账单下载<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付<br>
+     * 其他：无论是否成功都返回Map。若成功，返回的Map中含有return_code、return_msg、data，
+     *      其中return_code为`SUCCESS`，data为对账单数据。
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return 经过封装的API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> downloadBill(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_DOWNLOADBILL_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.DOWNLOADBILL_URL_SUFFIX;
+        }
+        String respStr = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs).trim();
+        Map<String, String> ret;
+        // 出现错误，返回XML数据
+        if (respStr.indexOf("<") == 0) {
+            ret = WXPayUtil.xmlToMap(respStr);
+        }
+        else {
+            // 正常返回csv数据
+            ret = new HashMap<String, String>();
+            ret.put("return_code", WXPayConstants.SUCCESS);
+            ret.put("return_msg", "ok");
+            ret.put("data", respStr);
+        }
+        return ret;
+    }
+
+
+    /**
+     * 作用：交易保障<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> report(Map<String, String> reqData) throws Exception {
+        return this.report(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：交易保障<br>
+     * 场景：刷卡支付、公共号支付、扫码支付、APP支付
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> report(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_REPORT_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.REPORT_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return WXPayUtil.xmlToMap(respXml);
+    }
+
+
+    /**
+     * 作用：转换短链接<br>
+     * 场景：刷卡支付、扫码支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> shortUrl(Map<String, String> reqData) throws Exception {
+        return this.shortUrl(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：转换短链接<br>
+     * 场景：刷卡支付、扫码支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> shortUrl(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_SHORTURL_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.SHORTURL_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+    /**
+     * 作用：授权码查询OPENID接口<br>
+     * 场景：刷卡支付
+     * @param reqData 向wxpay post的请求数据
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> authCodeToOpenid(Map<String, String> reqData) throws Exception {
+        return this.authCodeToOpenid(reqData, this.config.getHttpConnectTimeoutMs(), this.config.getHttpReadTimeoutMs());
+    }
+
+
+    /**
+     * 作用：授权码查询OPENID接口<br>
+     * 场景：刷卡支付
+     * @param reqData 向wxpay post的请求数据
+     * @param connectTimeoutMs 连接超时时间，单位是毫秒
+     * @param readTimeoutMs 读超时时间，单位是毫秒
+     * @return API返回数据
+     * @throws Exception
+     */
+    public Map<String, String> authCodeToOpenid(Map<String, String> reqData, int connectTimeoutMs, int readTimeoutMs) throws Exception {
+        String url;
+        if (this.useSandbox) {
+            url = WXPayConstants.SANDBOX_AUTHCODETOOPENID_URL_SUFFIX;
+        }
+        else {
+            url = WXPayConstants.AUTHCODETOOPENID_URL_SUFFIX;
+        }
+        String respXml = this.requestWithoutCert(url, this.fillRequestData(reqData), connectTimeoutMs, readTimeoutMs);
+        return this.processResponseXml(respXml);
+    }
+
+
+} // end class

payment-base-app/src/main/java/com/base/springcloud/wxsdk/WXPayConfig.java

@@ -0,0 +1,103 @@
+package com.base.springcloud.wxsdk;
+
+import java.io.InputStream;
+
+public abstract class WXPayConfig {
+
+
+
+    /**
+     * 获取 App ID
+     *
+     * @return App ID
+     */
+    abstract String getAppID();
+
+
+    /**
+     * 获取 Mch ID
+     *
+     * @return Mch ID
+     */
+    abstract String getMchID();
+
+
+    /**
+     * 获取 API 密钥
+     *
+     * @return API密钥
+     */
+    abstract String getKey();
+
+
+    /**
+     * 获取商户证书内容
+     *
+     * @return 商户证书内容
+     */
+    abstract InputStream getCertStream();
+
+    /**
+     * HTTP(S) 连接超时时间，单位毫秒
+     *
+     * @return
+     */
+    public int getHttpConnectTimeoutMs() {
+        return 6*1000;
+    }
+
+    /**
+     * HTTP(S) 读数据超时时间，单位毫秒
+     *
+     * @return
+     */
+    public int getHttpReadTimeoutMs() {
+        return 8*1000;
+    }
+
+    /**
+     * 获取WXPayDomain, 用于多域名容灾自动切换
+     * @return
+     */
+    abstract IWXPayDomain getWXPayDomain();
+
+    /**
+     * 是否自动上报。
+     * 若要关闭自动上报，子类中实现该函数返回 false 即可。
+     *
+     * @return
+     */
+    public boolean shouldAutoReport() {
+        return true;
+    }
+
+    /**
+     * 进行健康上报的线程的数量
+     *
+     * @return
+     */
+    public int getReportWorkerNum() {
+        return 6;
+    }
+
+
+    /**
+     * 健康上报缓存消息的最大数量。会有线程去独立上报
+     * 粗略计算：加入一条消息200B，10000消息占用空间 2000 KB，约为2MB，可以接受
+     *
+     * @return
+     */
+    public int getReportQueueMaxSize() {
+        return 10000;
+    }
+
+    /**
+     * 批量上报，一次最多上报多个数据
+     *
+     * @return
+     */
+    public int getReportBatchSize() {
+        return 10;
+    }
+
+}

payment-base-app/src/main/java/com/base/springcloud/wxsdk/WXPayConstants.java

@@ -0,0 +1,59 @@
+package com.base.springcloud.wxsdk;
+
+import org.apache.http.client.HttpClient;
+
+/**
+ * 常量
+ */
+public class WXPayConstants {
+
+    public enum SignType {
+        MD5, HMACSHA256
+    }
+
+    public static final String DOMAIN_API = "api.mch.weixin.qq.com";
+    public static final String DOMAIN_API2 = "api2.mch.weixin.qq.com";
+    public static final String DOMAIN_APIHK = "apihk.mch.weixin.qq.com";
+    public static final String DOMAIN_APIUS = "apius.mch.weixin.qq.com";
+
+
+    public static final String FAIL     = "FAIL";
+    public static final String SUCCESS  = "SUCCESS";
+    public static final String HMACSHA256 = "HMAC-SHA256";
+    public static final String MD5 = "MD5";
+
+    public static final String FIELD_SIGN = "sign";
+    public static final String FIELD_SIGN_TYPE = "sign_type";
+
+    public static final String WXPAYSDK_VERSION = "WXPaySDK/3.0.9";
+    public static final String USER_AGENT = WXPAYSDK_VERSION +
+            " (" + System.getProperty("os.arch") + " " + System.getProperty("os.name") + " " + System.getProperty("os.version") +
+            ") Java/" + System.getProperty("java.version") + " HttpClient/" + HttpClient.class.getPackage().getImplementationVersion();
+
+    public static final String MICROPAY_URL_SUFFIX     = "/pay/micropay";
+    public static final String UNIFIEDORDER_URL_SUFFIX = "/pay/unifiedorder";
+    public static final String ORDERQUERY_URL_SUFFIX   = "/pay/orderquery";
+    public static final String REVERSE_URL_SUFFIX      = "/secapi/pay/reverse";
+    public static final String CLOSEORDER_URL_SUFFIX   = "/pay/closeorder";
+    public static final String REFUND_URL_SUFFIX       = "/secapi/pay/refund";
+    public static final String REFUNDQUERY_URL_SUFFIX  = "/pay/refundquery";
+    public static final String DOWNLOADBILL_URL_SUFFIX = "/pay/downloadbill";
+    public static final String REPORT_URL_SUFFIX       = "/payitil/report";
+    public static final String SHORTURL_URL_SUFFIX     = "/tools/shorturl";
+    public static final String AUTHCODETOOPENID_URL_SUFFIX = "/tools/authcodetoopenid";
+
+    // sandbox
+    public static final String SANDBOX_MICROPAY_URL_SUFFIX     = "/sandboxnew/pay/micropay";
+    public static final String SANDBOX_UNIFIEDORDER_URL_SUFFIX = "/sandboxnew/pay/unifiedorder";
+    public static final String SANDBOX_ORDERQUERY_URL_SUFFIX   = "/sandboxnew/pay/orderquery";
+    public static final String SANDBOX_REVERSE_URL_SUFFIX      = "/sandboxnew/secapi/pay/reverse";
+    public static final String SANDBOX_CLOSEORDER_URL_SUFFIX   = "/sandboxnew/pay/closeorder";
+    public static final String SANDBOX_REFUND_URL_SUFFIX       = "/sandboxnew/secapi/pay/refund";
+    public static final String SANDBOX_REFUNDQUERY_URL_SUFFIX  = "/sandboxnew/pay/refundquery";
+    public static final String SANDBOX_DOWNLOADBILL_URL_SUFFIX = "/sandboxnew/pay/downloadbill";
+    public static final String SANDBOX_REPORT_URL_SUFFIX       = "/sandboxnew/payitil/report";
+    public static final String SANDBOX_SHORTURL_URL_SUFFIX     = "/sandboxnew/tools/shorturl";
+    public static final String SANDBOX_AUTHCODETOOPENID_URL_SUFFIX = "/sandboxnew/tools/authcodetoopenid";
+
+}
+

payment-base-app/src/main/java/com/base/springcloud/wxsdk/WXPayReport.java

@@ -0,0 +1,265 @@
+package com.base.springcloud.wxsdk;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
+import org.apache.http.util.EntityUtils;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+
+/**
+ * 交易保障
+ */
+public class WXPayReport {
+
+    public static class ReportInfo {
+
+        /**
+         * 布尔变量使用int。0为false， 1为true。
+         */
+
+        // 基本信息
+        private String version = "v1";
+        private String sdk = WXPayConstants.WXPAYSDK_VERSION;
+        private String uuid;  // 交易的标识
+        private long timestamp;   // 上报时的时间戳，单位秒
+        private long elapsedTimeMillis; // 耗时，单位 毫秒
+
+        // 针对主域名
+        private String firstDomain;  // 第1次请求的域名
+        private boolean primaryDomain; //是否主域名
+        private int firstConnectTimeoutMillis;  // 第1次请求设置的连接超时时间，单位 毫秒
+        private int firstReadTimeoutMillis;  // 第1次请求设置的读写超时时间，单位 毫秒
+        private int firstHasDnsError;  // 第1次请求是否出现dns问题
+        private int firstHasConnectTimeout; // 第1次请求是否出现连接超时
+        private int firstHasReadTimeout; // 第1次请求是否出现连接超时
+
+        public ReportInfo(String uuid, long timestamp, long elapsedTimeMillis, String firstDomain, boolean primaryDomain, int firstConnectTimeoutMillis, int firstReadTimeoutMillis, boolean firstHasDnsError, boolean firstHasConnectTimeout, boolean firstHasReadTimeout) {
+            this.uuid = uuid;
+            this.timestamp = timestamp;
+            this.elapsedTimeMillis = elapsedTimeMillis;
+            this.firstDomain = firstDomain;
+            this.primaryDomain = primaryDomain;
+            this.firstConnectTimeoutMillis = firstConnectTimeoutMillis;
+            this.firstReadTimeoutMillis = firstReadTimeoutMillis;
+            this.firstHasDnsError = firstHasDnsError?1:0;
+            this.firstHasConnectTimeout = firstHasConnectTimeout?1:0;
+            this.firstHasReadTimeout = firstHasReadTimeout?1:0;
+         }
+
+        @Override
+        public String toString() {
+            return "ReportInfo{" +
+                    "version='" + version + '\'' +
+                    ", sdk='" + sdk + '\'' +
+                    ", uuid='" + uuid + '\'' +
+                    ", timestamp=" + timestamp +
+                    ", elapsedTimeMillis=" + elapsedTimeMillis +
+                    ", firstDomain='" + firstDomain + '\'' +
+                    ", primaryDomain=" + primaryDomain +
+                    ", firstConnectTimeoutMillis=" + firstConnectTimeoutMillis +
+                    ", firstReadTimeoutMillis=" + firstReadTimeoutMillis +
+                    ", firstHasDnsError=" + firstHasDnsError +
+                    ", firstHasConnectTimeout=" + firstHasConnectTimeout +
+                    ", firstHasReadTimeout=" + firstHasReadTimeout +
+                    '}';
+        }
+
+        /**
+         * 转换成 csv 格式
+         *
+         * @return
+         */
+        public String toLineString(String key) {
+            String separator = ",";
+            Object[] objects = new Object[] {
+                version, sdk, uuid, timestamp, elapsedTimeMillis,
+                    firstDomain, primaryDomain, firstConnectTimeoutMillis, firstReadTimeoutMillis,
+                    firstHasDnsError, firstHasConnectTimeout, firstHasReadTimeout
+            };
+            StringBuffer sb = new StringBuffer();
+            for(Object obj: objects) {
+                sb.append(obj).append(separator);
+            }
+            try {
+                String sign = WXPayUtil.HMACSHA256(sb.toString(), key);
+                sb.append(sign);
+                return sb.toString();
+            }
+            catch (Exception ex) {
+                return null;
+            }
+
+        }
+
+    }
+
+    private static final String REPORT_URL = "http://report.mch.weixin.qq.com/wxpay/report/default";
+    // private static final String REPORT_URL = "http://127.0.0.1:5000/test";
+
+
+    private static final int DEFAULT_CONNECT_TIMEOUT_MS = 6*1000;
+    private static final int DEFAULT_READ_TIMEOUT_MS = 8*1000;
+
+    private LinkedBlockingQueue<String> reportMsgQueue = null;
+    private WXPayConfig config;
+    private ExecutorService executorService;
+
+    private volatile static WXPayReport INSTANCE;
+
+    private WXPayReport(final WXPayConfig config) {
+        this.config = config;
+        reportMsgQueue = new LinkedBlockingQueue<String>(config.getReportQueueMaxSize());
+
+        // 添加处理线程
+        executorService = Executors.newFixedThreadPool(config.getReportWorkerNum(), new ThreadFactory() {
+            public Thread newThread(Runnable r) {
+                Thread t = Executors.defaultThreadFactory().newThread(r);
+                t.setDaemon(true);
+                return t;
+            }
+        });
+
+        if (config.shouldAutoReport()) {
+            WXPayUtil.getLogger().info("report worker num: {}", config.getReportWorkerNum());
+            for (int i = 0; i < config.getReportWorkerNum(); ++i) {
+                executorService.execute(new Runnable() {
+                    public void run() {
+                        while (true) {
+                            // 先用 take 获取数据
+                            try {
+                                StringBuffer sb = new StringBuffer();
+                                String firstMsg = reportMsgQueue.take();
+                                WXPayUtil.getLogger().info("get first report msg: {}", firstMsg);
+                                String msg = null;
+                                sb.append(firstMsg); //会阻塞至有消息
+                                int remainNum = config.getReportBatchSize() - 1;
+                                for (int j=0; j<remainNum; ++j) {
+                                    WXPayUtil.getLogger().info("try get remain report msg");
+                                    // msg = reportMsgQueue.poll();  // 不阻塞了
+                                    msg = reportMsgQueue.take();
+                                    WXPayUtil.getLogger().info("get remain report msg: {}", msg);
+                                    if (msg == null) {
+                                        break;
+                                    }
+                                    else {
+                                        sb.append("\n");
+                                        sb.append(msg);
+                                    }
+                                }
+                                // 上报
+                                WXPayReport.httpRequest(sb.toString(), DEFAULT_CONNECT_TIMEOUT_MS, DEFAULT_READ_TIMEOUT_MS);
+                            }
+                            catch (Exception ex) {
+                                WXPayUtil.getLogger().warn("report fail. reason: {}", ex.getMessage());
+                            }
+                        }
+                    }
+                });
+            }
+        }
+
+    }
+
+    /**
+     * 单例，双重校验，请在 JDK 1.5及更高版本中使用
+     *
+     * @param config
+     * @return
+     */
+    public static WXPayReport getInstance(WXPayConfig config) {
+        if (INSTANCE == null) {
+            synchronized (WXPayReport.class) {
+                if (INSTANCE == null) {
+                    INSTANCE = new WXPayReport(config);
+                }
+            }
+        }
+        return INSTANCE;
+    }
+
+    public void report(String uuid, long elapsedTimeMillis,
+                       String firstDomain, boolean primaryDomain, int firstConnectTimeoutMillis, int firstReadTimeoutMillis,
+                       boolean firstHasDnsError, boolean firstHasConnectTimeout, boolean firstHasReadTimeout) {
+        long currentTimestamp = WXPayUtil.getCurrentTimestamp();
+        ReportInfo reportInfo = new ReportInfo(uuid, currentTimestamp, elapsedTimeMillis,
+                firstDomain, primaryDomain, firstConnectTimeoutMillis, firstReadTimeoutMillis,
+                firstHasDnsError, firstHasConnectTimeout, firstHasReadTimeout);
+        String data = reportInfo.toLineString(config.getKey());
+        WXPayUtil.getLogger().info("report {}", data);
+        if (data != null) {
+            reportMsgQueue.offer(data);
+        }
+    }
+
+
+    @Deprecated
+    private void reportSync(final String data) throws Exception {
+        httpRequest(data, DEFAULT_CONNECT_TIMEOUT_MS, DEFAULT_READ_TIMEOUT_MS);
+    }
+
+    @Deprecated
+    private void reportAsync(final String data) throws Exception {
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    httpRequest(data, DEFAULT_CONNECT_TIMEOUT_MS, DEFAULT_READ_TIMEOUT_MS);
+                }
+                catch (Exception ex) {
+                    WXPayUtil.getLogger().warn("report fail. reason: {}", ex.getMessage());
+                }
+            }
+        }).start();
+    }
+
+    /**
+     * http 请求
+     * @param data
+     * @param connectTimeoutMs
+     * @param readTimeoutMs
+     * @return
+     * @throws Exception
+     */
+    private static String httpRequest(String data, int connectTimeoutMs, int readTimeoutMs) throws Exception{
+        BasicHttpClientConnectionManager connManager;
+        connManager = new BasicHttpClientConnectionManager(
+                RegistryBuilder.<ConnectionSocketFactory>create()
+                        .register("http", PlainConnectionSocketFactory.getSocketFactory())
+                        .register("https", SSLConnectionSocketFactory.getSocketFactory())
+                        .build(),
+                null,
+                null,
+                null
+        );
+        HttpClient httpClient = HttpClientBuilder.create()
+                .setConnectionManager(connManager)
+                .build();
+
+        HttpPost httpPost = new HttpPost(REPORT_URL);
+
+        RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(readTimeoutMs).setConnectTimeout(connectTimeoutMs).build();
+        httpPost.setConfig(requestConfig);
+
+        StringEntity postEntity = new StringEntity(data, "UTF-8");
+        httpPost.addHeader("Content-Type", "text/xml");
+        httpPost.addHeader("User-Agent", WXPayConstants.USER_AGENT);
+        httpPost.setEntity(postEntity);
+
+        HttpResponse httpResponse = httpClient.execute(httpPost);
+        HttpEntity httpEntity = httpResponse.getEntity();
+        return EntityUtils.toString(httpEntity, "UTF-8");
+    }
+
+}

payment-base-app/src/main/java/com/base/springcloud/wxsdk/WXPayRequest.java

@@ -0,0 +1,257 @@
+package com.base.springcloud.wxsdk;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.ConnectTimeoutException;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.DefaultHostnameVerifier;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
+import org.apache.http.util.EntityUtils;
+
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import java.io.InputStream;
+import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
+import java.security.KeyStore;
+import java.security.SecureRandom;
+import static com.base.springcloud.wxsdk.WXPayConstants.USER_AGENT;
+
+public class WXPayRequest {
+    private WXPayConfig config;
+    public WXPayRequest(WXPayConfig config){
+
+        this.config = config;
+    }
+
+    /**
+     * 请求，只请求一次，不做重试
+     * @param domain
+     * @param urlSuffix
+     * @param uuid
+     * @param data
+     * @param connectTimeoutMs
+     * @param readTimeoutMs
+     * @param useCert 是否使用证书，针对退款、撤销等操作
+     * @return
+     * @throws Exception
+     */
+    private String requestOnce(final String domain, String urlSuffix, String uuid, String data, int connectTimeoutMs, int readTimeoutMs, boolean useCert) throws Exception {
+        BasicHttpClientConnectionManager connManager;
+        if (useCert) {
+            // 证书
+            char[] password = config.getMchID().toCharArray();
+            InputStream certStream = config.getCertStream();
+            KeyStore ks = KeyStore.getInstance("PKCS12");
+            ks.load(certStream, password);
+
+            // 实例化密钥库 & 初始化密钥工厂
+            KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+            kmf.init(ks, password);
+
+            // 创建 SSLContext
+            SSLContext sslContext = SSLContext.getInstance("TLS");
+            sslContext.init(kmf.getKeyManagers(), null, new SecureRandom());
+
+            SSLConnectionSocketFactory sslConnectionSocketFactory = new SSLConnectionSocketFactory(
+                    sslContext,
+                    new String[]{"TLSv1"},
+                    null,
+                    new DefaultHostnameVerifier());
+
+            connManager = new BasicHttpClientConnectionManager(
+                    RegistryBuilder.<ConnectionSocketFactory>create()
+                            .register("http", PlainConnectionSocketFactory.getSocketFactory())
+                            .register("https", sslConnectionSocketFactory)
+                            .build(),
+                    null,
+                    null,
+                    null
+            );
+        }
+        else {
+            connManager = new BasicHttpClientConnectionManager(
+                    RegistryBuilder.<ConnectionSocketFactory>create()
+                            .register("http", PlainConnectionSocketFactory.getSocketFactory())
+                            .register("https", SSLConnectionSocketFactory.getSocketFactory())
+                            .build(),
+                    null,
+                    null,
+                    null
+            );
+        }
+
+        HttpClient httpClient = HttpClientBuilder.create()
+                .setConnectionManager(connManager)
+                .build();
+
+        String url = "https://" + domain + urlSuffix;
+        HttpPost httpPost = new HttpPost(url);
+
+        RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(readTimeoutMs).setConnectTimeout(connectTimeoutMs).build();
+        httpPost.setConfig(requestConfig);
+
+        StringEntity postEntity = new StringEntity(data, "UTF-8");
+        httpPost.addHeader("Content-Type", "text/xml");
+        httpPost.addHeader("User-Agent", USER_AGENT + " " + config.getMchID());
+        httpPost.setEntity(postEntity);
+
+        HttpResponse httpResponse = httpClient.execute(httpPost);
+        HttpEntity httpEntity = httpResponse.getEntity();
+        return EntityUtils.toString(httpEntity, "UTF-8");
+
+    }
+
+
+    private String request(String urlSuffix, String uuid, String data, int connectTimeoutMs, int readTimeoutMs, boolean useCert, boolean autoReport) throws Exception {
+        Exception exception = null;
+        long elapsedTimeMillis = 0;
+        long startTimestampMs = WXPayUtil.getCurrentTimestampMs();
+        boolean firstHasDnsErr = false;
+        boolean firstHasConnectTimeout = false;
+        boolean firstHasReadTimeout = false;
+        IWXPayDomain.DomainInfo domainInfo = config.getWXPayDomain().getDomain(config);
+        if(domainInfo == null){
+            throw new Exception("WXPayConfig.getWXPayDomain().getDomain() is empty or null");
+        }
+        try {
+            String result = requestOnce(domainInfo.domain, urlSuffix, uuid, data, connectTimeoutMs, readTimeoutMs, useCert);
+            elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs()-startTimestampMs;
+            config.getWXPayDomain().report(domainInfo.domain, elapsedTimeMillis, null);
+            WXPayReport.getInstance(config).report(
+                    uuid,
+                    elapsedTimeMillis,
+                    domainInfo.domain,
+                    domainInfo.primaryDomain,
+                    connectTimeoutMs,
+                    readTimeoutMs,
+                    firstHasDnsErr,
+                    firstHasConnectTimeout,
+                    firstHasReadTimeout);
+            return result;
+        }
+        catch (UnknownHostException ex) {  // dns 解析错误，或域名不存在
+            exception = ex;
+            firstHasDnsErr = true;
+            elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs()-startTimestampMs;
+            WXPayUtil.getLogger().warn("UnknownHostException for domainInfo {}", domainInfo);
+            WXPayReport.getInstance(config).report(
+                    uuid,
+                    elapsedTimeMillis,
+                    domainInfo.domain,
+                    domainInfo.primaryDomain,
+                    connectTimeoutMs,
+                    readTimeoutMs,
+                    firstHasDnsErr,
+                    firstHasConnectTimeout,
+                    firstHasReadTimeout
+            );
+        }
+        catch (ConnectTimeoutException ex) {
+            exception = ex;
+            firstHasConnectTimeout = true;
+            elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs()-startTimestampMs;
+            WXPayUtil.getLogger().warn("connect timeout happened for domainInfo {}", domainInfo);
+            WXPayReport.getInstance(config).report(
+                    uuid,
+                    elapsedTimeMillis,
+                    domainInfo.domain,
+                    domainInfo.primaryDomain,
+                    connectTimeoutMs,
+                    readTimeoutMs,
+                    firstHasDnsErr,
+                    firstHasConnectTimeout,
+                    firstHasReadTimeout
+            );
+        }
+        catch (SocketTimeoutException ex) {
+            exception = ex;
+            firstHasReadTimeout = true;
+            elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs()-startTimestampMs;
+            WXPayUtil.getLogger().warn("timeout happened for domainInfo {}", domainInfo);
+            WXPayReport.getInstance(config).report(
+                    uuid,
+                    elapsedTimeMillis,
+                    domainInfo.domain,
+                    domainInfo.primaryDomain,
+                    connectTimeoutMs,
+                    readTimeoutMs,
+                    firstHasDnsErr,
+                    firstHasConnectTimeout,
+                    firstHasReadTimeout);
+        }
+        catch (Exception ex) {
+            exception = ex;
+            elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs()-startTimestampMs;
+            WXPayReport.getInstance(config).report(
+                    uuid,
+                    elapsedTimeMillis,
+                    domainInfo.domain,
+                    domainInfo.primaryDomain,
+                    connectTimeoutMs,
+                    readTimeoutMs,
+                    firstHasDnsErr,
+                    firstHasConnectTimeout,
+                    firstHasReadTimeout);
+        }
+        config.getWXPayDomain().report(domainInfo.domain, elapsedTimeMillis, exception);
+        throw exception;
+    }
+
+
+    /**
+     * 可重试的，非双向认证的请求
+     * @param urlSuffix
+     * @param uuid
+     * @param data
+     * @return
+     */
+    public String requestWithoutCert(String urlSuffix, String uuid, String data, boolean autoReport) throws Exception {
+        return this.request(urlSuffix, uuid, data, config.getHttpConnectTimeoutMs(), config.getHttpReadTimeoutMs(), false, autoReport);
+    }
+
+    /**
+     * 可重试的，非双向认证的请求
+     * @param urlSuffix
+     * @param uuid
+     * @param data
+     * @param connectTimeoutMs
+     * @param readTimeoutMs
+     * @return
+     */
+    public String requestWithoutCert(String urlSuffix, String uuid, String data, int connectTimeoutMs, int readTimeoutMs,  boolean autoReport) throws Exception {
+        return this.request(urlSuffix, uuid, data, connectTimeoutMs, readTimeoutMs, false, autoReport);
+    }
+
+    /**
+     * 可重试的，双向认证的请求
+     * @param urlSuffix
+     * @param uuid
+     * @param data
+     * @return
+     */
+    public String requestWithCert(String urlSuffix, String uuid, String data, boolean autoReport) throws Exception {
+        return this.request(urlSuffix, uuid, data, config.getHttpConnectTimeoutMs(), config.getHttpReadTimeoutMs(), true, autoReport);
+    }
+
+    /**
+     * 可重试的，双向认证的请求
+     * @param urlSuffix
+     * @param uuid
+     * @param data
+     * @param connectTimeoutMs
+     * @param readTimeoutMs
+     * @return
+     */
+    public String requestWithCert(String urlSuffix, String uuid, String data, int connectTimeoutMs, int readTimeoutMs, boolean autoReport) throws Exception {
+        return this.request(urlSuffix, uuid, data, connectTimeoutMs, readTimeoutMs, true, autoReport);
+    }
+}

payment-base-app/src/main/java/com/base/springcloud/wxsdk/WXPayUtil.java

@@ -0,0 +1,298 @@
+package com.base.springcloud.wxsdk;
+
+import com.base.springcloud.wxsdk.WXPayConstants.SignType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.security.MessageDigest;
+import java.security.SecureRandom;
+import java.util.*;
+
+
+public class WXPayUtil {
+
+    private static final String SYMBOLS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+    private static final Random RANDOM = new SecureRandom();
+
+    /**
+     * XML格式字符串转换为Map
+     *
+     * @param strXML XML字符串
+     * @return XML数据转换后的Map
+     * @throws Exception
+     */
+    public static Map<String, String> xmlToMap(String strXML) throws Exception {
+        try {
+            Map<String, String> data = new HashMap<String, String>();
+            DocumentBuilder documentBuilder = WXPayXmlUtil.newDocumentBuilder();
+            InputStream stream = new ByteArrayInputStream(strXML.getBytes("UTF-8"));
+            org.w3c.dom.Document doc = documentBuilder.parse(stream);
+            doc.getDocumentElement().normalize();
+            NodeList nodeList = doc.getDocumentElement().getChildNodes();
+            for (int idx = 0; idx < nodeList.getLength(); ++idx) {
+                Node node = nodeList.item(idx);
+                if (node.getNodeType() == Node.ELEMENT_NODE) {
+                    org.w3c.dom.Element element = (org.w3c.dom.Element) node;
+                    data.put(element.getNodeName(), element.getTextContent());
+                }
+            }
+            try {
+                stream.close();
+            } catch (Exception ex) {
+                // do nothing
+            }
+            return data;
+        } catch (Exception ex) {
+            WXPayUtil.getLogger().warn("Invalid XML, can not convert to map. Error message: {}. XML content: {}", ex.getMessage(), strXML);
+            throw ex;
+        }
+
+    }
+
+    /**
+     * 将Map转换为XML格式的字符串
+     *
+     * @param data Map类型数据
+     * @return XML格式的字符串
+     * @throws Exception
+     */
+    public static String mapToXml(Map<String, String> data) throws Exception {
+        org.w3c.dom.Document document = WXPayXmlUtil.newDocument();
+        org.w3c.dom.Element root = document.createElement("xml");
+        document.appendChild(root);
+        for (String key: data.keySet()) {
+            String value = data.get(key);
+            if (value == null) {
+                value = "";
+            }
+            value = value.trim();
+            org.w3c.dom.Element filed = document.createElement(key);
+            filed.appendChild(document.createTextNode(value));
+            root.appendChild(filed);
+        }
+        TransformerFactory tf = TransformerFactory.newInstance();
+        Transformer transformer = tf.newTransformer();
+        DOMSource source = new DOMSource(document);
+        transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+        transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+        StringWriter writer = new StringWriter();
+        StreamResult result = new StreamResult(writer);
+        transformer.transform(source, result);
+        String output = writer.getBuffer().toString(); //.replaceAll("\n|\r", "");
+        try {
+            writer.close();
+        }
+        catch (Exception ex) {
+        }
+        return output;
+    }
+
+
+    /**
+     * 生成带有 sign 的 XML 格式字符串
+     *
+     * @param data Map类型数据
+     * @param key API密钥
+     * @return 含有sign字段的XML
+     */
+    public static String generateSignedXml(final Map<String, String> data, String key) throws Exception {
+        return generateSignedXml(data, key, SignType.MD5);
+    }
+
+    /**
+     * 生成带有 sign 的 XML 格式字符串
+     *
+     * @param data Map类型数据
+     * @param key API密钥
+     * @param signType 签名类型
+     * @return 含有sign字段的XML
+     */
+    public static String generateSignedXml(final Map<String, String> data, String key, SignType signType) throws Exception {
+        String sign = generateSignature(data, key, signType);
+        data.put(WXPayConstants.FIELD_SIGN, sign);
+        return mapToXml(data);
+    }
+
+
+    /**
+     * 判断签名是否正确
+     *
+     * @param xmlStr XML格式数据
+     * @param key API密钥
+     * @return 签名是否正确
+     * @throws Exception
+     */
+    public static boolean isSignatureValid(String xmlStr, String key) throws Exception {
+        Map<String, String> data = xmlToMap(xmlStr);
+        if (!data.containsKey(WXPayConstants.FIELD_SIGN) ) {
+            return false;
+        }
+        String sign = data.get(WXPayConstants.FIELD_SIGN);
+        return generateSignature(data, key).equals(sign);
+    }
+
+    /**
+     * 判断签名是否正确，必须包含sign字段，否则返回false。使用MD5签名。
+     *
+     * @param data Map类型数据
+     * @param key API密钥
+     * @return 签名是否正确
+     * @throws Exception
+     */
+    public static boolean isSignatureValid(Map<String, String> data, String key) throws Exception {
+        return isSignatureValid(data, key, SignType.MD5);
+    }
+
+    /**
+     * 判断签名是否正确，必须包含sign字段，否则返回false。
+     *
+     * @param data Map类型数据
+     * @param key API密钥
+     * @param signType 签名方式
+     * @return 签名是否正确
+     * @throws Exception
+     */
+    public static boolean isSignatureValid(Map<String, String> data, String key, SignType signType) throws Exception {
+        if (!data.containsKey(WXPayConstants.FIELD_SIGN) ) {
+            return false;
+        }
+        String sign = data.get(WXPayConstants.FIELD_SIGN);
+        return generateSignature(data, key, signType).equals(sign);
+    }
+
+    /**
+     * 生成签名
+     *
+     * @param data 待签名数据
+     * @param key API密钥
+     * @return 签名
+     */
+    public static String generateSignature(final Map<String, String> data, String key) throws Exception {
+        return generateSignature(data, key, SignType.MD5);
+    }
+
+    /**
+     * 生成签名. 注意，若含有sign_type字段，必须和signType参数保持一致。
+     *
+     * @param data 待签名数据
+     * @param key API密钥
+     * @param signType 签名方式
+     * @return 签名
+     */
+    public static String generateSignature(final Map<String, String> data, String key, SignType signType) throws Exception {
+        Set<String> keySet = data.keySet();
+        String[] keyArray = keySet.toArray(new String[keySet.size()]);
+        Arrays.sort(keyArray);
+        StringBuilder sb = new StringBuilder();
+        for (String k : keyArray) {
+            if (k.equals(WXPayConstants.FIELD_SIGN)) {
+                continue;
+            }
+            if (data.get(k).trim().length() > 0) // 参数值为空，则不参与签名
+                sb.append(k).append("=").append(data.get(k).trim()).append("&");
+        }
+        sb.append("key=").append(key);
+        //String signDate = sb.toString().substring(0,sb.toString().length() -1);
+        //System.out.println("签名串:" + signDate);
+        if (SignType.MD5.equals(signType)) {
+            return MD5(sb.toString()).toUpperCase();
+        }
+        else if (SignType.HMACSHA256.equals(signType)) {
+            return HMACSHA256(sb.toString(), key);
+        }
+        else {
+            throw new Exception(String.format("Invalid sign_type: %s", signType));
+        }
+    }
+
+
+    /**
+     * 获取随机字符串 Nonce Str
+     *
+     * @return String 随机字符串
+     */
+    public static String generateNonceStr() {
+        char[] nonceChars = new char[32];
+        for (int index = 0; index < nonceChars.length; ++index) {
+            nonceChars[index] = SYMBOLS.charAt(RANDOM.nextInt(SYMBOLS.length()));
+        }
+        return new String(nonceChars);
+    }
+
+
+    /**
+     * 生成 MD5
+     *
+     * @param data 待处理数据
+     * @return MD5结果
+     */
+    public static String MD5(String data) throws Exception {
+        MessageDigest md = MessageDigest.getInstance("MD5");
+        byte[] array = md.digest(data.getBytes("UTF-8"));
+        StringBuilder sb = new StringBuilder();
+        for (byte item : array) {
+            sb.append(Integer.toHexString((item & 0xFF) | 0x100).substring(1, 3));
+        }
+        return sb.toString().toUpperCase();
+    }
+
+    /**
+     * 生成 HMACSHA256
+     * @param data 待处理数据
+     * @param key 密钥
+     * @return 加密结果
+     * @throws Exception
+     */
+    public static String HMACSHA256(String data, String key) throws Exception {
+        System.out.println("签名串:"+data);
+        Mac sha256_HMAC = Mac.getInstance("HmacSHA256");
+        SecretKeySpec secret_key = new SecretKeySpec(key.getBytes("UTF-8"), "HmacSHA256");
+        sha256_HMAC.init(secret_key);
+        byte[] array = sha256_HMAC.doFinal(data.getBytes("UTF-8"));
+        StringBuilder sb = new StringBuilder();
+        for (byte item : array) {
+            sb.append(Integer.toHexString((item & 0xFF) | 0x100).substring(1, 3));
+        }
+        return sb.toString().toUpperCase();
+    }
+
+    /**
+     * 日志
+     * @return
+     */
+    public static Logger getLogger() {
+        Logger logger = LoggerFactory.getLogger("wxpay java sdk");
+        return logger;
+    }
+
+    /**
+     * 获取当前时间戳，单位秒
+     * @return
+     */
+    public static long getCurrentTimestamp() {
+        return System.currentTimeMillis()/1000;
+    }
+
+    /**
+     * 获取当前时间戳，单位毫秒
+     * @return
+     */
+    public static long getCurrentTimestampMs() {
+        return System.currentTimeMillis();
+    }
+
+}

payment-base-app/src/main/java/com/base/springcloud/wxsdk/WXPayXmlUtil.java

@@ -0,0 +1,27 @@
+package com.base.springcloud.wxsdk;
+
+import org.w3c.dom.Document;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+public final class WXPayXmlUtil {
+    public static DocumentBuilder newDocumentBuilder() throws ParserConfigurationException {
+        DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+        documentBuilderFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+        documentBuilderFactory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+        documentBuilderFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+        documentBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+        documentBuilderFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+        documentBuilderFactory.setXIncludeAware(false);
+        documentBuilderFactory.setExpandEntityReferences(false);
+
+        return documentBuilderFactory.newDocumentBuilder();
+    }
+
+    public static Document newDocument() throws ParserConfigurationException {
+        return newDocumentBuilder().newDocument();
+    }
+}

payment-base-app/src/main/java/com/base/springcloud/util/WxpayUtils.java → payment-base-app/src/main/java/com/base/springcloud/wxsdk/WxpayUtils.java

@@ -1,17 +1,18 @@
-package com.base.springcloud.util;
+package com.base.springcloud.wxsdk;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.base.springcloud.constant.PaymentConstant;
 import com.base.springcloud.entity.CallbackBodyVo;
 import com.base.springcloud.entity.WxpayRefundVo;
 import com.base.springcloud.entity.WxpayTradeVo;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.base.springcloud.util.StringHelper;
 import com.wechat.pay.contrib.apache.httpclient.WechatPayHttpClientBuilder;
 import com.wechat.pay.contrib.apache.httpclient.util.PemUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
@@ -19,7 +20,6 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.util.EntityUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Base64Utils;
-import sun.misc.BASE64Decoder;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
@@ -40,11 +40,6 @@ import java.time.ZoneOffset;
 import java.util.*;
 import java.util.stream.Collectors;
 
-/**
- * 微信支付帮助类
- *
- * @author shuaifengjie.com
- */
 @Component
 @Slf4j
 public class WxpayUtils {
@@ -59,35 +54,90 @@ public class WxpayUtils {
 	 * @param serialNo
 	 * @return
 	 */
-	public static ObjectNode getWxpay(WxpayTradeVo tradeVo, String scene, String privateKey, String certificate, String serialNo) {
+	public static JSONObject getWxpay(WxpayTradeVo tradeVo, String scene, String privateKey, String certificate, String serialNo) {
 		// ...
 		String responseBody = response(JSON.toJSONString(tradeVo), getUrl(scene), tradeVo.getMchid(), privateKey, certificate, serialNo);
 		log.info("======>>> wxpay response body: ", responseBody);
 		// parse
 		Map<String, String> resultMap = StringHelper.json2map(responseBody);
-		ObjectMapper objectMapper = new ObjectMapper();
-		ObjectNode objectNode = objectMapper.createObjectNode();
+		JSONObject jsonObject = new JSONObject();
 		if (PaymentConstant.NATIVE.equals(scene)) {// pc - 扫码支付（Native）
-			objectNode.put("code_url", resultMap.get("code_url"));
+			jsonObject.put("code_url", resultMap.get("code_url"));
 		} else if (PaymentConstant.H5.equals(scene)) {// 手机网页（H5）
-			objectNode.put("h5_url", resultMap.get("h5_url"));
+			jsonObject.put("h5_url", resultMap.get("h5_url"));
 		} else if (PaymentConstant.JSAPI.equals(scene)) {// 微信公众号（H5）
 			String prepayId = resultMap.get("prepay_id");
-			objectNode.put("prepay_id", prepayId);
+			jsonObject.put("prepay_id", prepayId);
 			// ...
-			objectNode.put("appId", tradeVo.getAppid());
+			jsonObject.put("appId", tradeVo.getAppid());
 			String timestamp = getTimestamp();
-			objectNode.put("timeStamp", timestamp);
+			jsonObject.put("timeStamp", timestamp);
 			String nonceStr = CreateNoncestr();
-			objectNode.put("nonceStr", nonceStr);
+			jsonObject.put("nonceStr", nonceStr);
 			String packageStr = "prepay_id=" + prepayId;
-			objectNode.put("package", packageStr);
+			jsonObject.put("package", packageStr);
 			// 签名
 			String paySign = doRequestSign(privateKey, tradeVo.getAppid(), timestamp, nonceStr, packageStr);
-			objectNode.put("paySign", paySign);
-			objectNode.put("signType", "RSA");
+			jsonObject.put("paySign", paySign);
+			jsonObject.put("signType", "RSA");
+		}
+		return jsonObject;
+	}
+
+	/**
+	 * 订单查询
+	 * @param url
+	 * @param mchId
+	 * @param privateKey
+	 * @param certificate
+	 * @param serialNo
+	 * @return true - 成功  false - 失败
+	 */
+	public static Boolean queryWxOrder(String type,String url,String mchId, String privateKey, String certificate, String serialNo) {
+		HttpGet httpGet = new HttpGet(url);
+		httpGet.addHeader("Accept", "application/json");
+		CloseableHttpResponse response = null;
+		try {
+			// 商户私钥
+			PrivateKey merchantPrivateKey = PemUtil.loadPrivateKey(new ByteArrayInputStream(privateKey.getBytes("utf-8")));
+			response = getClient(mchId, serialNo, merchantPrivateKey, certificate).execute(httpGet);
+			log.info("query_wx_order response: {}",response);
+			int statusCode = response.getStatusLine().getStatusCode();
+			HttpEntity entity = response.getEntity();
+			String body = EntityUtils.toString(entity);
+			EntityUtils.consume(entity);
+			JSONObject jsonObject = JSONObject.parseObject(body);
+			if (statusCode != 200) {
+				Map<String, String> errorMsg = StringHelper.json2map(body);
+				// FIXME 请求微信失败
+			}
+			log.info("query_wx_order response resultMap: {}",jsonObject.toJSONString());
+			switch (type) {
+				case PaymentConstant.PAY_ORDER:
+					if (PaymentConstant.WX_SUCCESS.equals(jsonObject.getString("trade_state"))) {
+						log.info("query_wx_order query true");
+						return true;
+					}
+					return false;
+				case PaymentConstant.REFUND_ORDER:
+					if (PaymentConstant.WX_SUCCESS.equals(jsonObject.getString("status"))) {
+						log.info("query_wx_order query true");
+						return true;
 					}
-		return objectNode;
+					return false;
+			}
+		} catch (IOException e) {
+			log.error("======>>> wxpay response, client exception: {}", e);
+		} catch (Exception e) {
+			log.error("======>>> wxpay response, exception: {}", e);
+		} finally {
+			try {
+				response.close();
+			} catch (IOException e) {
+				log.error("======>>> wxpay response, ioe exception: {}", e);
+			}
+		}
+		return false;
 	}
 
 	/**
@@ -100,10 +150,11 @@ public class WxpayUtils {
 	 * @param serialNo
 	 * @return
 	 */
-		public static void refund(WxpayRefundVo tradeVo, String mchid, String privateKey, String certificate, String serialNo) {
+	public static String refund(WxpayRefundVo tradeVo, String mchid, String privateKey, String certificate, String serialNo) {
 		// ...
 		String responseBody = response(JSON.toJSONString(tradeVo), REFUND_URL, mchid, privateKey, certificate, serialNo);
 		log.info("======>>> wxrefund response body: ", responseBody);
+		return responseBody;
 	}
 
 	/**
@@ -118,8 +169,6 @@ public class WxpayUtils {
 	 * @return
 	 */
 	public static String response(String data, String url, String mchid, String privateKey, String certificate, String serialNo) {
-		log.info("====>>> wxpay response, mchid: {}, serialNo: {}, url: {}, privateKey: {}, certificate: {}, data: {}",
-				mchid, serialNo, url, privateKey, certificate, data);
 		HttpPost httpPost = new HttpPost(url);
 		StringEntity reqEntity = new StringEntity(data, ContentType.create("application/json", "utf-8"));
 		httpPost.setEntity(reqEntity);
@@ -167,8 +216,8 @@ public class WxpayUtils {
 	 * @throws UnsupportedEncodingException
 	 */
 	public static CloseableHttpClient getClient(String mchid, String serialNo, PrivateKey privateKey, String certificate) throws CertificateException, IOException {
-		//byte[] bytes = certificate.getBytes(StandardCharsets.UTF_8);
-		ByteArrayInputStream base = new ByteArrayInputStream(new BASE64Decoder().decodeBuffer(certificate));
+		byte[] bytes = certificate.getBytes(StandardCharsets.UTF_8);
+		ByteArrayInputStream base = new ByteArrayInputStream(bytes);
 		List<X509Certificate> certs = new ArrayList<>();
 		CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509");
 		X509Certificate cert = null;

payment-base-app/src/main/resources/application-dev.yml

@@ -0,0 +1,64 @@
+server:
+  port: 5080 #服务端口
+  servlet:
+    context-path: /rbs-pay
+#spring相关配置
+spring:
+  application:
+    name: mcroservice-payment  #服务名
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource  #当前数据源操作类型
+    driver-class-name: org.gjt.mm.mysql.Driver  #数据库驱动包
+    url: jdbc:mysql://106.14.81.251:3306/rbs_erp_test?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false
+    username: root
+    password: hnrr%%360
+    #rabbitmq 配置
+    #rabbitmq:
+    #host: localhost
+    #port: 5672
+    #username: rbs-payment
+    #password: pay123123
+  # redis 配置
+  redis:
+    database: 1
+    host: 47.102.131.171
+    lettuce:
+      pool:
+        max-active: 8   #最大连接数据库连接数,设 0 为没有限制
+        max-idle: 8     #最大等待连接中的数量,设 0 为没有限制
+        max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
+        min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
+      shutdown-timeout: 100ms
+    password: Redis@CS0731
+    port: 6200
+  #JimuReport[上传配置]
+jeecg:
+  # local|minio|alioss
+  uploadType: alioss
+  # local
+  path:
+    #文件路径
+    upload: /opt/upload
+  # alioss
+  oss:
+    staticDomain: http://rrimage.oss-cn-beijing.aliyuncs.com
+    endpoint: oss-cn-beijing.aliyuncs.com
+    accessKey: LTAIFKTe6ghqO5q2
+    secretKey: 8rhlQcMggzfx5jIWpMK8idayrHungs
+    bucketName: rrimage
+  # minio
+  minio:
+    minio_url: http://minio.jeecg.com
+    minio_name: ??
+    minio_pass: ??
+    bucketName: ??
+  cache:
+    type: simple
+  servlet:
+    multipart :
+    max-request-size : 10MB
+    max-file-size : 10MB
+#mybatis:配置
+mybatis:
+  type-aliases-package: com.base.springcloud.dao #实体类包路径
+  mapper-locations: classpath*:com/base/payment/mapper/*.xml #mapper.xml路径

payment-base-app/target/classes/application.yml → payment-base-app/src/main/resources/application-prod.yml

@@ -1,7 +1,5 @@
 server:
   port: 5080 #服务端口
-  servlet:
-    context-path: /rbs-pay
 #spring相关配置
 spring:
   application:
@@ -46,12 +44,3 @@ spring:
 mybatis:
   type-aliases-package: com.base.springcloud.dao #实体类包路径
   mapper-locations: classpath*:com/base/payment/mapper/*.xml #mapper.xml路径
-
-ftp:
-  ftp_ip: 192.168.71.132
-  ftp_prot : 21
-  ftp_username : wangying
-  ftp_password : 123456
-  ftp_basepath : /home/wangying
-test_ftp:
-  file_path : G:\TestFile\

payment-base-app/src/main/resources/application.yml

@@ -1,57 +1,3 @@
-server:
-  port: 5080 #服务端口
-  servlet:
-    context-path: /rbs-pay
-#spring相关配置
 spring:
-  application:
-    name: mcroservice-payment  #服务名
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource  #当前数据源操作类型
-    driver-class-name: org.gjt.mm.mysql.Driver  #数据库驱动包
-    url: jdbc:mysql://rm-uf672osw4deemr4yt.mysql.rds.aliyuncs.com:3306/rbs_erp?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false
-    username: hnrr
-    password: hnrr@0b6759c29a8e
-    #rabbitmq 配置
-    #rabbitmq:
-    #host: localhost
-    #port: 5672
-    #username: rbs-payment
-    #password: pay123123
-  # redis 配置
-  redis:
-    database: 10
-    # 地址
-    host: r-uf643kmbsoz7ledq2j.redis.rds.aliyuncs.com
-    # 端口，默认为6379
-    port: 6379
-    # 密码
-    password: rds@53798a0fa6ce
-    # 连接超时时间
-    timeout: 10s
-    lettuce:
-      pool:
-        # 连接池中的最小空闲连接
-        min-idle: 0
-        # 连接池中的最大空闲连接
-        # 连接池的最大数据库连接数
-        max-active: 8
-        # #连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-wait: -1ms
-  servlet:
-    multipart :
-    max-request-size : 10MB
-    max-file-size : 10MB
-#mybatis:配置
-mybatis:
-  type-aliases-package: com.base.springcloud.dao #实体类包路径
-  mapper-locations: classpath*:com/base/payment/mapper/*.xml #mapper.xml路径
-
-ftp:
-  ftp_ip: 192.168.71.132
-  ftp_prot : 21
-  ftp_username : wangying
-  ftp_password : 123456
-  ftp_basepath : /home/wangying
-test_ftp:
-  file_path : G:\TestFile\
+  profiles:
+    active: dev

payment-base-app/src/main/resources/com/base/payment/mapper/DepartMapper.xml

@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.base.springcloud.dao.DepartMapper">
+  <resultMap id="BaseResultMap" type="com.base.springcloud.entity.Depart">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="parent_id" jdbcType="VARCHAR" property="parentId" />
+    <result column="depart_name" jdbcType="VARCHAR" property="departName" />
+    <result column="depart_name_en" jdbcType="VARCHAR" property="departNameEn" />
+    <result column="depart_name_abbr" jdbcType="VARCHAR" property="departNameAbbr" />
+    <result column="depart_order" jdbcType="INTEGER" property="departOrder" />
+    <result column="description" jdbcType="VARCHAR" property="description" />
+    <result column="org_category" jdbcType="VARCHAR" property="orgCategory" />
+    <result column="org_type" jdbcType="VARCHAR" property="orgType" />
+    <result column="org_code" jdbcType="VARCHAR" property="orgCode" />
+    <result column="mobile" jdbcType="VARCHAR" property="mobile" />
+    <result column="fax" jdbcType="VARCHAR" property="fax" />
+    <result column="address" jdbcType="VARCHAR" property="address" />
+    <result column="memo" jdbcType="VARCHAR" property="memo" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
+    <result column="del_flag" jdbcType="VARCHAR" property="delFlag" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="ct_company_id" jdbcType="VARCHAR" property="ctCompanyId" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, parent_id, depart_name, depart_name_en, depart_name_abbr, depart_order, description, 
+    org_category, org_type, org_code, mobile, fax, address, memo, status, del_flag, create_by, 
+    create_time, update_by, update_time, ct_company_id
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from sys_depart
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from sys_depart
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.base.springcloud.entity.Depart">
+    insert into sys_depart (id, parent_id, depart_name, 
+      depart_name_en, depart_name_abbr, depart_order, 
+      description, org_category, org_type, 
+      org_code, mobile, fax, 
+      address, memo, status, 
+      del_flag, create_by, create_time, 
+      update_by, update_time, ct_company_id
+      )
+    values (#{id,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, #{departName,jdbcType=VARCHAR}, 
+      #{departNameEn,jdbcType=VARCHAR}, #{departNameAbbr,jdbcType=VARCHAR}, #{departOrder,jdbcType=INTEGER}, 
+      #{description,jdbcType=VARCHAR}, #{orgCategory,jdbcType=VARCHAR}, #{orgType,jdbcType=VARCHAR}, 
+      #{orgCode,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{fax,jdbcType=VARCHAR}, 
+      #{address,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, 
+      #{delFlag,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{ctCompanyId,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.base.springcloud.entity.Depart">
+    insert into sys_depart
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="parentId != null">
+        parent_id,
+      </if>
+      <if test="departName != null">
+        depart_name,
+      </if>
+      <if test="departNameEn != null">
+        depart_name_en,
+      </if>
+      <if test="departNameAbbr != null">
+        depart_name_abbr,
+      </if>
+      <if test="departOrder != null">
+        depart_order,
+      </if>
+      <if test="description != null">
+        description,
+      </if>
+      <if test="orgCategory != null">
+        org_category,
+      </if>
+      <if test="orgType != null">
+        org_type,
+      </if>
+      <if test="orgCode != null">
+        org_code,
+      </if>
+      <if test="mobile != null">
+        mobile,
+      </if>
+      <if test="fax != null">
+        fax,
+      </if>
+      <if test="address != null">
+        address,
+      </if>
+      <if test="memo != null">
+        memo,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="delFlag != null">
+        del_flag,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateBy != null">
+        update_by,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="ctCompanyId != null">
+        ct_company_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="parentId != null">
+        #{parentId,jdbcType=VARCHAR},
+      </if>
+      <if test="departName != null">
+        #{departName,jdbcType=VARCHAR},
+      </if>
+      <if test="departNameEn != null">
+        #{departNameEn,jdbcType=VARCHAR},
+      </if>
+      <if test="departNameAbbr != null">
+        #{departNameAbbr,jdbcType=VARCHAR},
+      </if>
+      <if test="departOrder != null">
+        #{departOrder,jdbcType=INTEGER},
+      </if>
+      <if test="description != null">
+        #{description,jdbcType=VARCHAR},
+      </if>
+      <if test="orgCategory != null">
+        #{orgCategory,jdbcType=VARCHAR},
+      </if>
+      <if test="orgType != null">
+        #{orgType,jdbcType=VARCHAR},
+      </if>
+      <if test="orgCode != null">
+        #{orgCode,jdbcType=VARCHAR},
+      </if>
+      <if test="mobile != null">
+        #{mobile,jdbcType=VARCHAR},
+      </if>
+      <if test="fax != null">
+        #{fax,jdbcType=VARCHAR},
+      </if>
+      <if test="address != null">
+        #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="delFlag != null">
+        #{delFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="createBy != null">
+        #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ctCompanyId != null">
+        #{ctCompanyId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.base.springcloud.entity.Depart">
+    update sys_depart
+    <set>
+      <if test="parentId != null">
+        parent_id = #{parentId,jdbcType=VARCHAR},
+      </if>
+      <if test="departName != null">
+        depart_name = #{departName,jdbcType=VARCHAR},
+      </if>
+      <if test="departNameEn != null">
+        depart_name_en = #{departNameEn,jdbcType=VARCHAR},
+      </if>
+      <if test="departNameAbbr != null">
+        depart_name_abbr = #{departNameAbbr,jdbcType=VARCHAR},
+      </if>
+      <if test="departOrder != null">
+        depart_order = #{departOrder,jdbcType=INTEGER},
+      </if>
+      <if test="description != null">
+        description = #{description,jdbcType=VARCHAR},
+      </if>
+      <if test="orgCategory != null">
+        org_category = #{orgCategory,jdbcType=VARCHAR},
+      </if>
+      <if test="orgType != null">
+        org_type = #{orgType,jdbcType=VARCHAR},
+      </if>
+      <if test="orgCode != null">
+        org_code = #{orgCode,jdbcType=VARCHAR},
+      </if>
+      <if test="mobile != null">
+        mobile = #{mobile,jdbcType=VARCHAR},
+      </if>
+      <if test="fax != null">
+        fax = #{fax,jdbcType=VARCHAR},
+      </if>
+      <if test="address != null">
+        address = #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        memo = #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="delFlag != null">
+        del_flag = #{delFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="createBy != null">
+        create_by = #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        update_by = #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ctCompanyId != null">
+        ct_company_id = #{ctCompanyId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.base.springcloud.entity.Depart">
+    update sys_depart
+    set parent_id = #{parentId,jdbcType=VARCHAR},
+      depart_name = #{departName,jdbcType=VARCHAR},
+      depart_name_en = #{departNameEn,jdbcType=VARCHAR},
+      depart_name_abbr = #{departNameAbbr,jdbcType=VARCHAR},
+      depart_order = #{departOrder,jdbcType=INTEGER},
+      description = #{description,jdbcType=VARCHAR},
+      org_category = #{orgCategory,jdbcType=VARCHAR},
+      org_type = #{orgType,jdbcType=VARCHAR},
+      org_code = #{orgCode,jdbcType=VARCHAR},
+      mobile = #{mobile,jdbcType=VARCHAR},
+      fax = #{fax,jdbcType=VARCHAR},
+      address = #{address,jdbcType=VARCHAR},
+      memo = #{memo,jdbcType=VARCHAR},
+      status = #{status,jdbcType=VARCHAR},
+      del_flag = #{delFlag,jdbcType=VARCHAR},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_by = #{updateBy,jdbcType=VARCHAR},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      ct_company_id = #{ctCompanyId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <select id="getUserDepart" parameterType="java.lang.String" resultType="java.lang.String">
+    select id
+    from sys_depart
+    where id in (
+        select dep_id
+        from sys_user_depart
+        where user_id = #{userId,jdbcType=VARCHAR}
+    )
+  </select>
+</mapper>

payment-base-app/src/main/resources/com/base/payment/mapper/MerchantConfigMapper.xml

@@ -10,7 +10,7 @@
         <result column="mch_id" jdbcType="VARCHAR" property="mchId"/>
         <result column="mch_private_key" jdbcType="VARCHAR" property="mchPrivateKey"/>
         <result column="create_id" jdbcType="VARCHAR" property="createId"/>
-        <result column="create_depart_id" jdbcType="VARCHAR" property="createDepartId"/>
+        <result column="create_company_id" jdbcType="VARCHAR" property="createCompanyId"/>
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="update_id" jdbcType="VARCHAR" property="updateId"/>
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
@@ -19,7 +19,7 @@
 
     <sql id="Base_Column_List">
         id,app_id,api_key,cert_path,serial_no,mch_id,mch_private_key,
-        create_id,create_depart_id,create_time,update_id,update_time,time_stamp
+        create_id,create_company_id,create_time,update_id,update_time,time_stamp
     </sql>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -28,11 +28,11 @@
   </delete>
     <insert id="insert" parameterType="com.base.springcloud.entity.MerchantConfig">
     insert into pay_merchant_config (id, app_id, api_key,
-      cert_path, serial_no,mch_id,mch_private_key, create_id, create_depart_id,
+      cert_path, serial_no,mch_id,mch_private_key, create_id, create_company_id,
       create_time, time_stamp)
     values (#{id,jdbcType=VARCHAR}, #{appId,jdbcType=VARCHAR}, #{apiKey,jdbcType=VARCHAR},
       #{certPath,jdbcType=VARCHAR}, #{serialNo,jdbcType=VARCHAR},#{mchId,jdbcType=VARCHAR}, #{mchPrivateKey,jdbcType=VARCHAR},
-      #{createId,jdbcType=VARCHAR}, #{createDepartId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
+      #{createId,jdbcType=VARCHAR}, #{createCompanyId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
       #{timeStamp,jdbcType=TIMESTAMP})
   </insert>
     <delete id="removeMerchantConfig" parameterType="java.lang.String">

payment-base-app/src/main/resources/com/base/payment/mapper/OrderBillMapper.xml

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.base.springcloud.dao.OrderBillMapper">
+  <resultMap id="BaseResultMap" type="com.base.springcloud.entity.OrderBill">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="order_id" jdbcType="VARCHAR" property="orderId" />
+    <result column="bill_id" jdbcType="VARCHAR" property="billId" />
+    <result column="soure_bill_id" jdbcType="VARCHAR" property="soureBillId" />
+    <result column="create_id" jdbcType="VARCHAR" property="createId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, order_id, bill_id, soure_bill_id, create_id, create_time
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from pay_order_bill
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from pay_order_bill
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.base.springcloud.entity.OrderBill">
+    insert into pay_order_bill (id, order_id, bill_id, 
+      soure_bill_id, create_id, create_time
+      )
+    values (#{id,jdbcType=VARCHAR}, #{orderId,jdbcType=VARCHAR}, #{billId,jdbcType=VARCHAR}, 
+      #{soureBillId,jdbcType=VARCHAR}, #{createId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.base.springcloud.entity.OrderBill">
+    insert into pay_order_bill
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="orderId != null">
+        order_id,
+      </if>
+      <if test="billId != null">
+        bill_id,
+      </if>
+      <if test="soureBillId != null">
+        soure_bill_id,
+      </if>
+      <if test="createId != null">
+        create_id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="orderId != null">
+        #{orderId,jdbcType=VARCHAR},
+      </if>
+      <if test="billId != null">
+        #{billId,jdbcType=VARCHAR},
+      </if>
+      <if test="soureBillId != null">
+        #{soureBillId,jdbcType=VARCHAR},
+      </if>
+      <if test="createId != null">
+        #{createId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.base.springcloud.entity.OrderBill">
+    update pay_order_bill
+    <set>
+      <if test="orderId != null">
+        order_id = #{orderId,jdbcType=VARCHAR},
+      </if>
+      <if test="billId != null">
+        bill_id = #{billId,jdbcType=VARCHAR},
+      </if>
+      <if test="soureBillId != null">
+        soure_bill_id = #{soureBillId,jdbcType=VARCHAR},
+      </if>
+      <if test="createId != null">
+        create_id = #{createId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.base.springcloud.entity.OrderBill">
+    update pay_order_bill
+    set order_id = #{orderId,jdbcType=VARCHAR},
+      bill_id = #{billId,jdbcType=VARCHAR},
+      soure_bill_id = #{soureBillId,jdbcType=VARCHAR},
+      create_id = #{createId,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+
+  <select id="getBillId" parameterType="java.lang.String" resultType="java.lang.String">
+    select bill_id
+    from pay_order_bill
+    <where>
+      order_id = #{orderId,jdbcType=VARCHAR}
+    </where>
+  </select>
+  <select id="getOrderId" parameterType="java.lang.String" resultType="java.lang.String">
+    select order_id
+    from pay_order_bill
+    <where>
+      bill_id = #{billId,jdbcType=VARCHAR}
+    </where>
+  </select>
+</mapper>

payment-base-app/src/main/resources/com/base/payment/mapper/OrderMapper.xml

@@ -12,12 +12,13 @@
     <result column="order_amount" jdbcType="VARCHAR" property="orderAmount" />
     <result column="good_name" jdbcType="VARCHAR" property="goodName" />
     <result column="good_id" jdbcType="VARCHAR" property="goodId" />
+    <result column="source_bill_id" jdbcType="VARCHAR" property="sourceBillId" />
     <result column="order_type" jdbcType="VARCHAR" property="orderType" />
     <result column="reserved" jdbcType="VARCHAR" property="reserved" />
   </resultMap>
   <sql id="Base_Column_List">
     id, order_no,order_state,mch_id,create_time, expire_time, request_no, order_amount, good_name, good_id,
-    order_type, reserved
+    order_type, reserved,source_bill_id
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
@@ -32,10 +33,10 @@
   <insert id="insert" parameterType="com.base.springcloud.entity.Order">
     insert into pay_order (id, order_no, mch_id, create_time,
       expire_time, request_no, order_amount, order_state,
-      good_name, good_id, order_type, reserved,time_stamp)
+      good_name, good_id, source_bill_id,order_type, reserved,time_stamp)
     values (#{id,jdbcType=VARCHAR}, #{orderNo,jdbcType=VARCHAR},#{mchId,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},
-      #{expireTime,jdbcType=TIMESTAMP}, #{requestNo,jdbcType=VARCHAR}, #{orderAmount,jdbcType=VARCHAR}, 
-      #{orderState,jdbcType=VARCHAR},#{goodName,jdbcType=VARCHAR}, #{goodId,jdbcType=VARCHAR}, #{orderType,jdbcType=VARCHAR},
+      #{expireTime,jdbcType=TIMESTAMP}, #{requestNo,jdbcType=VARCHAR}, #{orderAmount,jdbcType=VARCHAR}, #{orderState,jdbcType=VARCHAR},
+      #{goodName,jdbcType=VARCHAR}, #{goodId,jdbcType=VARCHAR},#{sourceBillId,jdbcType=VARCHAR}, #{orderType,jdbcType=VARCHAR},
       #{reserved,jdbcType=VARCHAR},#{timeStamp,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.base.springcloud.entity.Order">
@@ -163,7 +164,7 @@
     <include refid="Base_Column_List" />
     from pay_order
     <where>
-      order_state = 'W'
+      order_state = 'W' and retry_count &lt; 6
       and DATE_FORMAT(create_time,'%Y-%m-%d') = DATE_FORMAT(#{date},'%Y-%m-%d')
     </where>
     order by time_stamp desc limit 10
@@ -174,4 +175,20 @@
     set order_state = 'S'
     where order_no = #{orderNo,jdbcType=VARCHAR}
   </update>
+
+  <select id="origOrderInfo" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from pay_order
+    <where>
+      id = #{orderId,jdbcType=VARCHAR}
+    </where>
+  </select>
+  <update id="superPayCount" parameterType="java.lang.String">
+    update pay_order
+    set retry_count = retry_count + 1
+    <where>
+      id = #{id,jdbcType=VARCHAR}
+    </where>
+  </update>
 </mapper>

payment-base-app/src/main/resources/com/base/payment/mapper/PayDepartConfigMapper.xml

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.base.springcloud.dao.PayDepartConfigMapper">
+  <resultMap id="BaseResultMap" type="com.base.springcloud.entity.PayDepartConfig">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="mechant_config_id" jdbcType="VARCHAR" property="mechantConfigId" />
+    <result column="depart_id" jdbcType="VARCHAR" property="departId" />
+    <result column="create_id" jdbcType="VARCHAR" property="createId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, mechant_config_id, depart_id, create_id, create_time
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from pay_depart_config
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from pay_depart_config
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.base.springcloud.entity.PayDepartConfig">
+    insert into pay_depart_config (id, mechant_config_id, depart_id, 
+      create_id, create_time)
+    values (#{id,jdbcType=VARCHAR}, #{mechantConfigId,jdbcType=VARCHAR}, #{departId,jdbcType=VARCHAR}, 
+      #{createId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.base.springcloud.entity.PayDepartConfig">
+    insert into pay_depart_config
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="mechantConfigId != null">
+        mechant_config_id,
+      </if>
+      <if test="departId != null">
+        depart_id,
+      </if>
+      <if test="createId != null">
+        create_id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="mechantConfigId != null">
+        #{mechantConfigId,jdbcType=VARCHAR},
+      </if>
+      <if test="departId != null">
+        #{departId,jdbcType=VARCHAR},
+      </if>
+      <if test="createId != null">
+        #{createId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.base.springcloud.entity.PayDepartConfig">
+    update pay_depart_config
+    <set>
+      <if test="mechantConfigId != null">
+        mechant_config_id = #{mechantConfigId,jdbcType=VARCHAR},
+      </if>
+      <if test="departId != null">
+        depart_id = #{departId,jdbcType=VARCHAR},
+      </if>
+      <if test="createId != null">
+        create_id = #{createId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.base.springcloud.entity.PayDepartConfig">
+    update pay_depart_config
+    set mechant_config_id = #{mechantConfigId,jdbcType=VARCHAR},
+      depart_id = #{departId,jdbcType=VARCHAR},
+      create_id = #{createId,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

payment-base-app/src/main/resources/com/base/payment/mapper/RefundMapper.xml

@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.base.springcloud.dao.RefundMapper">
+  <resultMap id="BaseResultMap" type="com.base.springcloud.entity.Refund">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="mch_id" jdbcType="VARCHAR" property="mchId" />
+    <result column="refund_order_no" jdbcType="VARCHAR" property="refundOrderNo" />
+    <result column="refund_time" jdbcType="TIMESTAMP" property="refundTime" />
+    <result column="create_id" jdbcType="VARCHAR" property="createId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="orig_order_no" jdbcType="VARCHAR" property="origOrderNo" />
+    <result column="orig_order_time" jdbcType="TIMESTAMP" property="origOrderTime" />
+    <result column="source_bill_id" jdbcType="VARCHAR" property="sourceBillId" />
+    <result column="reason" jdbcType="VARCHAR" property="reason" />
+    <result column="refund_state" jdbcType="INTEGER" property="refundState" />
+    <result column="refund_retry_count" jdbcType="INTEGER" property="refundRetryCount" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id,mch_id, refund_order_no, refund_time, create_id, create_time, orig_order_no, orig_order_time,
+    source_bill_id, reason, refund_state, refund_retry_count
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from pay_refund
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from pay_refund
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.base.springcloud.entity.Refund">
+    insert into pay_refund (id,mch_id,refund_order_no, refund_time,
+      create_id, create_time, orig_order_no, 
+      orig_order_time, source_bill_id, reason, 
+      refund_state, refund_retry_count)
+    values (#{id,jdbcType=VARCHAR}, #{mchId,jdbcType=VARCHAR},#{refundOrderNo,jdbcType=VARCHAR}, #{refundTime,jdbcType=TIMESTAMP},
+      #{createId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{origOrderNo,jdbcType=VARCHAR}, 
+      #{origOrderTime,jdbcType=TIMESTAMP}, #{sourceBillId,jdbcType=VARCHAR}, #{reason,jdbcType=VARCHAR}, 
+      #{refundState,jdbcType=INTEGER}, #{refundRetryCount,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.base.springcloud.entity.Refund">
+    insert into pay_refund
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="refundOrderNo != null">
+        refund_order_no,
+      </if>
+      <if test="refundTime != null">
+        refund_time,
+      </if>
+      <if test="createId != null">
+        create_id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="origOrderNo != null">
+        orig_order_no,
+      </if>
+      <if test="origOrderTime != null">
+        orig_order_time,
+      </if>
+      <if test="sourceBillId != null">
+        source_bill_id,
+      </if>
+      <if test="reason != null">
+        reason,
+      </if>
+      <if test="refundState != null">
+        refund_state,
+      </if>
+      <if test="refundRetryCount != null">
+        refund_retry_count,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="refundOrderNo != null">
+        #{refundOrderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="refundTime != null">
+        #{refundTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createId != null">
+        #{createId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="origOrderNo != null">
+        #{origOrderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="origOrderTime != null">
+        #{origOrderTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sourceBillId != null">
+        #{sourceBillId,jdbcType=VARCHAR},
+      </if>
+      <if test="reason != null">
+        #{reason,jdbcType=VARCHAR},
+      </if>
+      <if test="refundState != null">
+        #{refundState,jdbcType=INTEGER},
+      </if>
+      <if test="refundRetryCount != null">
+        #{refundRetryCount,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.base.springcloud.entity.Refund">
+    update pay_refund
+    <set>
+      <if test="refundOrderNo != null">
+        refund_order_no = #{refundOrderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="refundTime != null">
+        refund_time = #{refundTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createId != null">
+        create_id = #{createId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="origOrderNo != null">
+        orig_order_no = #{origOrderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="origOrderTime != null">
+        orig_order_time = #{origOrderTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sourceBillId != null">
+        source_bill_id = #{sourceBillId,jdbcType=VARCHAR},
+      </if>
+      <if test="reason != null">
+        reason = #{reason,jdbcType=VARCHAR},
+      </if>
+      <if test="refundState != null">
+        refund_state = #{refundState,jdbcType=INTEGER},
+      </if>
+      <if test="refundRetryCount != null">
+        refund_retry_count = #{refundRetryCount,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.base.springcloud.entity.Refund">
+    update pay_refund
+    set refund_order_no = #{refundOrderNo,jdbcType=VARCHAR},
+      refund_time = #{refundTime,jdbcType=TIMESTAMP},
+      create_id = #{createId,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      orig_order_no = #{origOrderNo,jdbcType=VARCHAR},
+      orig_order_time = #{origOrderTime,jdbcType=TIMESTAMP},
+      source_bill_id = #{sourceBillId,jdbcType=VARCHAR},
+      reason = #{reason,jdbcType=VARCHAR},
+      refund_state = #{refundState,jdbcType=INTEGER},
+      refund_retry_count = #{refundRetryCount,jdbcType=INTEGER}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateRefundSuccess" parameterType="com.base.springcloud.entity.Refund">
+    update pay_refund
+    set refund_state = #{refundState,jdbcType=INTEGER}
+    <where>
+      refund_order_no = #{refundOrderNo,jdbcType=VARCHAR}
+    </where>
+  </update>
+  <update id="superRefundCount" parameterType="java.lang.String">
+    update pay_refund
+    set refund_retry_count = refund_retry_count + 1
+    <where>
+      id = #{id,jdbcType=VARCHAR}
+    </where>
+  </update>
+  <select id="queryRefundData" resultMap="BaseResultMap" parameterType="java.util.Date">
+    select
+    <include refid="Base_Column_List" />
+    from pay_refund
+    <where>
+      refund_state = '0' and refund_retry_count &lt; 6
+      and DATE_FORMAT(refund_time,'%Y-%m-%d') = DATE_FORMAT(#{date},'%Y-%m-%d')
+    </where>
+    order by refund_time desc limit 10
+  </select>
+</mapper>

payment-base-app/src/main/resources/com/base/payment/mapper/SaleBillMapper.xml

@@ -53,6 +53,9 @@
     lock_amount, source_no, is_same_settle, is_turn_sale, logistics_no, is_platform_supplier, 
     sale_no, is_delivery, is_auto, attachment, bill_proc_status, is_ref_stk
   </sql>
+  <sql id="Merge_Column_List">
+    id,total_amount,source_id
+  </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
@@ -534,6 +537,35 @@
     select
     <include refid="Base_Column_List" />
     from stk_io_bill
-    where bill_no = #{billNo,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+
+  <update id="writeOffBill" parameterType="com.base.springcloud.entity.SaleBill">
+    update stk_io_bill
+    set lock_amount = 0,
+    pay_amount = total_amount
+    where id in (
+     select bill_id from pay_order_bill where order_id = #{orderId,jdbcType=VARCHAR}
+    )
+  </update>
+
+  <select id="mergeBill" resultType="java.math.BigDecimal">
+    select
+    <include refid="Merge_Column_List" />
+    from stk_io_bill
+    where id in
+    <foreach collection="ids" item="item" open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}
+    </foreach>
+  </select>
+
+  <select id="childBill" resultMap="BaseResultMap">
+    select
+    <include refid="Merge_Column_List" />
+    from stk_io_bill
+    where source_id in
+    <foreach collection="ids" item="item" open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}
+    </foreach>
   </select>
 </mapper>

payment-base-app/src/main/resources/com/base/payment/mapper/UserMapper.xml

@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.base.springcloud.dao.UserMapper">
+  <resultMap id="BaseResultMap" type="com.base.springcloud.entity.User">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="username" jdbcType="VARCHAR" property="userName" />
+    <result column="realname" jdbcType="VARCHAR" property="realName" />
+    <result column="password" jdbcType="VARCHAR" property="password" />
+    <result column="salt" jdbcType="VARCHAR" property="salt" />
+    <result column="avatar" jdbcType="VARCHAR" property="avatar" />
+    <result column="birthday" jdbcType="TIMESTAMP" property="birthday" />
+    <result column="sex" jdbcType="INTEGER" property="sex" />
+    <result column="email" jdbcType="VARCHAR" property="email" />
+    <result column="phone" jdbcType="VARCHAR" property="phone" />
+    <result column="org_code" jdbcType="VARCHAR" property="orgCode" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
+    <result column="third_id" jdbcType="VARCHAR" property="thirdId" />
+    <result column="third_type" jdbcType="VARCHAR" property="thirdType" />
+    <result column="activiti_sync" jdbcType="INTEGER" property="activitiSync" />
+    <result column="work_no" jdbcType="VARCHAR" property="workNo" />
+    <result column="post" jdbcType="VARCHAR" property="post" />
+    <result column="telephone" jdbcType="VARCHAR" property="telephone" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="user_identity" jdbcType="INTEGER" property="userIdentity" />
+    <result column="depart_ids" jdbcType="VARCHAR" property="departIds" />
+    <result column="ct_company_id" jdbcType="TIMESTAMP" property="ctCompanyId" />
+    <result column="account_type" jdbcType="INTEGER" property="accountType" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, username, realname, password, salt, avatar, birthday, sex, email, phone, org_code, 
+    status, del_flag, third_id, third_type, activiti_sync, work_no, post, telephone, 
+    create_by, create_time, update_by, update_time, user_identity, depart_ids, ct_company_id, 
+    account_type
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from sys_user
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from sys_user
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.base.springcloud.entity.User">
+    insert into sys_user (id, username, realname, 
+      password, salt, avatar, 
+      birthday, sex, email, 
+      phone, org_code, status, 
+      del_flag, third_id, third_type, 
+      activiti_sync, work_no, post, 
+      telephone, create_by, create_time, 
+      update_by, update_time, user_identity, 
+      depart_ids, ct_company_id, account_type
+      )
+    values (#{id,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{realName,jdbcType=VARCHAR}, 
+      #{password,jdbcType=VARCHAR}, #{salt,jdbcType=VARCHAR}, #{avatar,jdbcType=VARCHAR}, 
+      #{birthday,jdbcType=TIMESTAMP}, #{sex,jdbcType=INTEGER}, #{email  ,jdbcType=VARCHAR}, 
+      #{phone,jdbcType=VARCHAR}, #{orgCode,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
+      #{delFlag,jdbcType=INTEGER}, #{thirdId,jdbcType=VARCHAR}, #{thirdType,jdbcType=VARCHAR}, 
+      #{activitiSync,jdbcType=INTEGER}, #{workNo,jdbcType=VARCHAR}, #{post,jdbcType=VARCHAR}, 
+      #{telephone,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{userIdentity,jdbcType=INTEGER}, 
+      #{departIds,jdbcType=VARCHAR}, #{ctCompanyId,jdbcType=TIMESTAMP}, #{accountType,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.base.springcloud.entity.User">
+    insert into sys_user
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="userName != null">
+        username,
+      </if>
+      <if test="realName != null">
+        realname,
+      </if>
+      <if test="password != null">
+        password,
+      </if>
+      <if test="salt != null">
+        salt,
+      </if>
+      <if test="avatar != null">
+        avatar,
+      </if>
+      <if test="birthday != null">
+        birthday,
+      </if>
+      <if test="sex != null">
+        sex,
+      </if>
+      <if test="email   != null">
+        email,
+      </if>
+      <if test="phone != null">
+        phone,
+      </if>
+      <if test="orgCode != null">
+        org_code,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="delFlag != null">
+        del_flag,
+      </if>
+      <if test="thirdId != null">
+        third_id,
+      </if>
+      <if test="thirdType != null">
+        third_type,
+      </if>
+      <if test="activitiSync != null">
+        activiti_sync,
+      </if>
+      <if test="workNo != null">
+        work_no,
+      </if>
+      <if test="post != null">
+        post,
+      </if>
+      <if test="telephone != null">
+        telephone,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateBy != null">
+        update_by,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="userIdentity != null">
+        user_identity,
+      </if>
+      <if test="departIds != null">
+        depart_ids,
+      </if>
+      <if test="ctCompanyId != null">
+        ct_company_id,
+      </if>
+      <if test="accountType != null">
+        account_type,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null">
+        #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="realName != null">
+        #{realName,jdbcType=VARCHAR},
+      </if>
+      <if test="password != null">
+        #{password,jdbcType=VARCHAR},
+      </if>
+      <if test="salt != null">
+        #{salt,jdbcType=VARCHAR},
+      </if>
+      <if test="avatar != null">
+        #{avatar,jdbcType=VARCHAR},
+      </if>
+      <if test="birthday != null">
+        #{birthday,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sex != null">
+        #{sex,jdbcType=INTEGER},
+      </if>
+      <if test="email   != null">
+        #{email  ,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null">
+        #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="orgCode != null">
+        #{orgCode,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="delFlag != null">
+        #{delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="thirdId != null">
+        #{thirdId,jdbcType=VARCHAR},
+      </if>
+      <if test="thirdType != null">
+        #{thirdType,jdbcType=VARCHAR},
+      </if>
+      <if test="activitiSync != null">
+        #{activitiSync,jdbcType=INTEGER},
+      </if>
+      <if test="workNo != null">
+        #{workNo,jdbcType=VARCHAR},
+      </if>
+      <if test="post != null">
+        #{post,jdbcType=VARCHAR},
+      </if>
+      <if test="telephone != null">
+        #{telephone,jdbcType=VARCHAR},
+      </if>
+      <if test="createBy != null">
+        #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="userIdentity != null">
+        #{userIdentity,jdbcType=INTEGER},
+      </if>
+      <if test="departIds != null">
+        #{departIds,jdbcType=VARCHAR},
+      </if>
+      <if test="ctCompanyId != null">
+        #{ctCompanyId,jdbcType=TIMESTAMP},
+      </if>
+      <if test="accountType != null">
+        #{accountType,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.base.springcloud.entity.User">
+    update sys_user
+    <set>
+      <if test="userName != null">
+        username = #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="realName != null">
+        realname = #{realName,jdbcType=VARCHAR},
+      </if>
+      <if test="password != null">
+        password = #{password,jdbcType=VARCHAR},
+      </if>
+      <if test="salt != null">
+        salt = #{salt,jdbcType=VARCHAR},
+      </if>
+      <if test="avatar != null">
+        avatar = #{avatar,jdbcType=VARCHAR},
+      </if>
+      <if test="birthday != null">
+        birthday = #{birthday,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sex != null">
+        sex = #{sex,jdbcType=INTEGER},
+      </if>
+      <if test="email   != null">
+        email = #{email  ,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null">
+        phone = #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="orgCode != null">
+        org_code = #{orgCode,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="delFlag != null">
+        del_flag = #{delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="thirdId != null">
+        third_id = #{thirdId,jdbcType=VARCHAR},
+      </if>
+      <if test="thirdType != null">
+        third_type = #{thirdType,jdbcType=VARCHAR},
+      </if>
+      <if test="activitiSync != null">
+        activiti_sync = #{activitiSync,jdbcType=INTEGER},
+      </if>
+      <if test="workNo != null">
+        work_no = #{workNo,jdbcType=VARCHAR},
+      </if>
+      <if test="post != null">
+        post = #{post,jdbcType=VARCHAR},
+      </if>
+      <if test="telephone != null">
+        telephone = #{telephone,jdbcType=VARCHAR},
+      </if>
+      <if test="createBy != null">
+        create_by = #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        update_by = #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="userIdentity != null">
+        user_identity = #{userIdentity,jdbcType=INTEGER},
+      </if>
+      <if test="departIds != null">
+        depart_ids = #{departIds,jdbcType=VARCHAR},
+      </if>
+      <if test="ctCompanyId != null">
+        ct_company_id = #{ctCompanyId,jdbcType=TIMESTAMP},
+      </if>
+      <if test="accountType != null">
+        account_type = #{accountType,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.base.springcloud.entity.User">
+    update sys_user
+    set username = #{userName,jdbcType=VARCHAR},
+      realname = #{realName,jdbcType=VARCHAR},
+      password = #{password,jdbcType=VARCHAR},
+      salt = #{salt,jdbcType=VARCHAR},
+      avatar = #{avatar,jdbcType=VARCHAR},
+      birthday = #{birthday,jdbcType=TIMESTAMP},
+      sex = #{sex,jdbcType=INTEGER},
+      email = #{email  ,jdbcType=VARCHAR},
+      phone = #{phone,jdbcType=VARCHAR},
+      org_code = #{orgCode,jdbcType=VARCHAR},
+      status = #{status,jdbcType=INTEGER},
+      del_flag = #{delFlag,jdbcType=INTEGER},
+      third_id = #{thirdId,jdbcType=VARCHAR},
+      third_type = #{thirdType,jdbcType=VARCHAR},
+      activiti_sync = #{activitiSync,jdbcType=INTEGER},
+      work_no = #{workNo,jdbcType=VARCHAR},
+      post = #{post,jdbcType=VARCHAR},
+      telephone = #{telephone,jdbcType=VARCHAR},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_by = #{updateBy,jdbcType=VARCHAR},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      user_identity = #{userIdentity,jdbcType=INTEGER},
+      depart_ids = #{departIds,jdbcType=VARCHAR},
+      ct_company_id = #{ctCompanyId,jdbcType=TIMESTAMP},
+      account_type = #{accountType,jdbcType=INTEGER}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <select id="getUser" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from sys_user
+    where username = #{userName,jdbcType=VARCHAR}
+  </select>
+</mapper>

payment-base-app/src/main/resources/generatorConfig.xml

@@ -27,7 +27,7 @@
         <!-- targetPackage：指定生成的model生成所在的包名 -->
         <!-- targetProject：指定在该项目下所在的路径  -->
         <javaModelGenerator targetPackage="com.base.springcloud.entity"
-                            targetProject="src/main/java">
+                            targetProject="payment-base-app/src/main/java">
             <!-- 是否允许子包，即targetPackage.schemaName.tableName -->
             <property name="enableSubPackages" value="false"/>
             <!-- 是否对model添加构造函数 -->
@@ -40,7 +40,7 @@
 
         <!-- 02 指定sql映射文件生成的位置 -->
         <sqlMapGenerator targetPackage="com.base.payment.mapper"
-                         targetProject="src/main/resources">
+                         targetProject="payment-base-app/src/main/resources">
             <!-- 是否允许子包，即targetPackage.schemaName.tableName -->
             <property name="enableSubPackages" value="false"/>
         </sqlMapGenerator>
@@ -50,7 +50,7 @@
         <!-- type="MIXEDMAPPER",生成基于注解的Java Model 和相应的Mapper对象 -->
         <!-- type="XMLMAPPER",生成SQLMap XML文件和独立的Mapper接口 -->
         <javaClientGenerator targetPackage="com.base.springcloud.dao"
-                             targetProject="src/main/java" type="XMLMAPPER">
+                             targetProject="payment-base-app/src/main/java" type="XMLMAPPER">
             <!-- 是否在当前路径下新加一层schema,false路径com.oop.eksp.user.model， true:com.oop.eksp.user.model.[schemaName] -->
             <property name="enableSubPackages" value="false"/>
         </javaClientGenerator>
@@ -60,55 +60,18 @@
         <!-- tableName为对应的数据库表 -->
         <!-- domainObjectName是要生成的实体类 -->
         <!-- enable*ByExample是否生成 example类 -->
-        <table tableName="stk_io_bill" domainObjectName="SaleBill"
+        <table tableName="pay_order_bill" domainObjectName="OrderBill"
                enableCountByExample="false" enableDeleteByExample="false"
                enableSelectByExample="false" enableUpdateByExample="false">
             <!-- 忽略列，不生成bean 字段 -->
             <!-- <ignoreColumn column="FRED" /> -->
             <!-- 指定列的java数据类型 -->
             <columnOverride column="id" property="id" jdbcType="VARCHAR" />
-            <columnOverride column="bill_no" property="billNo" jdbcType="VARCHAR" />
-            <columnOverride column="api_key" property="appKey" jdbcType="VARCHAR" />
-            <columnOverride column="stock_io_type" property="stockIoType" jdbcType="VARCHAR" />
-            <columnOverride column="is_rubric" property="isRubric" jdbcType="VARCHAR" />
-            <columnOverride column="bill_date" property="billDate" jdbcType="TIMESTAMP" />
-            <columnOverride column="source_id" property="sourceId" jdbcType="VARCHAR" />
-            <columnOverride column="source_type" property="sourceType" jdbcType="VARCHAR" />
-            <columnOverride column="clerk_id" property="clerkId" jdbcType="VARCHAR" />
-            <columnOverride column="handler_id" property="handlerId" jdbcType="VARCHAR" />
-            <columnOverride column="has_rp" property="hasRp" jdbcType="INTEGER" />
-            <columnOverride column="supplier_id" property="supplierId" jdbcType="VARCHAR" />
-            <columnOverride column="customer_id" property="customerId" jdbcType="VARCHAR" />
-            <columnOverride column="remark" property="remark" jdbcType="VARCHAR" />
-            <columnOverride column="approver_id" property="approverId" jdbcType="VARCHAR" />
-            <columnOverride column="flow_id" property="flowId" jdbcType="VARCHAR" />
-            <columnOverride column="is_approved" property="isApproved" jdbcType="INTEGER" />
-            <columnOverride column="effective_time" property="effectiveTime" jdbcType="TIMESTAMP" />
-            <columnOverride column="is_voided" property="isVoided" jdbcType="INTEGER" />
-            <columnOverride column="is_closed" property="isClosed" jdbcType="INTEGER" />
-            <columnOverride column="sys_org_code" property="sysOrgCode" jdbcType="VARCHAR" />
-            <columnOverride column="create_by" property="createBy" jdbcType="VARCHAR" />
+            <columnOverride column="order_id" property="orderId" jdbcType="VARCHAR" />
+            <columnOverride column="bill_id" property="billId" jdbcType="VARCHAR" />
+            <columnOverride column="soure_bill_id" property="soureBillId" jdbcType="VARCHAR" />
+            <columnOverride column="create_id" property="createId" jdbcType="VARCHAR" />
             <columnOverride column="create_time" property="createTime" jdbcType="TIMESTAMP" />
-            <columnOverride column="update_by" property="updateBy" jdbcType="VARCHAR" />
-            <columnOverride column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
-            <columnOverride column="version" property="version" jdbcType="INTEGER" />
-            <columnOverride column="ct_company_id" property="ctCompanyId" jdbcType="VARCHAR" />
-            <columnOverride column="attachment_id" property="attachmentId" jdbcType="VARCHAR" />
-            <columnOverride column="pay_amount" property="payAmount" jdbcType="DECIMAL" />
-            <columnOverride column="billStatus" property="billStatus" jdbcType="VARCHAR" />
-            <columnOverride column="totalAmount" property="totalAmount" jdbcType="DECIMAL" />
-            <columnOverride column="lock_amount" property="lockAmount" jdbcType="DECIMAL" />
-            <columnOverride column="source_no" property="sourceNo" jdbcType="VARCHAR" />
-            <columnOverride column="is_same_settle" property="isSameSettle" jdbcType="INTEGER" />
-            <columnOverride column="is_turn_sale" property="isTurnSale" jdbcType="VARCHAR" />
-            <columnOverride column="logistics_no" property="logisticsNo" jdbcType="VARCHAR" />
-            <columnOverride column="is_platform_supplier" property="isPlatformSupplier" jdbcType="INTEGER" />
-            <columnOverride column="sale_no" property="saleNo" jdbcType="VARCHAR" />
-            <columnOverride column="is_delivery" property="isDelivery" jdbcType="INTEGER" />
-            <columnOverride column="is_auto" property="isAuto" jdbcType="INTEGER" />
-            <columnOverride column="attachment" property="attachment" jdbcType="VARCHAR" />
-            <columnOverride column="bill_proc_status" property="billProcStatus" jdbcType="VARCHAR" />
-            <columnOverride column="is_ref_stk" property="isRefStk" jdbcType="INTEGER" />
         </table>
     </context>
 </generatorConfiguration>

payment-base-app/src/main/resources/logback-spring.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+	<!--定义日志文件的存储地址 -->
+	<property name="LOG_HOME" value="logs" />
+
+	<!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />-->
+	<!-- 控制台输出 -->
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
+		</encoder>
+	</appender>
+
+	<!-- 按照每天生成日志文件 -->
+	<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+			<!--日志文件输出的文件名 -->
+			<FileNamePattern>${LOG_HOME}/rbs_pay-%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+			<!--日志文件保留天数 -->
+			<MaxHistory>30</MaxHistory>
+			<maxFileSize>20MB</maxFileSize>
+		</rollingPolicy>
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
+		</encoder>
+	</appender>
+
+	<!-- 生成 error html格式日志开始 -->
+	<appender name="HTML" class="ch.qos.logback.core.FileAppender">
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+			<!--设置日志级别,过滤掉info日志,只输入error日志-->
+			<level>ERROR</level>
+		</filter>
+		<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+			<layout class="ch.qos.logback.classic.html.HTMLLayout">
+				<pattern>%p%d%msg%M%F{32}%L</pattern>
+			</layout>
+		</encoder>
+		<file>${LOG_HOME}/error-log.html</file>
+	</appender>
+	<!-- 生成 error html格式日志结束 -->
+
+	<!-- 每天生成一个html格式的日志开始 -->
+	<appender name="FILE_HTML" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+			<!--日志文件输出的文件名 -->
+			<FileNamePattern>${LOG_HOME}/jeecgboot-%d{yyyy-MM-dd}.%i.html</FileNamePattern>
+			<!--日志文件保留天数 -->
+			<MaxHistory>30</MaxHistory>
+			<MaxFileSize>10MB</MaxFileSize>
+		</rollingPolicy>
+		<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+			<layout class="ch.qos.logback.classic.html.HTMLLayout">
+				<pattern>%p%d%msg%M%F{32}%L</pattern>
+			</layout>
+		</encoder>
+	</appender>
+	<!-- 每天生成一个html格式的日志结束 -->
+
+	<!--myibatis log configure -->
+	<logger name="com.apache.ibatis" level="TRACE" />
+	<logger name="java.sql.Connection" level="DEBUG" />
+	<logger name="java.sql.Statement" level="DEBUG" />
+	<logger name="java.sql.PreparedStatement" level="DEBUG" />
+
+	<!-- 日志输出级别 -->
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+		<appender-ref ref="FILE" />
+		<appender-ref ref="HTML" />
+		<appender-ref ref="FILE_HTML" />
+	</root>
+
+</configuration>