diff --git a/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java b/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java index 389b7e3f..3389e3e4 100644 --- a/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java +++ b/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java @@ -6,8 +6,8 @@ import cn.lili.common.exception.ServiceException; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.payment.kit.CashierSupport; import cn.lili.modules.payment.kit.dto.PayParam; -import cn.lili.modules.payment.kit.enums.PaymentClientEnum; -import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; +import cn.lili.modules.payment.entity.enums.PaymentClientEnum; +import cn.lili.modules.payment.entity.enums.PaymentMethodEnum; import cn.lili.modules.payment.kit.params.dto.CashierParam; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/buyer-api/src/main/java/cn/lili/controller/payment/CashierRefundController.java b/buyer-api/src/main/java/cn/lili/controller/payment/CashierRefundController.java index e39c7225..d86173ca 100644 --- a/buyer-api/src/main/java/cn/lili/controller/payment/CashierRefundController.java +++ b/buyer-api/src/main/java/cn/lili/controller/payment/CashierRefundController.java @@ -1,10 +1,9 @@ package cn.lili.controller.payment; import cn.lili.modules.payment.kit.RefundSupport; -import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; +import cn.lili.modules.payment.entity.enums.PaymentMethodEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/consumer/maven-repository/com/xuxueli/xxl-job-admin/2.3.0-SNAPSHOT/_remote.repositories b/consumer/maven-repository/com/xuxueli/xxl-job-admin/2.3.0-SNAPSHOT/_remote.repositories deleted file mode 100644 index 945656cd..00000000 --- a/consumer/maven-repository/com/xuxueli/xxl-job-admin/2.3.0-SNAPSHOT/_remote.repositories +++ /dev/null @@ -1,4 +0,0 @@ -#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Thu Dec 24 11:13:34 CST 2020 -xxl-job-admin-2.3.0-SNAPSHOT.pom>= -xxl-job-admin-2.3.0-SNAPSHOT.jar>= diff --git a/consumer/maven-repository/com/xuxueli/xxl-job-admin/2.3.0-SNAPSHOT/maven-metadata-local.xml b/consumer/maven-repository/com/xuxueli/xxl-job-admin/2.3.0-SNAPSHOT/maven-metadata-local.xml deleted file mode 100644 index e4a32a10..00000000 --- a/consumer/maven-repository/com/xuxueli/xxl-job-admin/2.3.0-SNAPSHOT/maven-metadata-local.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - com.xuxueli - xxl-job-admin - 2.3.0-SNAPSHOT - - - true - - 20201224031334 - - - jar - 2.3.0-SNAPSHOT - 20201224031334 - - - pom - 2.3.0-SNAPSHOT - 20201224031334 - - - - diff --git a/consumer/maven-repository/com/xuxueli/xxl-job-admin/2.3.0-SNAPSHOT/xxl-job-admin-2.3.0-SNAPSHOT.jar b/consumer/maven-repository/com/xuxueli/xxl-job-admin/2.3.0-SNAPSHOT/xxl-job-admin-2.3.0-SNAPSHOT.jar deleted file mode 100644 index e6002908..00000000 Binary files a/consumer/maven-repository/com/xuxueli/xxl-job-admin/2.3.0-SNAPSHOT/xxl-job-admin-2.3.0-SNAPSHOT.jar and /dev/null differ diff --git a/consumer/maven-repository/com/xuxueli/xxl-job-admin/2.3.0-SNAPSHOT/xxl-job-admin-2.3.0-SNAPSHOT.pom b/consumer/maven-repository/com/xuxueli/xxl-job-admin/2.3.0-SNAPSHOT/xxl-job-admin-2.3.0-SNAPSHOT.pom deleted file mode 100644 index d8b2f9f9..00000000 --- a/consumer/maven-repository/com/xuxueli/xxl-job-admin/2.3.0-SNAPSHOT/xxl-job-admin-2.3.0-SNAPSHOT.pom +++ /dev/null @@ -1,113 +0,0 @@ - - 4.0.0 - - com.xuxueli - xxl-job - 2.3.0-SNAPSHOT - - xxl-job-admin - jar - - - - - org.springframework.boot - spring-boot-starter-parent - ${spring-boot.version} - pom - import - - - - - - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - org.springframework.boot - spring-boot-starter-freemarker - - - - - org.springframework.boot - spring-boot-starter-mail - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - ${mybatis-spring-boot-starter.version} - - - - mysql - mysql-connector-java - ${mysql-connector-java.version} - - - - - com.xuxueli - xxl-job-core - ${project.parent.version} - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - - - - repackage - - - - - - - com.spotify - docker-maven-plugin - 0.4.13 - - - ${project.artifactId}:${project.version} - ${project.basedir} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - - - - - - diff --git a/consumer/maven-repository/com/xuxueli/xxl-job-admin/maven-metadata-local.xml b/consumer/maven-repository/com/xuxueli/xxl-job-admin/maven-metadata-local.xml deleted file mode 100644 index 6bdd1f8b..00000000 --- a/consumer/maven-repository/com/xuxueli/xxl-job-admin/maven-metadata-local.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - com.xuxueli - xxl-job-admin - - - 2.3.0-SNAPSHOT - - 20201224031334 - - diff --git a/consumer/maven-repository/com/xuxueli/xxl-job-core/2.3.0-SNAPSHOT/_remote.repositories b/consumer/maven-repository/com/xuxueli/xxl-job-core/2.3.0-SNAPSHOT/_remote.repositories deleted file mode 100644 index cd11d002..00000000 --- a/consumer/maven-repository/com/xuxueli/xxl-job-core/2.3.0-SNAPSHOT/_remote.repositories +++ /dev/null @@ -1,4 +0,0 @@ -#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Thu Dec 24 11:13:30 CST 2020 -xxl-job-core-2.3.0-SNAPSHOT.pom>= -xxl-job-core-2.3.0-SNAPSHOT.jar>= diff --git a/consumer/maven-repository/com/xuxueli/xxl-job-core/2.3.0-SNAPSHOT/maven-metadata-local.xml b/consumer/maven-repository/com/xuxueli/xxl-job-core/2.3.0-SNAPSHOT/maven-metadata-local.xml deleted file mode 100644 index e48ba2f7..00000000 --- a/consumer/maven-repository/com/xuxueli/xxl-job-core/2.3.0-SNAPSHOT/maven-metadata-local.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - com.xuxueli - xxl-job-core - 2.3.0-SNAPSHOT - - - true - - 20201224031330 - - - jar - 2.3.0-SNAPSHOT - 20201224031330 - - - pom - 2.3.0-SNAPSHOT - 20201224031330 - - - - diff --git a/consumer/maven-repository/com/xuxueli/xxl-job-core/2.3.0-SNAPSHOT/resolver-status.properties b/consumer/maven-repository/com/xuxueli/xxl-job-core/2.3.0-SNAPSHOT/resolver-status.properties deleted file mode 100644 index 7033eb85..00000000 --- a/consumer/maven-repository/com/xuxueli/xxl-job-core/2.3.0-SNAPSHOT/resolver-status.properties +++ /dev/null @@ -1,6 +0,0 @@ -#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Thu Dec 24 20:01:24 CST 2020 -maven-metadata-maven-central.xml/@default-maven-central-http\://central.maven.org/maven2/.lastUpdated=1608811283852 -maven-metadata-aliyun.xml.error= -maven-metadata-maven-central.xml.error=Could not transfer metadata com.xuxueli\:xxl-job-core\:2.3.0-SNAPSHOT/maven-metadata.xml from/to maven-central (http\://central.maven.org/maven2/)\: Transfer failed for http\://central.maven.org/maven2/com/xuxueli/xxl-job-core/2.3.0-SNAPSHOT/maven-metadata.xml -maven-metadata-aliyun.xml.lastUpdated=1608811284126 diff --git a/consumer/maven-repository/com/xuxueli/xxl-job-core/2.3.0-SNAPSHOT/xxl-job-core-2.3.0-SNAPSHOT.jar b/consumer/maven-repository/com/xuxueli/xxl-job-core/2.3.0-SNAPSHOT/xxl-job-core-2.3.0-SNAPSHOT.jar deleted file mode 100644 index 68c8afce..00000000 Binary files a/consumer/maven-repository/com/xuxueli/xxl-job-core/2.3.0-SNAPSHOT/xxl-job-core-2.3.0-SNAPSHOT.jar and /dev/null differ diff --git a/consumer/maven-repository/com/xuxueli/xxl-job-core/2.3.0-SNAPSHOT/xxl-job-core-2.3.0-SNAPSHOT.pom b/consumer/maven-repository/com/xuxueli/xxl-job-core/2.3.0-SNAPSHOT/xxl-job-core-2.3.0-SNAPSHOT.pom deleted file mode 100644 index 80b0a194..00000000 --- a/consumer/maven-repository/com/xuxueli/xxl-job-core/2.3.0-SNAPSHOT/xxl-job-core-2.3.0-SNAPSHOT.pom +++ /dev/null @@ -1,64 +0,0 @@ - - 4.0.0 - - com.xuxueli - xxl-job - 2.3.0-SNAPSHOT - - xxl-job-core - jar - - ${project.artifactId} - A distributed task scheduling framework. - https://www.xuxueli.com/ - - - - - - io.netty - netty-all - ${netty-all.version} - - - com.google.code.gson - gson - ${gson.version} - - - - - - org.codehaus.groovy - groovy - ${groovy.version} - - - - - org.springframework - spring-context - ${spring.version} - provided - - - - - - org.slf4j - slf4j-api - ${slf4j-api.version} - - - - - javax.annotation - javax.annotation-api - ${javax.annotation-api.version} - provided - - - - - \ No newline at end of file diff --git a/consumer/maven-repository/com/xuxueli/xxl-job-core/maven-metadata-local.xml b/consumer/maven-repository/com/xuxueli/xxl-job-core/maven-metadata-local.xml deleted file mode 100644 index 23867780..00000000 --- a/consumer/maven-repository/com/xuxueli/xxl-job-core/maven-metadata-local.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - com.xuxueli - xxl-job-core - - - 2.3.0-SNAPSHOT - - 20201224031330 - - diff --git a/consumer/maven-repository/com/xuxueli/xxl-job/2.3.0-SNAPSHOT/_remote.repositories b/consumer/maven-repository/com/xuxueli/xxl-job/2.3.0-SNAPSHOT/_remote.repositories deleted file mode 100644 index 0e354116..00000000 --- a/consumer/maven-repository/com/xuxueli/xxl-job/2.3.0-SNAPSHOT/_remote.repositories +++ /dev/null @@ -1,3 +0,0 @@ -#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Thu Dec 24 11:13:27 CST 2020 -xxl-job-2.3.0-SNAPSHOT.pom>= diff --git a/consumer/maven-repository/com/xuxueli/xxl-job/2.3.0-SNAPSHOT/maven-metadata-local.xml b/consumer/maven-repository/com/xuxueli/xxl-job/2.3.0-SNAPSHOT/maven-metadata-local.xml deleted file mode 100644 index c5768c05..00000000 --- a/consumer/maven-repository/com/xuxueli/xxl-job/2.3.0-SNAPSHOT/maven-metadata-local.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - com.xuxueli - xxl-job - 2.3.0-SNAPSHOT - - - true - - 20201224031327 - - - pom - 2.3.0-SNAPSHOT - 20201224031327 - - - - diff --git a/consumer/maven-repository/com/xuxueli/xxl-job/2.3.0-SNAPSHOT/resolver-status.properties b/consumer/maven-repository/com/xuxueli/xxl-job/2.3.0-SNAPSHOT/resolver-status.properties deleted file mode 100644 index d30bfcd2..00000000 --- a/consumer/maven-repository/com/xuxueli/xxl-job/2.3.0-SNAPSHOT/resolver-status.properties +++ /dev/null @@ -1,6 +0,0 @@ -#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Thu Dec 24 20:01:24 CST 2020 -maven-metadata-maven-central.xml/@default-maven-central-http\://central.maven.org/maven2/.lastUpdated=1608811284134 -maven-metadata-aliyun.xml.error= -maven-metadata-maven-central.xml.error=Could not transfer metadata com.xuxueli\:xxl-job\:2.3.0-SNAPSHOT/maven-metadata.xml from/to maven-central (http\://central.maven.org/maven2/)\: Transfer failed for http\://central.maven.org/maven2/com/xuxueli/xxl-job/2.3.0-SNAPSHOT/maven-metadata.xml -maven-metadata-aliyun.xml.lastUpdated=1608811284273 diff --git a/consumer/maven-repository/com/xuxueli/xxl-job/2.3.0-SNAPSHOT/xxl-job-2.3.0-SNAPSHOT.pom b/consumer/maven-repository/com/xuxueli/xxl-job/2.3.0-SNAPSHOT/xxl-job-2.3.0-SNAPSHOT.pom deleted file mode 100644 index bb84f677..00000000 --- a/consumer/maven-repository/com/xuxueli/xxl-job/2.3.0-SNAPSHOT/xxl-job-2.3.0-SNAPSHOT.pom +++ /dev/null @@ -1,145 +0,0 @@ - - 4.0.0 - com.xuxueli - xxl-job - 2.3.0-SNAPSHOT - pom - - ${project.artifactId} - A distributed task scheduling framework. - https://www.xuxueli.com/ - - - xxl-job-core - xxl-job-admin - xxl-job-executor-samples - - - - UTF-8 - UTF-8 - UTF-8 - 1.8 - 1.8 - true - - 4.1.54.Final - 2.8.6 - - 5.3.1 - 2.4.0 - - 2.1.4 - 8.0.22 - - 1.7.30 - 5.7.0 - 1.3.2 - - 3.0.7 - - 3.2.1 - 3.2.0 - 1.6 - 3.3.1 - - - - - - - - - - - GNU General Public License version 3 - https://opensource.org/licenses/GPL-3.0 - - - - - master - https://github.com/xuxueli/xxl-job.git - scm:git:https://github.com/xuxueli/xxl-job.git - scm:git:git@github.com:xuxueli/xxl-job.git - - - - XXL - xuxueli - 931591021@qq.com - https://github.com/xuxueli - - - - - - - release - - - - - org.apache.maven.plugins - maven-source-plugin - ${maven-source-plugin.version} - - - package - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - - package - - jar - - - none - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - ${maven-gpg-plugin.version} - - false - - - - verify - - sign - - - - - - - - - oss - https://oss.sonatype.org/content/repositories/snapshots/ - - - oss - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - \ No newline at end of file diff --git a/consumer/maven-repository/com/xuxueli/xxl-job/maven-metadata-local.xml b/consumer/maven-repository/com/xuxueli/xxl-job/maven-metadata-local.xml deleted file mode 100644 index dc6069c6..00000000 --- a/consumer/maven-repository/com/xuxueli/xxl-job/maven-metadata-local.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - com.xuxueli - xxl-job - - - 2.3.0-SNAPSHOT - - 20201224031327 - - diff --git a/consumer/maven-repository/com/xuxueli/xxl-rpc-core/1.2.1/_remote.repositories b/consumer/maven-repository/com/xuxueli/xxl-rpc-core/1.2.1/_remote.repositories deleted file mode 100644 index d1e6937e..00000000 --- a/consumer/maven-repository/com/xuxueli/xxl-rpc-core/1.2.1/_remote.repositories +++ /dev/null @@ -1,5 +0,0 @@ -#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Sat Apr 04 19:56:05 CST 2020 -xxl-rpc-core-1.2.1.pom>aliyun= -xxl-rpc-core-1.2.1-sources.jar>aliyun= -xxl-rpc-core-1.2.1.jar>aliyun= diff --git a/consumer/maven-repository/com/xuxueli/xxl-rpc-core/1.2.1/xxl-rpc-core-1.2.1-sources.jar b/consumer/maven-repository/com/xuxueli/xxl-rpc-core/1.2.1/xxl-rpc-core-1.2.1-sources.jar deleted file mode 100644 index f233be1e..00000000 Binary files a/consumer/maven-repository/com/xuxueli/xxl-rpc-core/1.2.1/xxl-rpc-core-1.2.1-sources.jar and /dev/null differ diff --git a/consumer/maven-repository/com/xuxueli/xxl-rpc-core/1.2.1/xxl-rpc-core-1.2.1-sources.jar.lastUpdated b/consumer/maven-repository/com/xuxueli/xxl-rpc-core/1.2.1/xxl-rpc-core-1.2.1-sources.jar.lastUpdated deleted file mode 100644 index 0b1e7d6f..00000000 --- a/consumer/maven-repository/com/xuxueli/xxl-rpc-core/1.2.1/xxl-rpc-core-1.2.1-sources.jar.lastUpdated +++ /dev/null @@ -1,5 +0,0 @@ -#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Sat Apr 04 19:56:05 CST 2020 -http\://central.maven.org/maven2/.error=Could not transfer artifact com.xuxueli\:xxl-rpc-core\:jar\:sources\:1.2.1 from/to maven-central (http\://central.maven.org/maven2/)\: central.maven.org -@default-maven-central-http\://central.maven.org/maven2/.lastUpdated=1586001364931 -http\://maven.aliyun.com/nexus/content/groups/public/.lastUpdated=1586001365245 diff --git a/consumer/maven-repository/com/xuxueli/xxl-rpc-core/1.2.1/xxl-rpc-core-1.2.1-sources.jar.sha1 b/consumer/maven-repository/com/xuxueli/xxl-rpc-core/1.2.1/xxl-rpc-core-1.2.1-sources.jar.sha1 deleted file mode 100644 index 804426ca..00000000 --- a/consumer/maven-repository/com/xuxueli/xxl-rpc-core/1.2.1/xxl-rpc-core-1.2.1-sources.jar.sha1 +++ /dev/null @@ -1,2 +0,0 @@ - -33b53883ecf6e77b8b4eafe3506e213e83b2c80a \ No newline at end of file diff --git a/consumer/maven-repository/com/xuxueli/xxl-rpc-core/1.2.1/xxl-rpc-core-1.2.1.jar b/consumer/maven-repository/com/xuxueli/xxl-rpc-core/1.2.1/xxl-rpc-core-1.2.1.jar deleted file mode 100644 index 8190b5c0..00000000 Binary files a/consumer/maven-repository/com/xuxueli/xxl-rpc-core/1.2.1/xxl-rpc-core-1.2.1.jar and /dev/null differ diff --git a/consumer/maven-repository/com/xuxueli/xxl-rpc-core/1.2.1/xxl-rpc-core-1.2.1.jar.sha1 b/consumer/maven-repository/com/xuxueli/xxl-rpc-core/1.2.1/xxl-rpc-core-1.2.1.jar.sha1 deleted file mode 100644 index b02eee7a..00000000 --- a/consumer/maven-repository/com/xuxueli/xxl-rpc-core/1.2.1/xxl-rpc-core-1.2.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -27f8d667b1ede36b219f36af75b493b0e6143288 \ No newline at end of file diff --git a/consumer/maven-repository/com/xuxueli/xxl-rpc-core/1.2.1/xxl-rpc-core-1.2.1.pom b/consumer/maven-repository/com/xuxueli/xxl-rpc-core/1.2.1/xxl-rpc-core-1.2.1.pom deleted file mode 100644 index 5c5d1bdb..00000000 --- a/consumer/maven-repository/com/xuxueli/xxl-rpc-core/1.2.1/xxl-rpc-core-1.2.1.pom +++ /dev/null @@ -1,143 +0,0 @@ - - 4.0.0 - - com.xuxueli - xxl-rpc - 1.2.1 - - xxl-rpc-core - jar - - ${project.artifactId} - A high performance, distributed RPC framework. - http://www.xuxueli.com/ - - - - - - - - org.slf4j - slf4j-api - ${slf4j-api.version} - - - org.slf4j - slf4j-log4j12 - ${slf4j-api.version} - test - - - - - - - - com.caucho - hessian - ${hessian.version} - - - - - io.protostuff - protostuff-core - ${protostuff.version} - provided - - - io.protostuff - protostuff-runtime - ${protostuff.version} - provided - - - org.objenesis - objenesis - ${objenesis.version} - provided - - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - provided - - - - - - - - org.apache.zookeeper - zookeeper - ${zookeeper.version} - provided - - - - - - - - org.eclipse.jetty - jetty-server - ${jetty-server.version} - - - org.eclipse.jetty - jetty-client - ${jetty-server.version} - - - - - io.netty - netty-all - ${netty.version} - provided - - - - org.apache.mina - mina-core - 2.0.19 - provided - - - - org.apache.commons - commons-pool2 - ${commons-pool2.version} - provided - - - - - - - org.springframework - spring-beans - ${spring.version} - provided - - - org.springframework - spring-core - ${spring.version} - provided - - - org.springframework - spring-context - ${spring.version} - provided - - - - - \ No newline at end of file diff --git a/consumer/maven-repository/com/xuxueli/xxl-rpc-core/1.2.1/xxl-rpc-core-1.2.1.pom.sha1 b/consumer/maven-repository/com/xuxueli/xxl-rpc-core/1.2.1/xxl-rpc-core-1.2.1.pom.sha1 deleted file mode 100644 index 18eb35dc..00000000 --- a/consumer/maven-repository/com/xuxueli/xxl-rpc-core/1.2.1/xxl-rpc-core-1.2.1.pom.sha1 +++ /dev/null @@ -1,2 +0,0 @@ - -bed5b85e402f8fccf7109a3d5944f45dd5cae342 \ No newline at end of file diff --git a/consumer/maven-repository/com/xuxueli/xxl-rpc/1.2.1/_remote.repositories b/consumer/maven-repository/com/xuxueli/xxl-rpc/1.2.1/_remote.repositories deleted file mode 100644 index 71739fc4..00000000 --- a/consumer/maven-repository/com/xuxueli/xxl-rpc/1.2.1/_remote.repositories +++ /dev/null @@ -1,3 +0,0 @@ -#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Mon Mar 02 16:06:40 CST 2020 -xxl-rpc-1.2.1.pom>aliyun= diff --git a/consumer/maven-repository/com/xuxueli/xxl-rpc/1.2.1/xxl-rpc-1.2.1.pom b/consumer/maven-repository/com/xuxueli/xxl-rpc/1.2.1/xxl-rpc-1.2.1.pom deleted file mode 100644 index 5f8afc32..00000000 --- a/consumer/maven-repository/com/xuxueli/xxl-rpc/1.2.1/xxl-rpc-1.2.1.pom +++ /dev/null @@ -1,151 +0,0 @@ - - 4.0.0 - com.xuxueli - xxl-rpc - 1.2.1 - pom - - ${project.artifactId} - A high performance, distributed RPC framework. - http://www.xuxueli.com/ - - - xxl-rpc-core - - - - - UTF-8 - UTF-8 - UTF-8 - 1.7 - 1.7 - - true - - - 3.1.0 - 2.3.3 - - 1.7.25 - 4.12 - - - 4.1.29.Final - 2.0.19 - 9.2.26.v20180806 - - 2.6.0 - - - 4.0.51 - - 1.6.0 - 2.6 - - 2.9.6 - - - 3.4.13 - - - 4.3.19.RELEASE - 1.5.16.RELEASE - - - - - - - - - - - GNU General Public License version 3 - https://opensource.org/licenses/GPL-3.0 - - - - - master - https://github.com/xuxueli/xxl-rpc.git - scm:git:https://github.com/xuxueli/xxl-rpc.git - scm:git:git@github.com:xuxueli/xxl-rpc.git - - - - XXL - xuxueli - 931591021@qq.com - https://github.com/xuxueli - - - - - - - release - - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - package - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.0.0 - - - package - - jar - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - false - - - - verify - - sign - - - - - - - - - oss - https://oss.sonatype.org/content/repositories/snapshots/ - - - oss - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - \ No newline at end of file diff --git a/consumer/maven-repository/com/xuxueli/xxl-rpc/1.2.1/xxl-rpc-1.2.1.pom.sha1 b/consumer/maven-repository/com/xuxueli/xxl-rpc/1.2.1/xxl-rpc-1.2.1.pom.sha1 deleted file mode 100644 index 2ebdd727..00000000 --- a/consumer/maven-repository/com/xuxueli/xxl-rpc/1.2.1/xxl-rpc-1.2.1.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -370f4c4f20b218942fba34d939cbc625025e1e30 \ No newline at end of file diff --git a/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java b/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java index 93f80a0c..b9a4717f 100644 --- a/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java @@ -3,7 +3,7 @@ package cn.lili.event.impl; import cn.lili.event.TradeEvent; import cn.lili.modules.order.cart.entity.dto.TradeDTO; import cn.lili.modules.order.order.service.TradeService; -import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; +import cn.lili.modules.payment.entity.enums.PaymentMethodEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java b/consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java index 47df9720..6889c867 100644 --- a/consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java @@ -9,7 +9,7 @@ import cn.lili.modules.order.order.entity.enums.PayStatusEnum; import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.payment.entity.RefundLog; import cn.lili.modules.payment.kit.Payment; -import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; +import cn.lili.modules.payment.entity.enums.PaymentMethodEnum; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/consumer/src/test/java/cn/lili/buyer/test/cart/CartTest.java b/consumer/src/test/java/cn/lili/buyer/test/cart/CartTest.java index 22b87b83..e8412dab 100644 --- a/consumer/src/test/java/cn/lili/buyer/test/cart/CartTest.java +++ b/consumer/src/test/java/cn/lili/buyer/test/cart/CartTest.java @@ -3,7 +3,7 @@ package cn.lili.buyer.test.cart; import cn.lili.event.impl.StockUpdateExecute; import cn.lili.modules.order.order.entity.dto.OrderMessage; import cn.lili.modules.order.order.entity.enums.OrderStatusEnum; -import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; +import cn.lili.modules.payment.entity.enums.PaymentMethodEnum; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/aop/annotation/PointLogPoint.java b/framework/src/main/java/cn/lili/modules/member/aop/annotation/PointLogPoint.java similarity index 82% rename from framework/src/main/java/cn/lili/modules/member/entity/aop/annotation/PointLogPoint.java rename to framework/src/main/java/cn/lili/modules/member/aop/annotation/PointLogPoint.java index 2eb036f2..3289396f 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/aop/annotation/PointLogPoint.java +++ b/framework/src/main/java/cn/lili/modules/member/aop/annotation/PointLogPoint.java @@ -1,4 +1,4 @@ -package cn.lili.modules.member.entity.aop.annotation; +package cn.lili.modules.member.aop.annotation; import java.lang.annotation.*; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java b/framework/src/main/java/cn/lili/modules/member/aop/interceptor/PointLogInterceptor.java similarity index 95% rename from framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java rename to framework/src/main/java/cn/lili/modules/member/aop/interceptor/PointLogInterceptor.java index 45a56040..073350b1 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java +++ b/framework/src/main/java/cn/lili/modules/member/aop/interceptor/PointLogInterceptor.java @@ -1,4 +1,4 @@ -package cn.lili.modules.member.entity.aop.interceptor; +package cn.lili.modules.member.aop.interceptor; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.entity.dos.MemberPointsHistory; @@ -29,7 +29,7 @@ public class PointLogInterceptor { @Autowired private MemberService memberService; - @After("@annotation(cn.lili.modules.member.entity.aop.annotation.PointLogPoint)") + @After("@annotation(cn.lili.modules.member.aop.annotation.PointLogPoint)") public void doAfter(JoinPoint pjp) { //参数 Object[] obj = pjp.getArgs(); diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java index ca158a2a..57eee5a3 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java @@ -21,7 +21,7 @@ import cn.lili.modules.connect.entity.Connect; import cn.lili.modules.connect.entity.dto.ConnectAuthUser; import cn.lili.modules.connect.service.ConnectService; import cn.lili.modules.connect.util.UuidUtils; -import cn.lili.modules.member.entity.aop.annotation.PointLogPoint; +import cn.lili.modules.member.aop.annotation.PointLogPoint; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.entity.dto.ManagerMemberEditDTO; import cn.lili.modules.member.entity.dto.MemberAddDTO; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java index 3d894fd3..e0bc8092 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java @@ -1,7 +1,5 @@ package cn.lili.modules.message.entity.dos; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderDetailVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderDetailVO.java index 8fad0217..d10e66fe 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderDetailVO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderDetailVO.java @@ -7,7 +7,7 @@ import cn.lili.modules.order.order.entity.dos.Receipt; import cn.lili.modules.order.order.entity.enums.DeliverStatusEnum; import cn.lili.modules.order.order.entity.enums.OrderStatusEnum; import cn.lili.modules.order.order.entity.enums.PayStatusEnum; -import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; +import cn.lili.modules.payment.entity.enums.PaymentMethodEnum; import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum; import cn.lili.modules.order.trade.entity.dos.OrderLog; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java index b524f877..04d10018 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java @@ -33,7 +33,7 @@ import cn.lili.modules.order.trade.entity.enums.AfterSaleRefundWayEnum; import cn.lili.modules.order.trade.entity.enums.AfterSaleStatusEnum; import cn.lili.modules.order.trade.entity.enums.AfterSaleTypeEnum; import cn.lili.modules.payment.kit.RefundSupport; -import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; +import cn.lili.modules.payment.entity.enums.PaymentMethodEnum; import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; import cn.lili.modules.statistics.util.StatisticsDateUtil; import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO; diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java index 089eba5e..52bf51d1 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java @@ -36,7 +36,7 @@ import cn.lili.modules.order.order.mapper.OrderMapper; import cn.lili.modules.order.order.service.*; import cn.lili.modules.order.trade.entity.dos.OrderLog; import cn.lili.modules.order.trade.service.OrderLogService; -import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; +import cn.lili.modules.payment.entity.enums.PaymentMethodEnum; import cn.lili.modules.promotion.entity.dos.Pintuan; import cn.lili.modules.promotion.service.PintuanService; import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/enums/CashierEnum.java b/framework/src/main/java/cn/lili/modules/payment/entity/enums/CashierEnum.java similarity index 83% rename from framework/src/main/java/cn/lili/modules/payment/kit/enums/CashierEnum.java rename to framework/src/main/java/cn/lili/modules/payment/entity/enums/CashierEnum.java index d7b3fee8..fb93a72a 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/enums/CashierEnum.java +++ b/framework/src/main/java/cn/lili/modules/payment/entity/enums/CashierEnum.java @@ -1,4 +1,4 @@ -package cn.lili.modules.payment.kit.enums; +package cn.lili.modules.payment.entity.enums; /** * 订单类型 diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/enums/PaymentClientEnum.java b/framework/src/main/java/cn/lili/modules/payment/entity/enums/PaymentClientEnum.java similarity index 90% rename from framework/src/main/java/cn/lili/modules/payment/kit/enums/PaymentClientEnum.java rename to framework/src/main/java/cn/lili/modules/payment/entity/enums/PaymentClientEnum.java index 98895c91..9d85a992 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/enums/PaymentClientEnum.java +++ b/framework/src/main/java/cn/lili/modules/payment/entity/enums/PaymentClientEnum.java @@ -1,4 +1,4 @@ -package cn.lili.modules.payment.kit.enums; +package cn.lili.modules.payment.entity.enums; /** * 支付方式枚举 diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/enums/PaymentMethodEnum.java b/framework/src/main/java/cn/lili/modules/payment/entity/enums/PaymentMethodEnum.java similarity index 96% rename from framework/src/main/java/cn/lili/modules/payment/kit/enums/PaymentMethodEnum.java rename to framework/src/main/java/cn/lili/modules/payment/entity/enums/PaymentMethodEnum.java index 0089d149..d06b6121 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/enums/PaymentMethodEnum.java +++ b/framework/src/main/java/cn/lili/modules/payment/entity/enums/PaymentMethodEnum.java @@ -1,4 +1,4 @@ -package cn.lili.modules.payment.kit.enums; +package cn.lili.modules.payment.entity.enums; /** * 支付方式枚举 diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java b/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java index a079b4ec..3345d7c3 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java @@ -9,8 +9,8 @@ import cn.lili.common.vo.ResultMessage; import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.member.service.MemberWalletService; import cn.lili.modules.payment.kit.dto.PayParam; -import cn.lili.modules.payment.kit.enums.PaymentClientEnum; -import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; +import cn.lili.modules.payment.entity.enums.PaymentClientEnum; +import cn.lili.modules.payment.entity.enums.PaymentMethodEnum; import cn.lili.modules.payment.kit.params.CashierExecute; import cn.lili.modules.payment.kit.params.dto.CashierParam; import cn.lili.modules.system.entity.dos.Setting; diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/Payment.java b/framework/src/main/java/cn/lili/modules/payment/kit/Payment.java index d6041c6d..9ad4b921 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/Payment.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/Payment.java @@ -5,7 +5,7 @@ import cn.lili.common.exception.ServiceException; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.payment.entity.RefundLog; import cn.lili.modules.payment.kit.dto.PayParam; -import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; +import cn.lili.modules.payment.entity.enums.PaymentMethodEnum; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java b/framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java index f62641fd..07045e98 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java @@ -8,7 +8,7 @@ import cn.lili.modules.order.order.service.AfterSaleService; import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.order.order.service.StoreFlowService; import cn.lili.modules.payment.entity.RefundLog; -import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; +import cn.lili.modules.payment.entity.enums.PaymentMethodEnum; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/params/CashierExecute.java b/framework/src/main/java/cn/lili/modules/payment/kit/params/CashierExecute.java index c2ee4232..2385c426 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/params/CashierExecute.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/params/CashierExecute.java @@ -2,7 +2,7 @@ package cn.lili.modules.payment.kit.params; import cn.lili.modules.payment.kit.dto.PaymentSuccessParams; import cn.lili.modules.payment.kit.dto.PayParam; -import cn.lili.modules.payment.kit.enums.CashierEnum; +import cn.lili.modules.payment.entity.enums.CashierEnum; import cn.lili.modules.payment.kit.params.dto.CashierParam; /** diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/OrderCashier.java b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/OrderCashier.java index 87160fdb..0582b54c 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/OrderCashier.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/OrderCashier.java @@ -11,7 +11,7 @@ import cn.lili.modules.order.order.entity.vo.OrderDetailVO; import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.payment.kit.dto.PayParam; import cn.lili.modules.payment.kit.dto.PaymentSuccessParams; -import cn.lili.modules.payment.kit.enums.CashierEnum; +import cn.lili.modules.payment.entity.enums.CashierEnum; import cn.lili.modules.payment.kit.params.CashierExecute; import cn.lili.modules.payment.kit.params.dto.CashierParam; import cn.lili.modules.system.entity.dto.BaseSetting; diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/RechargeCashier.java b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/RechargeCashier.java index 159cb2f8..2db0ea27 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/RechargeCashier.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/RechargeCashier.java @@ -8,7 +8,7 @@ import cn.lili.modules.order.trade.entity.dos.Recharge; import cn.lili.modules.order.trade.service.RechargeService; import cn.lili.modules.payment.kit.dto.PayParam; import cn.lili.modules.payment.kit.dto.PaymentSuccessParams; -import cn.lili.modules.payment.kit.enums.CashierEnum; +import cn.lili.modules.payment.entity.enums.CashierEnum; import cn.lili.modules.payment.kit.params.CashierExecute; import cn.lili.modules.payment.kit.params.dto.CashierParam; import cn.lili.modules.system.entity.dto.BaseSetting; diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/TradeCashier.java b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/TradeCashier.java index cddabb05..3e6db689 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/TradeCashier.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/TradeCashier.java @@ -11,7 +11,7 @@ import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.order.order.service.TradeService; import cn.lili.modules.payment.kit.dto.PayParam; import cn.lili.modules.payment.kit.dto.PaymentSuccessParams; -import cn.lili.modules.payment.kit.enums.CashierEnum; +import cn.lili.modules.payment.entity.enums.CashierEnum; import cn.lili.modules.payment.kit.params.CashierExecute; import cn.lili.modules.payment.kit.params.dto.CashierParam; import cn.lili.modules.system.entity.dto.BaseSetting; diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java index 5e751813..15cade4a 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java @@ -18,7 +18,7 @@ import cn.lili.modules.payment.kit.CashierSupport; import cn.lili.modules.payment.kit.Payment; import cn.lili.modules.payment.kit.dto.PayParam; import cn.lili.modules.payment.kit.dto.PaymentSuccessParams; -import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; +import cn.lili.modules.payment.entity.enums.PaymentMethodEnum; import cn.lili.modules.payment.kit.params.dto.CashierParam; import cn.lili.modules.payment.service.PaymentService; import cn.lili.modules.payment.service.RefundLogService; diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/bank/BankTransferPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/bank/BankTransferPlugin.java index 29fd768a..3113c585 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/bank/BankTransferPlugin.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/bank/BankTransferPlugin.java @@ -6,7 +6,7 @@ import cn.lili.modules.payment.entity.RefundLog; import cn.lili.modules.payment.kit.Payment; import cn.lili.modules.payment.kit.dto.PayParam; import cn.lili.modules.payment.kit.dto.PaymentSuccessParams; -import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; +import cn.lili.modules.payment.entity.enums.PaymentMethodEnum; import cn.lili.modules.payment.kit.params.dto.CashierParam; import cn.lili.modules.payment.service.PaymentService; import cn.lili.modules.payment.service.RefundLogService; diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java index 4e491544..832e5cd6 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java @@ -12,8 +12,8 @@ import cn.lili.modules.payment.kit.CashierSupport; import cn.lili.modules.payment.kit.Payment; import cn.lili.modules.payment.kit.dto.PayParam; import cn.lili.modules.payment.kit.dto.PaymentSuccessParams; -import cn.lili.modules.payment.kit.enums.CashierEnum; -import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; +import cn.lili.modules.payment.entity.enums.CashierEnum; +import cn.lili.modules.payment.entity.enums.PaymentMethodEnum; import cn.lili.modules.payment.kit.params.dto.CashierParam; import cn.lili.modules.payment.service.PaymentService; import cn.lili.modules.payment.service.RefundLogService; diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java index 5f5090d5..be768841 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java @@ -31,7 +31,7 @@ import cn.lili.modules.payment.kit.core.kit.*; import cn.lili.modules.payment.kit.core.utils.DateTimeZoneUtil; import cn.lili.modules.payment.kit.dto.PayParam; import cn.lili.modules.payment.kit.dto.PaymentSuccessParams; -import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; +import cn.lili.modules.payment.entity.enums.PaymentMethodEnum; import cn.lili.modules.payment.kit.params.dto.CashierParam; import cn.lili.modules.payment.kit.plugin.wechat.enums.WechatApiEnum; import cn.lili.modules.payment.kit.plugin.wechat.enums.WechatDomain; diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/PaymentSupportSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/PaymentSupportSetting.java index 2a5a3128..096cf4b3 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/PaymentSupportSetting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/PaymentSupportSetting.java @@ -1,7 +1,7 @@ package cn.lili.modules.system.entity.dto.payment; import cn.lili.common.enums.ClientTypeEnum; -import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; +import cn.lili.modules.payment.entity.enums.PaymentMethodEnum; import cn.lili.modules.system.entity.dto.payment.dto.PaymentSupportForm; import cn.lili.modules.system.entity.dto.payment.dto.PaymentSupportItem; import lombok.Data; diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/dto/PaymentSupportForm.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/dto/PaymentSupportForm.java index 5da62134..0284a7e1 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/dto/PaymentSupportForm.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/dto/PaymentSupportForm.java @@ -1,7 +1,7 @@ package cn.lili.modules.system.entity.dto.payment.dto; import cn.lili.common.enums.ClientTypeEnum; -import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; +import cn.lili.modules.payment.entity.enums.PaymentMethodEnum; import lombok.Data; import lombok.experimental.Accessors;