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/main/java/cn/lili/timetask/handler/impl/coupon/CouponExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/coupon/CouponExecute.java index 06f31116..4894a994 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/coupon/CouponExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/coupon/CouponExecute.java @@ -1,5 +1,6 @@ package cn.lili.timetask.handler.impl.coupon; +import cn.lili.common.utils.DateUtil; import cn.lili.modules.promotion.entity.dos.MemberCoupon; import cn.lili.modules.promotion.entity.enums.MemberCouponStatusEnum; import cn.lili.modules.promotion.service.MemberCouponService; @@ -8,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.Calendar; import java.util.Date; /** @@ -22,7 +24,7 @@ public class CouponExecute implements EveryDayExecute { /** * 过期常量，过期后或者使用后一定时间内，删除无效的优惠券，物理删除 */ - static final int EXPIRATION_DAY = 7; + static final int EXPIRATION_DAY = 3; @Autowired private MemberCouponService memberCouponService; @@ -40,12 +42,16 @@ public class CouponExecute implements EveryDayExecute { .set(MemberCoupon::getMemberCouponStatus, MemberCouponStatusEnum.EXPIRE.name()); this.memberCouponService.update(updateWrapper); + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) + EXPIRATION_DAY); + Date removeTime = calendar.getTime(); //删除过期/已使用的优惠券 LambdaUpdateWrapper deleteWrapper = new LambdaUpdateWrapper() //如果结束时间小于 当前时间增加指定删除日期，则删除 - .le(MemberCoupon::getEndTime, System.currentTimeMillis() + 24 * 60 * 60 * 1000 * EXPIRATION_DAY); + .le(MemberCoupon::getEndTime, removeTime); this.memberCouponService.remove(deleteWrapper); + } } diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java index c939a334..63b43f2b 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java @@ -1,6 +1,6 @@ package cn.lili.timetask.handler.impl.statistics; -import cn.lili.modules.statistics.model.dos.MemberStatisticsData; +import cn.lili.modules.statistics.entity.dos.MemberStatisticsData; import cn.lili.modules.statistics.service.MemberStatisticsDataService; import cn.lili.timetask.handler.EveryDayExecute; import lombok.extern.slf4j.Slf4j; diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java index 0dec275b..e2aee5e3 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java @@ -4,7 +4,7 @@ import cn.lili.cache.Cache; import cn.lili.cache.CachePrefix; import cn.lili.common.security.enums.UserEnums; import cn.lili.common.properties.StatisticsProperties; -import cn.lili.modules.statistics.model.vo.OnlineMemberVO; +import cn.lili.modules.statistics.entity.vo.OnlineMemberVO; import cn.lili.timetask.handler.EveryHourExecute; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -28,7 +28,7 @@ public class OnlineMemberStatistics implements EveryHourExecute { * 缓存 */ @Autowired - private Cache cache; + private Cache> cache; /** * 统计小时 */ @@ -41,12 +41,10 @@ public class OnlineMemberStatistics implements EveryHourExecute { Calendar calendar = Calendar.getInstance(); - Object object = cache.get(CachePrefix.ONLINE_MEMBER.getPrefix()); - List onlineMemberVOS; - if (object == null) { + List onlineMemberVOS = cache.get(CachePrefix.ONLINE_MEMBER.getPrefix()); + + if (onlineMemberVOS == null) { onlineMemberVOS = new ArrayList<>(); - } else { - onlineMemberVOS = (List) object; } //过滤 有效统计时间 @@ -80,12 +78,10 @@ public class OnlineMemberStatistics implements EveryHourExecute { */ public void execute(Date time, Integer num) { - Object object = cache.get(CachePrefix.ONLINE_MEMBER.getPrefix()); - List onlineMemberVOS; - if (object == null) { + List onlineMemberVOS = cache.get(CachePrefix.ONLINE_MEMBER.getPrefix()); + + if (onlineMemberVOS == null) { onlineMemberVOS = new ArrayList<>(); - } else { - onlineMemberVOS = (List) object; } Calendar calendar = Calendar.getInstance(); @@ -96,9 +92,8 @@ public class OnlineMemberStatistics implements EveryHourExecute { calendar.set(Calendar.MILLISECOND, 0); calendar.set(Calendar.HOUR_OF_DAY, calendar.get(Calendar.HOUR_OF_DAY) - 48); - Calendar finalCalendar = calendar; onlineMemberVOS = onlineMemberVOS.stream() - .filter(onlineMemberVO -> onlineMemberVO.getDate().after(finalCalendar.getTime())) + .filter(onlineMemberVO -> onlineMemberVO.getDate().after(calendar.getTime())) .collect(Collectors.toList()); onlineMemberVOS.add(new OnlineMemberVO(time, num)); diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java index edd45045..3821f8b6 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java @@ -4,7 +4,7 @@ import cn.hutool.core.convert.Convert; import cn.lili.cache.Cache; import cn.lili.cache.CachePrefix; import cn.lili.common.utils.BeanUtil; -import cn.lili.modules.statistics.model.dos.PlatformViewData; +import cn.lili.modules.statistics.entity.dos.PlatformViewData; import cn.lili.modules.statistics.service.PlatformViewDataService; import cn.lili.timetask.handler.EveryDayExecute; import lombok.Data; 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/cart/entity/vo/CartVO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartVO.java index c5598f92..4f60aa4a 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartVO.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartVO.java @@ -11,6 +11,7 @@ import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** @@ -99,4 +100,17 @@ public class CartVO extends CartBase implements Serializable { } } + + /** + * 过滤购物车中已选择的sku + * + * @return + */ + public List getCheckedSkuList() { + if (skuList != null && !skuList.isEmpty()) { + return skuList.stream().filter(CartSkuVO::getChecked).collect(Collectors.toList()); + } + return skuList; + } + } diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CartPriceRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CartPriceRender.java index a6508cf2..4f443f6b 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CartPriceRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CartPriceRender.java @@ -59,10 +59,8 @@ public class CartPriceRender implements CartRenderStep { cartVOS.forEach(cartVO -> { - List skuPrices = cartVO.getSkuList().stream().filter(CartSkuVO::getChecked) - .map(CartSkuVO::getPriceDetailDTO).collect(Collectors.toList()); cartVO.getPriceDetailDTO().accumulationPriceDTO( - cartVO.getSkuList().stream().filter(CartSkuVO::getChecked) + cartVO.getCheckedSkuList().stream().filter(CartSkuVO::getChecked) .map(CartSkuVO::getPriceDetailDTO).collect(Collectors.toList()) ); List skuNum = cartVO.getSkuList().stream().filter(CartSkuVO::getChecked) diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckedFilterRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckedFilterRender.java index 06b4150e..8c9bcda7 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckedFilterRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckedFilterRender.java @@ -36,7 +36,7 @@ public class CheckedFilterRender implements CartRenderStep { //循环购物车信息 for (CartVO cartVO : tradeDTO.getCartList()) { //如果商品选中，则加入到对应购物车 - cartVO.setSkuList(cartVO.getSkuList().stream().filter(j -> Boolean.TRUE.equals(j.getChecked())).collect(Collectors.toList())); + cartVO.setSkuList(cartVO.getCheckedSkuList()); cartVOList.add(cartVO); } tradeDTO.setCartList(cartVOList); diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CommissionRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CommissionRender.java index 3479492f..21520c5b 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CommissionRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CommissionRender.java @@ -66,7 +66,7 @@ public class CommissionRender implements CartRenderStep { //计算购物车价格 for (CartVO cart : cartVOS) { //累加价格 - for (CartSkuVO cartSkuVO : cart.getSkuList()) { + for (CartSkuVO cartSkuVO : cart.getCheckedSkuList()) { PriceDetailDTO priceDetailDTO = cartSkuVO.getPriceDetailDTO(); //平台佣金根据分类计算 diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/DistributionPriceRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/DistributionPriceRender.java index d97d3adf..ce8ca66f 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/DistributionPriceRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/DistributionPriceRender.java @@ -58,14 +58,14 @@ public class DistributionPriceRender implements CartRenderStep { //循环订单商品列表，如果是分销商品则计算商品佣金 tradeDTO.setDistributionId(distributionId); - List skuIds = tradeDTO.getSkuList().stream().map(cartSkuVO -> { + List skuIds = tradeDTO.getCheckedSkuList().stream().map(cartSkuVO -> { return cartSkuVO.getGoodsSku().getId(); }).collect(Collectors.toList()); //是否包含分销商品 List distributionGoods = distributionGoodsService.distributionGoods(skuIds); if (distributionGoods != null && distributionGoods.size() > 0) { distributionGoods.forEach(dg -> { - tradeDTO.getSkuList().forEach(cartSkuVO -> { + tradeDTO.getCheckedSkuList().forEach(cartSkuVO -> { if (cartSkuVO.getGoodsSku().getId().equals(dg.getSkuId())) { cartSkuVO.setDistributionGoods(dg); } @@ -73,7 +73,7 @@ public class DistributionPriceRender implements CartRenderStep { }); } - for (CartSkuVO cartSkuVO : tradeDTO.getSkuList()) { + for (CartSkuVO cartSkuVO : tradeDTO.getCheckedSkuList()) { if (cartSkuVO.getDistributionGoods() != null) { cartSkuVO.getPriceDetailDTO().setDistributionCommission(CurrencyUtil.mul(cartSkuVO.getNum(), cartSkuVO.getDistributionGoods().getCommission())); } diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/FullDiscountRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/FullDiscountRender.java index 2d9e7c43..5feb58e9 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/FullDiscountRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/FullDiscountRender.java @@ -46,8 +46,6 @@ public class FullDiscountRender implements CartRenderStep { @Override public void render(TradeDTO tradeDTO) { - //获取购物车中所有的商品 - List cartSkuList = tradeDTO.getSkuList(); //店铺集合 List cartList = tradeDTO.getCartList(); @@ -80,7 +78,7 @@ public class FullDiscountRender implements CartRenderStep { cart.setFullDiscount(fullDiscount); Map skuPriceDetail; //参与活动的sku判定 - skuPriceDetail = initFullDiscountGoods(fullDiscount, cartSkuList); + skuPriceDetail = initFullDiscountGoods(fullDiscount, cart.getCheckedSkuList()); //记录参与满减活动的sku cart.setFullDiscountSkuIds(new ArrayList<>(skuPriceDetail.keySet())); @@ -115,7 +113,7 @@ public class FullDiscountRender implements CartRenderStep { */ private void renderFullRate(CartVO cart, Map skuPriceDetail, Double rate) { - List cartSkuVOS = cart.getSkuList().stream().filter(cartSkuVO -> { + List cartSkuVOS = cart.getCheckedSkuList().stream().filter(cartSkuVO -> { return skuPriceDetail.containsKey(cartSkuVO.getGoodsSku().getId()); }).collect(Collectors.toList()); @@ -186,7 +184,7 @@ public class FullDiscountRender implements CartRenderStep { } //如果满足，判定是否免邮，免邮的话需要渲染一边sku if (fullDiscount.getIsFreeFreight()) { - for (CartSkuVO skuVO : cartVO.getSkuList()) { + for (CartSkuVO skuVO : cartVO.getCheckedSkuList()) { skuVO.setIsFreeFreight(true); } } diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java index f66cf38f..d0b0e672 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java @@ -36,7 +36,7 @@ public class SkuFreightRender implements CartRenderStep { @Override public void render(TradeDTO tradeDTO) { - List cartSkuVOS = tradeDTO.getSkuList(); + List cartSkuVOS = tradeDTO.getCheckedSkuList(); //会员收货地址问题处理 MemberAddress memberAddress = tradeDTO.getMemberAddress(); //如果收货地址为空，则抛出异常 diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java index 6877d0fb..8ca43505 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java @@ -59,7 +59,7 @@ public class SkuPromotionRender implements CartRenderStep { */ private void renderBasePrice(TradeDTO tradeDTO) { tradeDTO.getCartList().forEach( - cartVO -> cartVO.getSkuList().forEach(cartSkuVO -> { + cartVO -> cartVO.getCheckedSkuList().forEach(cartSkuVO -> { PriceDetailDTO priceDetailDTO = cartSkuVO.getPriceDetailDTO(); priceDetailDTO.setGoodsPrice(cartSkuVO.getSubTotal()); priceDetailDTO.setDiscountPrice(CurrencyUtil.sub(priceDetailDTO.getOriginalPrice(), cartSkuVO.getSubTotal())); @@ -82,7 +82,7 @@ public class SkuPromotionRender implements CartRenderStep { case POINTS: //处理积分商品购买 for (CartVO cartVO : tradeDTO.getCartList()) { - for (CartSkuVO cartSkuVO : cartVO.getSkuList()) { + for (CartSkuVO cartSkuVO : cartVO.getCheckedSkuList()) { cartSkuVO.getPriceDetailDTO().setPayPoint(cartSkuVO.getPoint()); PromotionSkuVO promotionSkuVO = new PromotionSkuVO(PromotionTypeEnum.POINTS_GOODS.name(), cartSkuVO.getPointsId()); cartSkuVO.getPriceDetailDTO().getJoinPromotion().add(promotionSkuVO); @@ -91,7 +91,7 @@ public class SkuPromotionRender implements CartRenderStep { return; case KANJIA: for (CartVO cartVO : tradeDTO.getCartList()) { - for (CartSkuVO cartSkuVO : cartVO.getSkuList()) { + for (CartSkuVO cartSkuVO : cartVO.getCheckedSkuList()) { KanjiaActivitySearchParams kanjiaActivitySearchParams = new KanjiaActivitySearchParams(); kanjiaActivitySearchParams.setGoodsSkuId(cartSkuVO.getGoodsSku().getId()); kanjiaActivitySearchParams.setMemberId(UserContext.getCurrentUser().getId()); @@ -112,7 +112,7 @@ public class SkuPromotionRender implements CartRenderStep { return; case PINTUAN: for (CartVO cartVO : tradeDTO.getCartList()) { - for (CartSkuVO cartSkuVO : cartVO.getSkuList()) { + for (CartSkuVO cartSkuVO : cartVO.getCheckedSkuList()) { PromotionSkuVO promotionSkuVO = new PromotionSkuVO(PromotionTypeEnum.PINTUAN.name(), cartSkuVO.getPintuanId()); cartSkuVO.getPriceDetailDTO().getJoinPromotion().add(promotionSkuVO); } @@ -125,7 +125,7 @@ public class SkuPromotionRender implements CartRenderStep { //循环购物车 for (CartVO cartVO : tradeDTO.getCartList()) { //循环sku - for (CartSkuVO cartSkuVO : cartVO.getSkuList()) { + for (CartSkuVO cartSkuVO : cartVO.getCheckedSkuList()) { //更新商品促销 promotionGoodsService.updatePromotion(cartSkuVO); //赋予商品促销信息 diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java index 3cc467d8..4ea1946c 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java @@ -264,7 +264,7 @@ public class Order extends BaseEntity { this.setOrderType(OrderTypeEnum.VIRTUAL.name()); } else { //促销订单（拼团、积分）-判断购买的是虚拟商品还是实物商品 - String goodsType = cartVO.getSkuList().get(0).getGoodsSku().getGoodsType(); + String goodsType = cartVO.getCheckedSkuList().get(0).getGoodsSku().getGoodsType(); if (StrUtil.isEmpty(goodsType) || goodsType.equals(GoodsTypeEnum.PHYSICAL_GOODS.name())) { this.setOrderType(OrderTypeEnum.NORMAL.name()); } else { @@ -275,7 +275,7 @@ public class Order extends BaseEntity { //判断是否为拼团订单，如果为拼团订单获取拼团ID，判断是否为主订单 if (tradeDTO.getCartTypeEnum().name().equals(PromotionTypeEnum.PINTUAN.name())) { - Optional pintuanId = cartVO.getSkuList().get(0).getPromotions().stream() + Optional pintuanId = cartVO.getCheckedSkuList().get(0).getPromotions().stream() .filter(i -> i.getPromotionType().equals(PromotionTypeEnum.PINTUAN.name())).map(PromotionGoods::getPromotionId).findFirst(); promotionId = pintuanId.get(); } 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/service/AfterSaleService.java b/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleService.java index 96975954..6af2ebe2 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleService.java +++ b/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleService.java @@ -7,7 +7,7 @@ import cn.lili.modules.order.order.entity.dto.AfterSaleDTO; import cn.lili.modules.order.order.entity.vo.AfterSaleApplyVO; import cn.lili.modules.order.order.entity.vo.AfterSaleSearchParams; import cn.lili.modules.order.order.entity.vo.AfterSaleVO; -import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; +import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO; import cn.lili.modules.system.entity.vo.Traces; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java b/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java index 1e6d27da..4fb1d04c 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java +++ b/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java @@ -9,7 +9,7 @@ import cn.lili.modules.order.order.entity.dto.OrderMessage; import cn.lili.modules.order.order.entity.dto.OrderSearchParams; import cn.lili.modules.order.order.entity.vo.OrderDetailVO; import cn.lili.modules.order.order.entity.vo.OrderSimpleVO; -import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; +import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; import cn.lili.modules.system.entity.vo.Traces; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; 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 dd9d2453..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,8 +33,8 @@ 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.statistics.model.dto.StatisticsQueryParam; +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; import cn.lili.modules.store.service.StoreDetailService; 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 8d3d890a..d5c4e42f 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 @@ -16,7 +16,6 @@ import cn.lili.common.security.enums.UserEnums; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; import cn.lili.modules.goods.entity.dto.GoodsCompleteMessage; -import cn.lili.modules.goods.service.GoodsSkuService; import cn.lili.modules.member.entity.dto.MemberAddressDTO; import cn.lili.modules.order.cart.entity.dto.TradeDTO; import cn.lili.modules.order.order.aop.OrderLogPoint; @@ -37,10 +36,10 @@ 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.model.dto.StatisticsQueryParam; +import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; import cn.lili.modules.statistics.util.StatisticsDateUtil; import cn.lili.modules.system.aspect.annotation.SystemLogPoint; import cn.lili.modules.system.entity.dos.Logistics; @@ -169,7 +168,7 @@ public class OrderServiceImpl extends ServiceImpl implements String message = "订单[" + item.getSn() + "]创建"; //记录日志 orderLogs.add(new OrderLog(item.getSn(), UserContext.getCurrentUser().getId(), UserContext.getCurrentUser().getRole().getRole(), UserContext.getCurrentUser().getUsername(), message)); - item.getSkuList().forEach( + item.getCheckedSkuList().forEach( sku -> orderItems.add(new OrderItem(sku, item, tradeDTO)) ); //写入子订单信息 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/statistics/model/dos/MemberStatisticsData.java b/framework/src/main/java/cn/lili/modules/statistics/entity/dos/MemberStatisticsData.java similarity index 95% rename from framework/src/main/java/cn/lili/modules/statistics/model/dos/MemberStatisticsData.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/dos/MemberStatisticsData.java index 7cb076dc..39e90891 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/dos/MemberStatisticsData.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/dos/MemberStatisticsData.java @@ -1,4 +1,4 @@ -package cn.lili.modules.statistics.model.dos; +package cn.lili.modules.statistics.entity.dos; import cn.lili.mybatis.BaseIdEntity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/dos/PlatformViewData.java b/framework/src/main/java/cn/lili/modules/statistics/entity/dos/PlatformViewData.java similarity index 94% rename from framework/src/main/java/cn/lili/modules/statistics/model/dos/PlatformViewData.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/dos/PlatformViewData.java index 9b38fd3a..04d92765 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/dos/PlatformViewData.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/dos/PlatformViewData.java @@ -1,4 +1,4 @@ -package cn.lili.modules.statistics.model.dos; +package cn.lili.modules.statistics.entity.dos; import cn.lili.mybatis.BaseIdEntity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/dto/GoodsStatisticsQueryParam.java b/framework/src/main/java/cn/lili/modules/statistics/entity/dto/GoodsStatisticsQueryParam.java similarity index 88% rename from framework/src/main/java/cn/lili/modules/statistics/model/dto/GoodsStatisticsQueryParam.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/dto/GoodsStatisticsQueryParam.java index c898b278..f666faba 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/dto/GoodsStatisticsQueryParam.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/dto/GoodsStatisticsQueryParam.java @@ -1,4 +1,4 @@ -package cn.lili.modules.statistics.model.dto; +package cn.lili.modules.statistics.entity.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/dto/StatisticsQueryParam.java b/framework/src/main/java/cn/lili/modules/statistics/entity/dto/StatisticsQueryParam.java similarity index 93% rename from framework/src/main/java/cn/lili/modules/statistics/model/dto/StatisticsQueryParam.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/dto/StatisticsQueryParam.java index fec5ce06..37b985e8 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/dto/StatisticsQueryParam.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/dto/StatisticsQueryParam.java @@ -1,4 +1,4 @@ -package cn.lili.modules.statistics.model.dto; +package cn.lili.modules.statistics.entity.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/enums/SearchTypeEnum.java b/framework/src/main/java/cn/lili/modules/statistics/entity/enums/SearchTypeEnum.java similarity index 81% rename from framework/src/main/java/cn/lili/modules/statistics/model/enums/SearchTypeEnum.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/enums/SearchTypeEnum.java index 22850d5b..a7854cc2 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/enums/SearchTypeEnum.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/enums/SearchTypeEnum.java @@ -1,4 +1,4 @@ -package cn.lili.modules.statistics.model.enums; +package cn.lili.modules.statistics.entity.enums; /** * 搜索类型 diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/enums/StatisticsQuery.java b/framework/src/main/java/cn/lili/modules/statistics/entity/enums/StatisticsQuery.java similarity index 78% rename from framework/src/main/java/cn/lili/modules/statistics/model/enums/StatisticsQuery.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/enums/StatisticsQuery.java index bf001aa2..68aee0d6 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/enums/StatisticsQuery.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/enums/StatisticsQuery.java @@ -1,4 +1,4 @@ -package cn.lili.modules.statistics.model.enums; +package cn.lili.modules.statistics.entity.enums; /** * 统计查询 diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/enums/TimeTypeEnum.java b/framework/src/main/java/cn/lili/modules/statistics/entity/enums/TimeTypeEnum.java similarity index 81% rename from framework/src/main/java/cn/lili/modules/statistics/model/enums/TimeTypeEnum.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/enums/TimeTypeEnum.java index 8b131641..abc94b1e 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/enums/TimeTypeEnum.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/enums/TimeTypeEnum.java @@ -1,4 +1,4 @@ -package cn.lili.modules.statistics.model.enums; +package cn.lili.modules.statistics.entity.enums; /** * 时间类型 diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/CategoryStatisticsDataVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/CategoryStatisticsDataVO.java similarity index 91% rename from framework/src/main/java/cn/lili/modules/statistics/model/vo/CategoryStatisticsDataVO.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/vo/CategoryStatisticsDataVO.java index 5377e040..bcc41996 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/CategoryStatisticsDataVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/CategoryStatisticsDataVO.java @@ -1,4 +1,4 @@ -package cn.lili.modules.statistics.model.vo; +package cn.lili.modules.statistics.entity.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/GoodsStatisticsDataVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/GoodsStatisticsDataVO.java similarity index 91% rename from framework/src/main/java/cn/lili/modules/statistics/model/vo/GoodsStatisticsDataVO.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/vo/GoodsStatisticsDataVO.java index 88082f48..e8cad939 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/GoodsStatisticsDataVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/GoodsStatisticsDataVO.java @@ -1,4 +1,4 @@ -package cn.lili.modules.statistics.model.vo; +package cn.lili.modules.statistics.entity.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexNoticeVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/IndexNoticeVO.java similarity index 93% rename from framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexNoticeVO.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/vo/IndexNoticeVO.java index e2a1e8c2..56b3f0f5 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexNoticeVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/IndexNoticeVO.java @@ -1,4 +1,4 @@ -package cn.lili.modules.statistics.model.vo; +package cn.lili.modules.statistics.entity.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexStatisticsVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/IndexStatisticsVO.java similarity index 97% rename from framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexStatisticsVO.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/vo/IndexStatisticsVO.java index a7a6b068..e449bd9e 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexStatisticsVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/IndexStatisticsVO.java @@ -1,4 +1,4 @@ -package cn.lili.modules.statistics.model.vo; +package cn.lili.modules.statistics.entity.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/OnlineMemberVO.java similarity index 90% rename from framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/vo/OnlineMemberVO.java index 3ab00e7b..fc66d9da 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/OnlineMemberVO.java @@ -1,4 +1,4 @@ -package cn.lili.modules.statistics.model.vo; +package cn.lili.modules.statistics.entity.vo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderOverviewVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/OrderOverviewVO.java similarity index 96% rename from framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderOverviewVO.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/vo/OrderOverviewVO.java index abe916d8..ce3dbf16 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderOverviewVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/OrderOverviewVO.java @@ -1,4 +1,4 @@ -package cn.lili.modules.statistics.model.vo; +package cn.lili.modules.statistics.entity.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderStatisticsDataVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/OrderStatisticsDataVO.java similarity index 94% rename from framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderStatisticsDataVO.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/vo/OrderStatisticsDataVO.java index 8c699cf4..c349d471 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderStatisticsDataVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/OrderStatisticsDataVO.java @@ -1,4 +1,4 @@ -package cn.lili.modules.statistics.model.vo; +package cn.lili.modules.statistics.entity.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/PlatformViewVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/PlatformViewVO.java similarity index 95% rename from framework/src/main/java/cn/lili/modules/statistics/model/vo/PlatformViewVO.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/vo/PlatformViewVO.java index bd1c92c5..2e8486bc 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/PlatformViewVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/PlatformViewVO.java @@ -1,4 +1,4 @@ -package cn.lili.modules.statistics.model.vo; +package cn.lili.modules.statistics.entity.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/RefundOrderStatisticsDataVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/RefundOrderStatisticsDataVO.java similarity index 93% rename from framework/src/main/java/cn/lili/modules/statistics/model/vo/RefundOrderStatisticsDataVO.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/vo/RefundOrderStatisticsDataVO.java index 5d620e59..2920ae03 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/RefundOrderStatisticsDataVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/RefundOrderStatisticsDataVO.java @@ -1,4 +1,4 @@ -package cn.lili.modules.statistics.model.vo; +package cn.lili.modules.statistics.entity.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreIndexStatisticsVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/StoreIndexStatisticsVO.java similarity index 97% rename from framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreIndexStatisticsVO.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/vo/StoreIndexStatisticsVO.java index 4d282829..f4b013f0 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreIndexStatisticsVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/StoreIndexStatisticsVO.java @@ -1,4 +1,4 @@ -package cn.lili.modules.statistics.model.vo; +package cn.lili.modules.statistics.entity.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreStatisticsDataVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/StoreStatisticsDataVO.java similarity index 91% rename from framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreStatisticsDataVO.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/vo/StoreStatisticsDataVO.java index 8b90f6e0..88f99211 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreStatisticsDataVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/StoreStatisticsDataVO.java @@ -1,4 +1,4 @@ -package cn.lili.modules.statistics.model.vo; +package cn.lili.modules.statistics.entity.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/GoodsStatisticsDataMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/GoodsStatisticsDataMapper.java index e06c36f2..226e253d 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/mapper/GoodsStatisticsDataMapper.java +++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/GoodsStatisticsDataMapper.java @@ -1,8 +1,8 @@ package cn.lili.modules.statistics.mapper; import cn.lili.modules.order.order.entity.dos.StoreFlow; -import cn.lili.modules.statistics.model.vo.CategoryStatisticsDataVO; -import cn.lili.modules.statistics.model.vo.GoodsStatisticsDataVO; +import cn.lili.modules.statistics.entity.vo.CategoryStatisticsDataVO; +import cn.lili.modules.statistics.entity.vo.GoodsStatisticsDataVO; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/MemberStatisticsDataMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/MemberStatisticsDataMapper.java index f0eb3ce1..685fd906 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/mapper/MemberStatisticsDataMapper.java +++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/MemberStatisticsDataMapper.java @@ -1,6 +1,6 @@ package cn.lili.modules.statistics.mapper; -import cn.lili.modules.statistics.model.dos.MemberStatisticsData; +import cn.lili.modules.statistics.entity.dos.MemberStatisticsData; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/OrderStatisticsDataMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/OrderStatisticsDataMapper.java index 7843c21f..69948a49 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/mapper/OrderStatisticsDataMapper.java +++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/OrderStatisticsDataMapper.java @@ -1,7 +1,7 @@ package cn.lili.modules.statistics.mapper; import cn.lili.modules.order.order.entity.dos.StoreFlow; -import cn.lili.modules.statistics.model.vo.OrderStatisticsDataVO; +import cn.lili.modules.statistics.entity.vo.OrderStatisticsDataVO; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/PlatformViewDataMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/PlatformViewDataMapper.java index 2efa59b9..3109b05f 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/mapper/PlatformViewDataMapper.java +++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/PlatformViewDataMapper.java @@ -1,6 +1,6 @@ package cn.lili.modules.statistics.mapper; -import cn.lili.modules.statistics.model.dos.PlatformViewData; +import cn.lili.modules.statistics.entity.dos.PlatformViewData; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/RefundOrderStatisticsDataMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/RefundOrderStatisticsDataMapper.java index 11e3d76e..e4843c19 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/mapper/RefundOrderStatisticsDataMapper.java +++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/RefundOrderStatisticsDataMapper.java @@ -1,7 +1,7 @@ package cn.lili.modules.statistics.mapper; import cn.lili.modules.order.order.entity.dos.StoreFlow; -import cn.lili.modules.statistics.model.vo.RefundOrderStatisticsDataVO; +import cn.lili.modules.statistics.entity.vo.RefundOrderStatisticsDataVO; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/StoreStatisticsDataMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/StoreStatisticsDataMapper.java index 6521fee0..825bbd83 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/mapper/StoreStatisticsDataMapper.java +++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/StoreStatisticsDataMapper.java @@ -1,8 +1,8 @@ package cn.lili.modules.statistics.mapper; import cn.lili.modules.order.order.entity.dos.StoreFlow; -import cn.lili.modules.statistics.model.vo.GoodsStatisticsDataVO; -import cn.lili.modules.statistics.model.vo.StoreStatisticsDataVO; +import cn.lili.modules.statistics.entity.vo.GoodsStatisticsDataVO; +import cn.lili.modules.statistics.entity.vo.StoreStatisticsDataVO; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsDataService.java b/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsDataService.java index 48ba024c..0752a97c 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsDataService.java +++ b/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsDataService.java @@ -1,9 +1,9 @@ package cn.lili.modules.statistics.service; import cn.lili.modules.order.order.entity.dos.StoreFlow; -import cn.lili.modules.statistics.model.dto.GoodsStatisticsQueryParam; -import cn.lili.modules.statistics.model.vo.CategoryStatisticsDataVO; -import cn.lili.modules.statistics.model.vo.GoodsStatisticsDataVO; +import cn.lili.modules.statistics.entity.dto.GoodsStatisticsQueryParam; +import cn.lili.modules.statistics.entity.vo.CategoryStatisticsDataVO; +import cn.lili.modules.statistics.entity.vo.GoodsStatisticsDataVO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/IndexStatisticsService.java b/framework/src/main/java/cn/lili/modules/statistics/service/IndexStatisticsService.java index 1a50bcd5..427a1d89 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/service/IndexStatisticsService.java +++ b/framework/src/main/java/cn/lili/modules/statistics/service/IndexStatisticsService.java @@ -1,8 +1,8 @@ package cn.lili.modules.statistics.service; -import cn.lili.modules.statistics.model.dto.GoodsStatisticsQueryParam; -import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; -import cn.lili.modules.statistics.model.vo.*; +import cn.lili.modules.statistics.entity.dto.GoodsStatisticsQueryParam; +import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; +import cn.lili.modules.statistics.entity.vo.*; import java.util.List; diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/MemberStatisticsDataService.java b/framework/src/main/java/cn/lili/modules/statistics/service/MemberStatisticsDataService.java index 8ec5fcb2..5cfb280f 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/service/MemberStatisticsDataService.java +++ b/framework/src/main/java/cn/lili/modules/statistics/service/MemberStatisticsDataService.java @@ -1,7 +1,7 @@ package cn.lili.modules.statistics.service; -import cn.lili.modules.statistics.model.dos.MemberStatisticsData; -import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; +import cn.lili.modules.statistics.entity.dos.MemberStatisticsData; +import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; import com.baomidou.mybatisplus.extension.service.IService; import java.util.Date; diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/OrderStatisticsDataService.java b/framework/src/main/java/cn/lili/modules/statistics/service/OrderStatisticsDataService.java index de9488b1..cdc192f5 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/service/OrderStatisticsDataService.java +++ b/framework/src/main/java/cn/lili/modules/statistics/service/OrderStatisticsDataService.java @@ -1,9 +1,9 @@ package cn.lili.modules.statistics.service; import cn.lili.modules.order.order.entity.dos.StoreFlow; -import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; -import cn.lili.modules.statistics.model.vo.OrderOverviewVO; -import cn.lili.modules.statistics.model.vo.OrderStatisticsDataVO; +import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; +import cn.lili.modules.statistics.entity.vo.OrderOverviewVO; +import cn.lili.modules.statistics.entity.vo.OrderStatisticsDataVO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/PlatformViewDataService.java b/framework/src/main/java/cn/lili/modules/statistics/service/PlatformViewDataService.java index 9f306eab..526ccdb4 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/service/PlatformViewDataService.java +++ b/framework/src/main/java/cn/lili/modules/statistics/service/PlatformViewDataService.java @@ -1,10 +1,10 @@ package cn.lili.modules.statistics.service; import cn.lili.modules.member.entity.vo.MemberDistributionVO; -import cn.lili.modules.statistics.model.dos.PlatformViewData; -import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; -import cn.lili.modules.statistics.model.vo.OnlineMemberVO; -import cn.lili.modules.statistics.model.vo.PlatformViewVO; +import cn.lili.modules.statistics.entity.dos.PlatformViewData; +import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; +import cn.lili.modules.statistics.entity.vo.OnlineMemberVO; +import cn.lili.modules.statistics.entity.vo.PlatformViewVO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/RefundOrderStatisticsService.java b/framework/src/main/java/cn/lili/modules/statistics/service/RefundOrderStatisticsService.java index c41c1c1b..685e27c9 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/service/RefundOrderStatisticsService.java +++ b/framework/src/main/java/cn/lili/modules/statistics/service/RefundOrderStatisticsService.java @@ -2,8 +2,8 @@ package cn.lili.modules.statistics.service; import cn.lili.common.vo.PageVO; import cn.lili.modules.order.order.entity.dos.StoreFlow; -import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; -import cn.lili.modules.statistics.model.vo.RefundOrderStatisticsDataVO; +import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; +import cn.lili.modules.statistics.entity.vo.RefundOrderStatisticsDataVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java index 68177182..3f101189 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java @@ -4,17 +4,16 @@ import cn.lili.common.utils.StringUtils; import cn.lili.modules.order.order.entity.dos.StoreFlow; import cn.lili.modules.order.order.entity.enums.FlowTypeEnum; import cn.lili.modules.statistics.mapper.GoodsStatisticsDataMapper; -import cn.lili.modules.statistics.model.dto.GoodsStatisticsQueryParam; -import cn.lili.modules.statistics.model.enums.StatisticsQuery; -import cn.lili.modules.statistics.model.vo.CategoryStatisticsDataVO; -import cn.lili.modules.statistics.model.vo.GoodsStatisticsDataVO; +import cn.lili.modules.statistics.entity.dto.GoodsStatisticsQueryParam; +import cn.lili.modules.statistics.entity.enums.StatisticsQuery; +import cn.lili.modules.statistics.entity.vo.CategoryStatisticsDataVO; +import cn.lili.modules.statistics.entity.vo.GoodsStatisticsDataVO; import cn.lili.modules.statistics.service.GoodsStatisticsDataService; import cn.lili.modules.statistics.util.StatisticsDateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java index bdea438a..eab152e7 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java @@ -17,10 +17,10 @@ import cn.lili.modules.order.order.service.OrderComplaintService; import cn.lili.modules.order.trade.entity.enums.AfterSaleTypeEnum; import cn.lili.modules.promotion.service.SeckillService; import cn.lili.modules.statistics.mapper.StoreStatisticsDataMapper; -import cn.lili.modules.statistics.model.dto.GoodsStatisticsQueryParam; -import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; -import cn.lili.modules.statistics.model.enums.SearchTypeEnum; -import cn.lili.modules.statistics.model.vo.*; +import cn.lili.modules.statistics.entity.dto.GoodsStatisticsQueryParam; +import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; +import cn.lili.modules.statistics.entity.enums.SearchTypeEnum; +import cn.lili.modules.statistics.entity.vo.*; import cn.lili.modules.statistics.service.*; import cn.lili.modules.statistics.util.StatisticsDateUtil; import cn.lili.modules.store.entity.enums.BillStatusEnum; diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsDataServiceImpl.java index d6b3fc89..e79dae22 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsDataServiceImpl.java @@ -2,9 +2,9 @@ package cn.lili.modules.statistics.serviceimpl; import cn.hutool.core.date.DateUtil; import cn.lili.modules.statistics.mapper.MemberStatisticsDataMapper; -import cn.lili.modules.statistics.model.dos.MemberStatisticsData; -import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; -import cn.lili.modules.statistics.model.enums.SearchTypeEnum; +import cn.lili.modules.statistics.entity.dos.MemberStatisticsData; +import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; +import cn.lili.modules.statistics.entity.enums.SearchTypeEnum; import cn.lili.modules.statistics.service.MemberStatisticsDataService; import cn.lili.modules.statistics.util.StatisticsDateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java index 21661218..12d1187b 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java @@ -12,9 +12,9 @@ import cn.lili.modules.order.order.entity.enums.FlowTypeEnum; import cn.lili.modules.order.order.entity.enums.PayStatusEnum; import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.statistics.mapper.OrderStatisticsDataMapper; -import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; -import cn.lili.modules.statistics.model.vo.OrderOverviewVO; -import cn.lili.modules.statistics.model.vo.OrderStatisticsDataVO; +import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; +import cn.lili.modules.statistics.entity.vo.OrderOverviewVO; +import cn.lili.modules.statistics.entity.vo.OrderStatisticsDataVO; import cn.lili.modules.statistics.service.OrderStatisticsDataService; import cn.lili.modules.statistics.service.PlatformViewDataService; import cn.lili.modules.statistics.util.StatisticsDateUtil; diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java index d45c5136..3dcf50e1 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java @@ -11,11 +11,11 @@ import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.member.entity.vo.MemberDistributionVO; import cn.lili.modules.member.service.MemberService; import cn.lili.modules.statistics.mapper.PlatformViewDataMapper; -import cn.lili.modules.statistics.model.dos.PlatformViewData; -import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; -import cn.lili.modules.statistics.model.enums.SearchTypeEnum; -import cn.lili.modules.statistics.model.vo.OnlineMemberVO; -import cn.lili.modules.statistics.model.vo.PlatformViewVO; +import cn.lili.modules.statistics.entity.dos.PlatformViewData; +import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; +import cn.lili.modules.statistics.entity.enums.SearchTypeEnum; +import cn.lili.modules.statistics.entity.vo.OnlineMemberVO; +import cn.lili.modules.statistics.entity.vo.PlatformViewVO; import cn.lili.modules.statistics.service.PlatformViewDataService; import cn.lili.modules.statistics.util.StatisticsDateUtil; import cn.lili.modules.statistics.util.StatisticsSuffix; diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/RefundOrderStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/RefundOrderStatisticsServiceImpl.java index 1d5dc682..f07a887b 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/RefundOrderStatisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/RefundOrderStatisticsServiceImpl.java @@ -7,9 +7,9 @@ import cn.lili.common.vo.PageVO; import cn.lili.modules.order.order.entity.dos.StoreFlow; import cn.lili.modules.order.order.entity.enums.FlowTypeEnum; import cn.lili.modules.statistics.mapper.RefundOrderStatisticsDataMapper; -import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; -import cn.lili.modules.statistics.model.enums.TimeTypeEnum; -import cn.lili.modules.statistics.model.vo.RefundOrderStatisticsDataVO; +import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; +import cn.lili.modules.statistics.entity.enums.TimeTypeEnum; +import cn.lili.modules.statistics.entity.vo.RefundOrderStatisticsDataVO; import cn.lili.modules.statistics.service.RefundOrderStatisticsService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsDateUtil.java b/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsDateUtil.java index cd1bd333..8161765d 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsDateUtil.java +++ b/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsDateUtil.java @@ -3,8 +3,8 @@ package cn.lili.modules.statistics.util; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.utils.StringUtils; -import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; -import cn.lili.modules.statistics.model.enums.SearchTypeEnum; +import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; +import cn.lili.modules.statistics.entity.enums.SearchTypeEnum; import java.util.Calendar; import java.util.Date; diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDelivery.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDelivery.java deleted file mode 100644 index becf1ec8..00000000 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDelivery.java +++ /dev/null @@ -1,67 +0,0 @@ -package cn.lili.modules.system.entity.dos; - - -import cn.lili.mybatis.BaseEntity; -import cn.lili.modules.system.entity.vo.InstantDeliveryVO; -import com.baomidou.mybatisplus.annotation.TableName; -import com.google.gson.Gson; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - - -/** - * 即时配送 - * - * @author pikachu - * @since 2020/12/01 15:58 - */ -@Data -@TableName("li_instant_delivery") -@ApiModel(value = "即时配送") -@AllArgsConstructor -@NoArgsConstructor -public class InstantDelivery extends BaseEntity { - - - /** - * 即时配送名称 - */ - @ApiModelProperty(value = "即时配送名称") - private String deliveryName; - /** - * 是否开启即时配送,1开启，0未开启 - */ - @ApiModelProperty(value = "是否开启即时配送,1开启，0未开启") - private Integer deliveryOpen; - /** - * 即时配送配置 - */ - @ApiModelProperty(value = "即时配送配置") - private String deliveryConfig; - /** - * 即时配送bean - */ - @ApiModelProperty(value = "即时配送bean") - private String deliveryBean; - - @ApiModelProperty(value = "封面图片") - private String images; - - - /** - * 根据vo参数构建do - * - * @param instantDeliveryVO - */ - public InstantDelivery(InstantDeliveryVO instantDeliveryVO) { - this.setDeliveryName(instantDeliveryVO.getDeliveryName()); - this.setDeliveryOpen(instantDeliveryVO.getDeliveryOpen()); - this.setDeliveryBean(instantDeliveryVO.getDeliveryBean()); - Gson gson = new Gson(); - this.setDeliveryConfig(gson.toJson(instantDeliveryVO.getConfigItems())); - } - -} \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDeliveryLog.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDeliveryLog.java deleted file mode 100644 index b62f8959..00000000 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDeliveryLog.java +++ /dev/null @@ -1,99 +0,0 @@ -package cn.lili.modules.system.entity.dos; - - -import cn.lili.common.utils.StringUtils; -import cn.lili.modules.system.entity.plugin.logistics.dada.enums.DadaOrderStatusEnum; -import cn.lili.modules.system.entity.plugin.logistics.dada.vo.DdOrderBackVO; -import cn.lili.mybatis.BaseIdEntity; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.data.annotation.CreatedDate; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -/** - * 即时配送日志 - * - * @author pikachu - * @since 2020/12/01 15:58 - */ - -@Data -@TableName("li_instant_delivery_log") -@ApiModel(value = "即时配送日志") -@AllArgsConstructor -@NoArgsConstructor -public class InstantDeliveryLog extends BaseIdEntity { - - - @CreatedDate - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建时间", hidden = true) - private Date createTime; - /** - * 即时配送订单号 - */ - @ApiModelProperty(value = "即时配送订单号") - private String deliveryOrderSn; - /** - * 商城订单号 - */ - @ApiModelProperty(value = "商城订单号") - private String orderSn; - /** - * 即时配送订单状态 - * - * @see DadaOrderStatusEnum - */ - @ApiModelProperty(value = "即时配送订单状态") - private String deliveryOrderStatus; - /** - * 配送员ID - */ - @ApiModelProperty(value = "即时配送骑手编号") - private String distributorNumber; - /** - * 配送员姓名，接单以后会存储 - */ - @ApiModelProperty(value = "配送员姓名，接单以后会存储") - private String distributorName; - /** - * 配送员手机号，接单以后存储 - */ - @ApiModelProperty(value = "配送员手机号，接单以后存储") - private String distributorMobile; - - /** - * 订单取消原因,其他状态下默认值为空字符串 - */ - @ApiModelProperty(value = "订单取消原因,其他状态下默认值为空字符串") - private String cancelReason; - - public InstantDeliveryLog(DdOrderBackVO ddOrderBackVO) { - this.setCancelReason(ddOrderBackVO.getCancelReason()); - this.setOrderSn(ddOrderBackVO.getOrderId()); - this.setDeliveryOrderSn(ddOrderBackVO.getClientId()); - if (!StringUtils.isEmpty(ddOrderBackVO.getDmMobile())) { - this.setDistributorMobile(ddOrderBackVO.getDmMobile()); - } - if (!StringUtils.isEmpty(ddOrderBackVO.getDmName())) { - this.setDistributorName(ddOrderBackVO.getDmName()); - } - if (ddOrderBackVO.getDmId() != null) { - this.setDistributorNumber(ddOrderBackVO.getDmId().toString()); - } - this.setDeliveryOrderStatus(DadaOrderStatusEnum.getText(100)); - } - - -} \ No newline at end of file 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; diff --git a/framework/src/main/java/cn/lili/modules/system/entity/enums/InstantDeliveryUrl.java b/framework/src/main/java/cn/lili/modules/system/entity/enums/InstantDeliveryUrl.java deleted file mode 100644 index bee60f65..00000000 --- a/framework/src/main/java/cn/lili/modules/system/entity/enums/InstantDeliveryUrl.java +++ /dev/null @@ -1,63 +0,0 @@ -package cn.lili.modules.system.entity.enums; - - -import lombok.Getter; -import lombok.Setter; - -/** - * 即时配送url接口地址 - * - * @author pikachu - * @since 2020/9/11 17:03 - */ -public enum InstantDeliveryUrl { - - /** - * 订单推送 - */ - DD_ADD_ORDER("/api/order/addOrder"), - /** - * 订单重发 - */ - DD_RE_ADD_ORDER("/api/order/reAddOrder"), - /** - * 订单妥投异常后，商家确认收货 - */ - DD_CONFIRM_ORDER("/api/order/confirm/goods"), - /** - * 店铺添加 - */ - DD_ADD_SHOP("/api/store/add"), - /** - * 店铺修改 - */ - DD_UPDATE_SHOP("/api/store/update"), - - /** - * 订单详细信息 - */ - DD_QUERY_ORDER("/api/order/status/query"), - - /** - * 订单取消 - */ - DD_CANDLE_ORDER("/api/order/formalCancel"), - - /** - * 城市code获取 - */ - DD_CITY_CODE("/api/cityCode/list"); - - /** - * 类型 - */ - @Getter - @Setter - private final String url; - - InstantDeliveryUrl(String url) { - this.url = url; - } - -} - diff --git a/framework/src/main/java/cn/lili/modules/system/entity/plugin/ConfigItem.java b/framework/src/main/java/cn/lili/modules/system/entity/plugin/ConfigItem.java deleted file mode 100644 index c0659173..00000000 --- a/framework/src/main/java/cn/lili/modules/system/entity/plugin/ConfigItem.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.lili.modules.system.entity.plugin; - -import lombok.Data; -import lombok.ToString; - -import java.util.List; - -/** - * 插件配置类 - * - * @author pikachu - * @version v4.0 - * @since 2020/12/01 15:58 - */ -@Data -@ToString -public class ConfigItem { - /** - * 配置文件name值 - */ - private String name; - /** - * 配置文件name映射文本值 - */ - private String text; - /** - * 配置文件显示在浏览器时，input的type属性 - */ - private String type; - /** - * 配置的值 - */ - private Object value; - /** - * 如果是select 是需要将可选项传递到前台 - */ - private List options; - - -} diff --git a/framework/src/main/java/cn/lili/modules/system/entity/plugin/RadioOption.java b/framework/src/main/java/cn/lili/modules/system/entity/plugin/RadioOption.java deleted file mode 100644 index 0c558303..00000000 --- a/framework/src/main/java/cn/lili/modules/system/entity/plugin/RadioOption.java +++ /dev/null @@ -1,28 +0,0 @@ -package cn.lili.modules.system.entity.plugin; - -import lombok.Data; -import lombok.ToString; - -/** - * 单选配置类 - * - * @author pikachu - * @version v4.0 - * @Description:单选配置类 - * @since 2020/12/01 15:58 - */ -@Data -@ToString -public class RadioOption { - - /** - * 选项 - */ - private String label; - - /** - * 选项值 - */ - private Object value; - -} diff --git a/framework/src/main/java/cn/lili/modules/system/entity/plugin/logistics/InstantDeliveryPlugin.java b/framework/src/main/java/cn/lili/modules/system/entity/plugin/logistics/InstantDeliveryPlugin.java deleted file mode 100644 index cc401872..00000000 --- a/framework/src/main/java/cn/lili/modules/system/entity/plugin/logistics/InstantDeliveryPlugin.java +++ /dev/null @@ -1,119 +0,0 @@ -package cn.lili.modules.system.entity.plugin.logistics; - -import cn.lili.modules.member.entity.dos.MemberAddress; -import cn.lili.modules.order.order.entity.dos.Order; -import cn.lili.modules.store.entity.vos.StoreDetailVO; -import cn.lili.modules.system.entity.plugin.ConfigItem; -import cn.lili.modules.system.entity.vo.InstantDeliveryResultVO; - -import java.util.List; -import java.util.Map; - -/** - * 即时配送插件方法 - * - * @author pikachu - * @version v1.0 - * @since 2020/12/01 15:58 - */ -public interface InstantDeliveryPlugin { - /** - * 获取即时配送的插件ID - * - * @return - */ - String getPluginId(); - - /** - * 获取即时配送的插件名称 - * - * @return 插件名称 - */ - String getPluginName(); - - /** - * 即时配送是否开启 - * - * @return 0 不开启 1 开启 - */ - Integer getOpen(); - - /** - * 获取取消原因id - * - * @return - */ - Integer cancelReasonId(); - - /** - * 配置各个即时配送的参数 - * - * @return 在页面加载的即时配送参数 - */ - List getDefaultConfigItem(); - - /** - * 同城配送新建店铺 - * - * @param storeDetailVO 店铺信息 - * @param config 配送参数 - * @return - */ - InstantDeliveryResultVO addStore(StoreDetailVO storeDetailVO, Map config); - - /** - * 同城配送新建店铺 - * - * @param storeDetailVO 店铺信息 - * @param config 配送参数 - * @return - */ - InstantDeliveryResultVO editStore(StoreDetailVO storeDetailVO, Map config); - - /** - * 查询订单详细 - * - * @param orderSn 传递到达达的订单sn，目前使用的是商城订单sn传递的所有只需要传递商城sn就可以 - * @param config 配置参数 - * @return - */ - InstantDeliveryResultVO getOrderDetail(String orderSn, Map config); - - /** - * 妥投异常之物品返回完成 - * - * @param orderSn 传递到达达的订单sn，目前使用的是商城订单sn传递的所有只需要传递商城sn就可以 - * @param config 配置参数 - * @return - */ - InstantDeliveryResultVO orderConfirm(String orderSn, Map config); - - /** - * 妥投异常之物品返回完成 - * - * @param orderSn 传递到达达的订单sn，目前使用的是商城订单sn传递的所有只需要传递商城sn就可以 - * @param cancelReason 取消原因 - * @param config 配置参数 - * @return - */ - InstantDeliveryResultVO orderCandle(String orderSn, String cancelReason, Map config); - - /** - * 发送同城配送订单 - * - * @param order 订单 - * @param memberAddress 会员地址 - * @param type 类型 - * @param config 配置 - * @param storeDetailVO 店铺详情VO - * @return 配送订单返回 - */ - InstantDeliveryResultVO sendReOrder(Order order, StoreDetailVO storeDetailVO, MemberAddress memberAddress, Integer type, Map config); - - /** - * 即时配送回调 - * - * @param object 因为不同配送的返回对象不同，所以需要obj 去传递参数，在不同的插件中转换 - */ - void callBack(Object object); -} diff --git a/framework/src/main/java/cn/lili/modules/system/entity/plugin/logistics/dada/DadaPlugin.java b/framework/src/main/java/cn/lili/modules/system/entity/plugin/logistics/dada/DadaPlugin.java deleted file mode 100644 index 4986fcc4..00000000 --- a/framework/src/main/java/cn/lili/modules/system/entity/plugin/logistics/dada/DadaPlugin.java +++ /dev/null @@ -1,346 +0,0 @@ -package cn.lili.modules.system.entity.plugin.logistics.dada; - -import cn.hutool.json.JSONArray; -import cn.hutool.json.JSONObject; -import cn.hutool.json.JSONUtil; -import cn.lili.common.utils.DateUtil; -import cn.lili.common.utils.StringUtils; -import cn.lili.modules.member.entity.dos.MemberAddress; -import cn.lili.modules.order.order.entity.dos.Order; -import cn.lili.modules.store.entity.enums.StoreStatusEnum; -import cn.lili.modules.store.entity.vos.StoreDetailVO; -import cn.lili.modules.store.service.StoreDetailService; -import cn.lili.modules.system.entity.dos.InstantDeliveryLog; -import cn.lili.modules.system.entity.enums.InstantDeliveryUrl; -import cn.lili.modules.system.entity.plugin.ConfigItem; -import cn.lili.modules.system.entity.plugin.logistics.InstantDeliveryPlugin; -import cn.lili.modules.system.entity.plugin.logistics.dada.vo.DdOrderBackVO; -import cn.lili.modules.system.entity.vo.CityResult; -import cn.lili.modules.system.entity.vo.InstantDeliveryResultVO; -import cn.lili.modules.system.service.InstantDeliveryLogService; -import cn.lili.modules.system.utils.HttpUtils; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 达达同城配送 - * - * @author pikachu - * @version v4.0 - * @since 2020/12/01 15:58 - */ -@Slf4j -@Component("ddPlugin") -public class DadaPlugin implements InstantDeliveryPlugin { - - @Autowired - private StoreDetailService storeDetailService; - @Autowired - private InstantDeliveryLogService instantDeliveryLogService; - - @Override - public String getPluginId() { - return "ddPlugin"; - } - - @Override - public String getPluginName() { - return "达达"; - } - - @Override - public Integer getOpen() { - return 0; - } - - @Override - public List getDefaultConfigItem() { - List list = new ArrayList(); - - ConfigItem url = new ConfigItem(); - url.setType("text"); - url.setName("url"); - url.setText("调用地址"); - - - ConfigItem appKey = new ConfigItem(); - appKey.setType("text"); - appKey.setName("app_key"); - appKey.setText("app_key"); - - ConfigItem appSecret = new ConfigItem(); - appSecret.setType("text"); - appSecret.setName("app_secret"); - appSecret.setText("app_secret"); - - ConfigItem merchantsId = new ConfigItem(); - merchantsId.setType("text"); - merchantsId.setName("merchants_id"); - merchantsId.setText("商户Id"); - list.add(url); - list.add(appKey); - list.add(appSecret); - list.add(merchantsId); - return list; - } - - @Override - public InstantDeliveryResultVO addStore(StoreDetailVO storeDetailVO, Map config) { - JSONArray jsonArray = new JSONArray(); - JSONObject jsonObject = new JSONObject(); - //业务类型(食品小吃-1,饮料-2,鲜花-3,文印票务-8,便利店-9,水果生鲜-13,同城电商-19, 医药-20,蛋糕-21,酒品-24,小商品市场-25,服装-26,汽修零配-27,数码-28,小龙虾-29,火锅-51,其他-5) - jsonObject.set("business", 19); - //门店地址 - jsonObject.set("station_address", storeDetailVO.getCompanyAddress()); - //联系人姓名 - jsonObject.set("contact_name", storeDetailVO.getLinkName()); - //联系人电话 - jsonObject.set("phone", storeDetailVO.getLinkPhone()); - //达达商家app账号 - jsonObject.set("username", storeDetailVO.getLinkPhone()); - //达达商家app密码 - jsonObject.set("password", "a" + storeDetailVO.getLinkPhone()); - jsonArray.add(jsonObject); - //发送请求的url - String url = StringUtils.toString(config.get("url")); - Map requestJson = getConfig(config, jsonArray.toString()); - String result = HttpUtils.doPostWithJson(url + InstantDeliveryUrl.DD_ADD_SHOP.getUrl(), requestJson); - //组织返回参数 - InstantDeliveryResultVO instantDeliveryResultVO = JSONUtil.toBean(result, InstantDeliveryResultVO.class); - Map map = (Map) instantDeliveryResultVO.getResult(); - List> successList = map.get("successList"); - if (successList.size() > 0) { - for (Map obj : successList) { - //如果成功调用店铺修改 将门店编码写入数据库 - UpdateWrapper updateWrapper = new UpdateWrapper(); - updateWrapper.in("id", storeDetailVO.getStoreId()); - updateWrapper.set("dd_code", obj.get("originStoreId").toString()); - storeDetailService.update(updateWrapper); - } - } - List> errorList = map.get("failedList"); - if (errorList != null && errorList.size() > 0) { - for (Map obj : errorList) { - throw new RuntimeException(obj.get("msg").toString()); - } - } - return instantDeliveryResultVO; - } - - @Override - public InstantDeliveryResultVO editStore(StoreDetailVO storeDetailVO, Map config) { - //如果达达code没有则不进行修改 - if (StringUtils.isEmpty(storeDetailVO.getDdCode())) { - return null; - } - JSONObject jsonObject = new JSONObject(); - //门店编号 - jsonObject.set("origin_store_id", storeDetailVO.getDdCode()); - //门店名称 -// jsonObject.put("station_name", storeDetailVO.getStoreName()); - //业务类型(食品小吃-1,饮料-2,鲜花-3,文印票务-8,便利店-9,水果生鲜-13,同城电商-19, 医药-20,蛋糕-21,酒品-24,小商品市场-25,服装-26,汽修零配-27,数码-28,小龙虾-29,火锅-51,其他-5) - jsonObject.set("business", 19); - //城市名称(如,上海) -// jsonObject.put("city_name", storeDetailVO.getCompanyCity()); - //区域名称(如,浦东新区) -// jsonObject.put("area_name", storeDetailVO.getCompanyCounty()); - //门店地址 - jsonObject.set("station_address", storeDetailVO.getCompanyAddress()); -// //门店经度 -// jsonObject.put("lng", storeDetailVO.getStoreLongitude()); -// //门店纬度 -// jsonObject.put("lat", storeDetailVO.getStoreLatitude()); - //联系人姓名 - jsonObject.set("contact_name", storeDetailVO.getLinkName()); - //联系人电话 - jsonObject.set("phone", storeDetailVO.getLinkPhone()); - if (storeDetailVO.getStoreDisable().equals(StoreStatusEnum.OPEN.value())) { - jsonObject.set("status", 1); - } else { - jsonObject.set("status", 0); - } - //发送请求的url - String url = StringUtils.toString(config.get("url")); - Map requestJson = getConfig(config, jsonObject.toString()); - String result = HttpUtils.doPostWithJson(url + InstantDeliveryUrl.DD_UPDATE_SHOP.getUrl(), requestJson); - //组织返回参数 - InstantDeliveryResultVO instantDeliveryResultVO = JSONUtil.toBean(result, InstantDeliveryResultVO.class); - if ("fail".equals(instantDeliveryResultVO.getStatus())) { - log.error("达达店铺信息修改失败",instantDeliveryResultVO.getMsg()); - } - return instantDeliveryResultVO; - } - - @Override - public InstantDeliveryResultVO getOrderDetail(String orderSn, Map config) { - JSONObject jsonObject = new JSONObject(); - jsonObject.set("order_id", orderSn); - //发送请求的url - String url = StringUtils.toString(config.get("url")); - Map requestJson = getConfig(config, jsonObject.toString()); - String result = HttpUtils.doPostWithJson(url + InstantDeliveryUrl.DD_QUERY_ORDER.getUrl(), requestJson); - //组织返回参数 - InstantDeliveryResultVO instantDeliveryResultVO = JSONUtil.toBean(result, InstantDeliveryResultVO.class); - return instantDeliveryResultVO; - } - - @Override - public InstantDeliveryResultVO orderConfirm(String orderSn, Map config) { - JSONObject jsonObject = new JSONObject(); - jsonObject.set("order_id", orderSn); - //发送请求的url - String url = StringUtils.toString(config.get("url")); - Map requstJson = getConfig(config, jsonObject.toString()); - String result = HttpUtils.doPostWithJson(url + InstantDeliveryUrl.DD_CONFIRM_ORDER.getUrl(), requstJson); - //组织返回参数 - InstantDeliveryResultVO instantDeliveryResultVO = JSONUtil.toBean(result, InstantDeliveryResultVO.class); - return instantDeliveryResultVO; - } - - @Override - public InstantDeliveryResultVO orderCandle(String orderSn, String cancelReason, Map config) { - JSONObject jsonObject = new JSONObject(); - jsonObject.set("order_id", orderSn); - jsonObject.set("cancel_reason_id", this.cancelReasonId()); - jsonObject.set("cancel_reason", cancelReason); - //发送请求的url - String url = StringUtils.toString(config.get("url")); - Map requstJson = getConfig(config, jsonObject.toString()); - String result = HttpUtils.doPostWithJson(url + InstantDeliveryUrl.DD_CANDLE_ORDER.getUrl(), requstJson); - //组织返回参数 - InstantDeliveryResultVO instantDeliveryResultVO = JSONUtil.toBean(result, InstantDeliveryResultVO.class); - return instantDeliveryResultVO; - } - - @Override - public InstantDeliveryResultVO sendReOrder(Order order, StoreDetailVO storeDetailVO, MemberAddress memberAddress, Integer type, Map config) { - JSONObject jsonObject = new JSONObject(); - //门店编号，门店创建后可在门店列表和单页查看 - jsonObject.set("store_no", storeDetailVO.getDdCode()); - //第三方订单ID - jsonObject.set("origin_id", order.getSn()); - //订单所在城市的code http://newopen.imdada.cn/#/development/file/cityList?_k=l76a7s - String city = memberAddress.getConsigneeAddressPath().substring(memberAddress.getConsigneeAddressPath().indexOf(",") + 1, memberAddress.getConsigneeAddressPath().indexOf(",", memberAddress.getConsigneeAddressPath().indexOf(",") + 1)); - jsonObject.set("city_code", this.getCityCode(city, config)); - //订单金额 - jsonObject.set("cargo_price", order.getFlowPrice()); - //是否需要垫付 1:是 0:否 (垫付订单金额，非运费) - jsonObject.set("is_prepay", 0); - //收货人姓名 - jsonObject.set("receiver_name", memberAddress.getName()); - //收货人地址 - jsonObject.set("receiver_address", memberAddress.getDetail()); - //收货人地址纬度（高德坐标系，若是其他地图经纬度需要转化成高德地图经纬度 - jsonObject.set("receiver_lat", memberAddress.getLat()); - //收货人地址经度（高德坐标系，若是其他地图经纬度需要转化成高德地图经纬度 - jsonObject.set("receiver_lng", memberAddress.getLat()); - //回调URL - //jsonObject.put("callback", domainHelper.getCallback() + "/trade/delivery/order/call-back"); - //收货人手机号（手机号和座机号必填一项） - jsonObject.set("receiver_phone", memberAddress.getMobile()); - //是否使用保价费（0：不使用保价，1：使用保价； 同时，请确保填写了订单金额（cargo_price）） - jsonObject.set("is_use_insurance", 0); - //订单重量（单位：Kg） - jsonObject.set("cargo_weight", order.getWeight()); - Map requstJson = getConfig(config, jsonObject.toString()); - //发送请求的url - String url = StringUtils.toString(config.get("url")); - String result = null; - if (type == 0) { - result = HttpUtils.doPostWithJson(url + InstantDeliveryUrl.DD_ADD_ORDER.getUrl(), requstJson); - } else { - result = HttpUtils.doPostWithJson(url + InstantDeliveryUrl.DD_RE_ADD_ORDER.getUrl(), requstJson); - } - InstantDeliveryResultVO instantDeliveryResultVO = JSONUtil.toBean(result, InstantDeliveryResultVO.class); - if ("fail".equals(instantDeliveryResultVO.getStatus())) { - log.error("达达订单发送失败，订单号为",order.getSn() + "," + instantDeliveryResultVO.getMsg()); - //如果发送失败择等待一秒重新发送，如果失败择记录日志 - try { - Thread.sleep(1000); - } catch (Exception e) { - log.error("达达订单发布失败",e); - } - result = HttpUtils.doPostWithJson(url + InstantDeliveryUrl.DD_RE_ADD_ORDER.getUrl(), requstJson); - InstantDeliveryResultVO instantDeliveryResResultVO = JSONUtil.toBean(result, InstantDeliveryResultVO.class); - if ("fail".equals(instantDeliveryResResultVO.getStatus())) { - log.error("达达订单重试发送失败，订单号为" + order.getSn() + "," + instantDeliveryResultVO.getMsg()); - } - } - return instantDeliveryResultVO; - } - - @Override - public Integer cancelReasonId() { - return 4; - } - - /** - * 达达配送统一参数整合 - * - * @param config - * @param json - * @return - */ - private Map getConfig(Map config, String json) { - //组织参数 - String appKey = StringUtils.toString(config.get("app_key")); - String appSecret = StringUtils.toString(config.get("app_secret")); - String merchantsId = StringUtils.toString(config.get("merchants_id")); - //签名发送请求 - String mysing = appSecret + "app_key" + appKey + "body" + json + "formatjsonsource_id" + merchantsId + "timestamp" + DateUtil.getDateline() + "v1.0" + appSecret; - String signature = StringUtils.md5(mysing).toUpperCase(); - Map requstJson = new HashMap<>(8); - requstJson.put("source_id", merchantsId); - requstJson.put("app_key", appKey); - requstJson.put("format", "json"); - requstJson.put("timestamp", StringUtils.toString(DateUtil.getDateline())); - requstJson.put("signature", signature); - requstJson.put("body", json); - requstJson.put("v", "1.0"); - return requstJson; - } - - /** - * 获取城市code - * - * @param cityName 城市名称 - * @return 城市编码 - */ - private String getCityCode(String cityName, Map config) { - //获取参数 - String url = StringUtils.toString(config.get("url")); - JSONObject jsonObject = new JSONObject(); - Map requstJson = getConfig(config, jsonObject.toString()); - //获取所有城市编码 - String result = HttpUtils.doPostWithJson(url + InstantDeliveryUrl.DD_CITY_CODE.getUrl(), requstJson); - InstantDeliveryResultVO resultDO = JSONUtil.toBean(result, InstantDeliveryResultVO.class); - //对数据进行格式化 - - List list = JSONUtil.toList(JSONUtil.parseArray(resultDO.getResult()), CityResult.class); - for (CityResult cityResult : list) { - if (cityName.contains(cityResult.getCityName())) { - return cityResult.getCityCode(); - } - } - //如果找不到默认哈尔滨 - return "0451"; - } - - @Override - public void callBack(Object object) { - //强制将obj转换成达达对应的参数对象 - DdOrderBackVO ddOrderBackVO = (DdOrderBackVO) object; - //数据类型转换 - InstantDeliveryLog instantDeliveryLog = new InstantDeliveryLog(ddOrderBackVO); - //保存数据 - instantDeliveryLogService.save(instantDeliveryLog); - } - -} diff --git a/framework/src/main/java/cn/lili/modules/system/entity/plugin/logistics/dada/enums/DadaOrderStatusEnum.java b/framework/src/main/java/cn/lili/modules/system/entity/plugin/logistics/dada/enums/DadaOrderStatusEnum.java deleted file mode 100644 index cde57dde..00000000 --- a/framework/src/main/java/cn/lili/modules/system/entity/plugin/logistics/dada/enums/DadaOrderStatusEnum.java +++ /dev/null @@ -1,68 +0,0 @@ -package cn.lili.modules.system.entity.plugin.logistics.dada.enums; - -import lombok.Getter; -import lombok.Setter; - -/** - * 达达配送订单状态 - * - * @author pikachu - */ -public enum DadaOrderStatusEnum { - //待接单 - WAIT_RECEIVING(1, "待接单"), - //待取货 - WAIT_PICK_UP(2, "待取货"), - //配送中 - DELIVERY_IN_PROGRESS(3, "配送中"), - //已完成 - COMPLETED(4, "已完成"), - //已取消 - CANCELLED(5, "已取消"), - //派单中 - DISTRIBUTION_LEAFLETS(8, "派单中"), - //妥投异常之物品返回中 - ABNORMAL_BACK(9, "妥投异常之物品返回中"), - //妥投异常之物品返回完成 - ABNORMAL_COMPLETED(10, "妥投异常之物品返回完成"), - //骑士到店 - TO_IN_STORE(100, "骑士到店"); - - /** - * 状态 - */ - @Setter - @Getter - private Integer status; - /** - * 状态文本 - */ - @Setter - @Getter - private String text; - - - DadaOrderStatusEnum(Integer status, String text) { - this.status = status; - this.text = text; - } - - /** - * 获取配送模版 - * @param status 状态 - * @return 配送模板 - */ - public static String getText(Integer status) { - //如果空，则直接返回 - if (status == null) { - return null; - } - //对状态枚举值进行处理 - for (DadaOrderStatusEnum dadaOrderStatusEnum : DadaOrderStatusEnum.values()) { - if (status.equals(dadaOrderStatusEnum.getStatus())) { - return dadaOrderStatusEnum.getText(); - } - } - return WAIT_RECEIVING.getText(); - } -} diff --git a/framework/src/main/java/cn/lili/modules/system/entity/plugin/logistics/dada/vo/DdOrderBackVO.java b/framework/src/main/java/cn/lili/modules/system/entity/plugin/logistics/dada/vo/DdOrderBackVO.java deleted file mode 100644 index 51980558..00000000 --- a/framework/src/main/java/cn/lili/modules/system/entity/plugin/logistics/dada/vo/DdOrderBackVO.java +++ /dev/null @@ -1,50 +0,0 @@ -package cn.lili.modules.system.entity.plugin.logistics.dada.vo; - -import com.fasterxml.jackson.databind.PropertyNamingStrategy; -import com.fasterxml.jackson.databind.annotation.JsonNaming; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.ToString; - -/** - * @author 86133 - * @description: pikachu - * @since 2020/9/1215:35 - */ -@ApiModel(description = "达达订单回调参数") -@Data -@ToString -@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class) -public class DdOrderBackVO { - @ApiModelProperty(value = "达达运单号", required = false) - private String clientId; - - @ApiModelProperty(value = "交易编号", required = true) - private String orderId; - - @ApiModelProperty(value = "订单状态 待接单＝1,待取货＝2,配送中＝3,已完成＝4,已取消＝5, 指派单=8,妥投异常之物品返回中=9, 妥投异常之物品返回完成=10, 骑士到店=100,创建达达运单失败=1000", required = true) - private Integer orderStatus; - - @ApiModelProperty(value = "订单取消原因,其他状态下默认值为空字符串", required = true) - private String cancelReason; - - @ApiModelProperty(value = "订单取消原因来源(1:达达配送员取消；2:商家主动取消；3:系统或客服取消；0:默认值)", required = true) - private Integer cancelFrom; - - @ApiModelProperty(value = "更新时间", required = true) - private Long updateTime; - - @ApiModelProperty(value = "加密串", required = true) - private String signature; - - @ApiModelProperty(value = "达达配送员id，接单以后会传", required = false) - private Integer dmId; - - @ApiModelProperty(value = "配送员姓名，接单以后会传", required = false) - private String dmName; - - @ApiModelProperty(value = "配送员手机号，接单以后会传", required = false) - private String dmMobile; - -} diff --git a/framework/src/main/java/cn/lili/modules/system/entity/vo/InstantDeliveryResultVO.java b/framework/src/main/java/cn/lili/modules/system/entity/vo/InstantDeliveryResultVO.java deleted file mode 100644 index b9542c24..00000000 --- a/framework/src/main/java/cn/lili/modules/system/entity/vo/InstantDeliveryResultVO.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.lili.modules.system.entity.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 达达返回值 - * - * @author Chopper - * @since 2020/9/12 14:05 - */ -@ApiModel -@Data -public class InstantDeliveryResultVO { - @ApiModelProperty(value = "响应状态，成功为success，失败为fail", required = false) - private String status; - @ApiModelProperty(value = "响应返回码， 0 成功 其他失败", required = false) - private Integer code; - @ApiModelProperty(value = "响应描述", required = false) - private String msg; - @ApiModelProperty(value = "响应结果", required = false) - private Object result; -} diff --git a/framework/src/main/java/cn/lili/modules/system/entity/vo/InstantDeliveryVO.java b/framework/src/main/java/cn/lili/modules/system/entity/vo/InstantDeliveryVO.java deleted file mode 100644 index b964b040..00000000 --- a/framework/src/main/java/cn/lili/modules/system/entity/vo/InstantDeliveryVO.java +++ /dev/null @@ -1,64 +0,0 @@ -package cn.lili.modules.system.entity.vo; - - -import cn.lili.modules.system.entity.dos.InstantDelivery; -import cn.lili.modules.system.entity.plugin.ConfigItem; -import cn.lili.modules.system.entity.plugin.logistics.InstantDeliveryPlugin; -import com.google.common.reflect.TypeToken; -import com.google.gson.Gson; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - -/** - * 即时配送VO - * - * @author pikachu - * @since 2020/12/01 15:58 - */ -@Data -@ApiModel(value = "即时配送VO") -@AllArgsConstructor -@NoArgsConstructor -public class InstantDeliveryVO extends InstantDelivery { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "即时配送配置项", required = true) - private List configItems; - /** - * 构建新的vo参数 - * - * @param instantDelivery - */ - public InstantDeliveryVO(InstantDelivery instantDelivery) { - this.setCreateTime(instantDelivery.getCreateTime()); - this.setDeleteFlag(instantDelivery.getDeleteFlag()); - this.setId(instantDelivery.getId()); - this.setDeliveryName(instantDelivery.getDeliveryName()); - this.setDeliveryOpen(instantDelivery.getDeliveryOpen()); - this.setDeliveryBean(instantDelivery.getDeliveryBean()); - this.setImages(instantDelivery.getImages()); - Gson gson = new Gson(); - this.setConfigItems(gson.fromJson(instantDelivery.getDeliveryConfig(), new TypeToken>() { - }.getType())); - } - - /** - * 根据插件构建默认参数 - * - * @param instantDeliveryPlugin - */ - public InstantDeliveryVO(InstantDeliveryPlugin instantDeliveryPlugin) { - this.setId("0"); - this.setDeliveryName(instantDeliveryPlugin.getPluginName()); - this.setDeliveryOpen(instantDeliveryPlugin.getOpen()); - this.setDeliveryBean(instantDeliveryPlugin.getPluginId()); - this.setConfigItems(instantDeliveryPlugin.getDefaultConfigItem()); - } - -} \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/system/mapper/InstantDeliveryLogMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/InstantDeliveryLogMapper.java deleted file mode 100644 index 05b7d3ab..00000000 --- a/framework/src/main/java/cn/lili/modules/system/mapper/InstantDeliveryLogMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.lili.modules.system.mapper; - -import cn.lili.modules.system.entity.dos.InstantDeliveryLog; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * 即时配送日志数据处理层 - * - * @author pikachu - * @since 2020/11/17 8:01 下午 - */ -public interface InstantDeliveryLogMapper extends BaseMapper { - -} \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/system/mapper/InstantDeliveryMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/InstantDeliveryMapper.java deleted file mode 100644 index 6c71025b..00000000 --- a/framework/src/main/java/cn/lili/modules/system/mapper/InstantDeliveryMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.lili.modules.system.mapper; - -import cn.lili.modules.system.entity.dos.InstantDelivery; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * 即时配送数据处理层 - * - * @author pikachu - * @since 2020/11/17 8:01 下午 - */ -public interface InstantDeliveryMapper extends BaseMapper { - -} \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/system/mapper/VerificationSourceMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/VerificationSourceMapper.java index f11b3bde..3a87e8c2 100644 --- a/framework/src/main/java/cn/lili/modules/system/mapper/VerificationSourceMapper.java +++ b/framework/src/main/java/cn/lili/modules/system/mapper/VerificationSourceMapper.java @@ -1,6 +1,6 @@ package cn.lili.modules.system.mapper; -import cn.lili.modules.system.entity.dos.VerificationSource; +import cn.lili.modules.verification.entity.dos.VerificationSource; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/framework/src/main/java/cn/lili/modules/system/service/InstantDeliveryLogService.java b/framework/src/main/java/cn/lili/modules/system/service/InstantDeliveryLogService.java deleted file mode 100644 index 45fd3c26..00000000 --- a/framework/src/main/java/cn/lili/modules/system/service/InstantDeliveryLogService.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.lili.modules.system.service; - -import cn.lili.modules.system.entity.dos.InstantDeliveryLog; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * 即时配送日志业务层 - * - * @author Chopper - * @since 2020/11/17 8:02 下午 - */ -public interface InstantDeliveryLogService extends IService { - - -} \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/system/service/InstantDeliveryService.java b/framework/src/main/java/cn/lili/modules/system/service/InstantDeliveryService.java deleted file mode 100644 index e0b5d9d9..00000000 --- a/framework/src/main/java/cn/lili/modules/system/service/InstantDeliveryService.java +++ /dev/null @@ -1,50 +0,0 @@ -package cn.lili.modules.system.service; - -import cn.lili.common.vo.PageVO; -import cn.lili.modules.system.entity.dos.InstantDelivery; -import cn.lili.modules.system.entity.vo.InstantDeliveryVO; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * 即时配送业务层 - * - * @author Chopper - * @since 2020/11/17 8:02 下午 - */ -public interface InstantDeliveryService extends IService { - - /** - * 获取即时配送方案 - * - * @param page 数据库即时配送方案 - * @param pageVO 分页数据 - * @return - */ - IPage getInstantDeliveryPage(IPage page, PageVO pageVO); - - /** - * 根据beanId查询即时配送方案 - * - * @param bean beanId - * @return - */ - InstantDeliveryVO getInstantDeliveryConfig(String bean); - - /** - * 开启某一个即时配送方案 - * - * @param bean bean - * @return - */ - void openInstantDelivery(String bean); - - /** - * 修改即时配送方案 - * - * @param instantDeliveryVO 即时配送方案 - * @return - */ - InstantDeliveryVO edit(InstantDeliveryVO instantDeliveryVO); - -} \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryLogServiceImpl.java deleted file mode 100644 index 3bf4ec01..00000000 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryLogServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.lili.modules.system.serviceimpl; - -import cn.lili.modules.system.entity.dos.InstantDeliveryLog; -import cn.lili.modules.system.mapper.InstantDeliveryLogMapper; -import cn.lili.modules.system.service.InstantDeliveryLogService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * 即时配送业务层实现 - * - * @author Chopper - * @since 2020/11/17 8:02 下午 - */ -@Service -public class InstantDeliveryLogServiceImpl extends ServiceImpl implements InstantDeliveryLogService { - -} \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryServiceImpl.java deleted file mode 100644 index 621866b0..00000000 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryServiceImpl.java +++ /dev/null @@ -1,124 +0,0 @@ -package cn.lili.modules.system.serviceimpl; - -import cn.lili.mybatis.util.PageUtil; -import cn.lili.common.vo.PageVO; -import cn.lili.modules.system.entity.dos.InstantDelivery; -import cn.lili.modules.system.entity.plugin.logistics.InstantDeliveryPlugin; -import cn.lili.modules.system.entity.vo.InstantDeliveryVO; -import cn.lili.modules.system.mapper.InstantDeliveryMapper; -import cn.lili.modules.system.service.InstantDeliveryService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.google.gson.Gson; -import org.elasticsearch.ResourceNotFoundException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 即时配送业务层实现 - * - * @author pikachu - * @since 2020/11/17 8:02 下午 - */ -@Service -@Transactional(rollbackFor = Exception.class) -public class InstantDeliveryServiceImpl extends ServiceImpl implements InstantDeliveryService { - - @Autowired - private List instantDeliveryPlugins; - - @Override - public IPage getInstantDeliveryPage(IPage page, PageVO pageVO) { - //获取插件和数据库中所有的就是配送方案 - List resultList = this.getInstantDeliveryVOList(page); - //循环数据，对未入库的数据进行入库操作 - for (InstantDeliveryVO instantDeliveryVO : resultList) { - //根据id是否为0校验 如果为0则不在数据中，进行入库操作 - if (("0").equals(instantDeliveryVO.getId())) { - //入库 - InstantDelivery instantDelivery = new InstantDelivery(instantDeliveryVO); - this.baseMapper.insert(instantDelivery); - } - } - IPage iPage = new Page<>(pageVO.getPageNumber(), pageVO.getPageSize(), resultList.size()); - iPage.setRecords(PageUtil.listToPage(pageVO, resultList)); - return iPage; - } - - /** - * 获取即时配送的方案 - * - * @return 即时配送 - */ - private List getInstantDeliveryVOList(IPage page) { - //用来构建新的即时配送数据 - List resultList = new ArrayList<>(); - //获取即时配送数据 - List list = page.getRecords(); - Map map = new HashMap<>(16); - for (InstantDelivery instantDelivery : list) { - map.put(instantDelivery.getDeliveryBean(), instantDelivery); - } - //循环检查是否有新的即时配送方式，识别插入数据库 - for (InstantDeliveryPlugin plugin : instantDeliveryPlugins) { - InstantDelivery instantDelivery = map.get(plugin.getPluginId()); - InstantDeliveryVO result; - //如果不为空则构建vo参数，否则的话根据插件属性构建vo参数 - if (instantDelivery != null) { - result = new InstantDeliveryVO(instantDelivery); - } else { - result = new InstantDeliveryVO(plugin); - } - resultList.add(result); - } - return resultList; - } - - - @Override - public InstantDeliveryVO getInstantDeliveryConfig(String bean) { - //根据bean获取即时配送方案 - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("delivery_bean", bean); - InstantDelivery instantDelivery = this.baseMapper.selectOne(queryWrapper); - if (instantDelivery == null) { - throw new ResourceNotFoundException("该即时配送方案不存在"); - } - return new InstantDeliveryVO(instantDelivery); - } - - @Override - public void openInstantDelivery(String bean) { - //关闭所有配送方案 - UpdateWrapper updateWrapper = new UpdateWrapper(); - updateWrapper.set("delivery_open", 0); - this.update(updateWrapper); - //开启当前配送方案 - updateWrapper = new UpdateWrapper(); - updateWrapper.eq("delivery_bean", bean); - updateWrapper.set("delivery_open", 1); - this.update(updateWrapper); - } - - @Override - public InstantDeliveryVO edit(InstantDeliveryVO instantDeliveryVO) { - //校验此方案是否存在 - this.getInstantDeliveryConfig(instantDeliveryVO.getDeliveryBean()); - //修改即时配送方案 - Gson gson = new Gson(); - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set("delivery_config", gson.toJson(instantDeliveryVO.getConfigItems())); - updateWrapper.eq("delivery_bean", instantDeliveryVO.getDeliveryBean()); - this.update(updateWrapper); - return instantDeliveryVO; - } -} \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java b/framework/src/main/java/cn/lili/modules/verification/entity/dos/VerificationSource.java similarity index 86% rename from framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java rename to framework/src/main/java/cn/lili/modules/verification/entity/dos/VerificationSource.java index 975665d6..affce14c 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java +++ b/framework/src/main/java/cn/lili/modules/verification/entity/dos/VerificationSource.java @@ -1,7 +1,7 @@ -package cn.lili.modules.system.entity.dos; +package cn.lili.modules.verification.entity.dos; import cn.lili.mybatis.BaseEntity; -import cn.lili.modules.system.entity.enums.VerificationSourceEnum; +import cn.lili.modules.verification.entity.enums.VerificationSourceEnum; 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/system/entity/vo/VerificationDTO.java b/framework/src/main/java/cn/lili/modules/verification/entity/dto/VerificationDTO.java similarity index 77% rename from framework/src/main/java/cn/lili/modules/system/entity/vo/VerificationDTO.java rename to framework/src/main/java/cn/lili/modules/verification/entity/dto/VerificationDTO.java index bb29b8cc..65b2f2f9 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/vo/VerificationDTO.java +++ b/framework/src/main/java/cn/lili/modules/verification/entity/dto/VerificationDTO.java @@ -1,6 +1,6 @@ -package cn.lili.modules.system.entity.vo; +package cn.lili.modules.verification.entity.dto; -import cn.lili.modules.system.entity.dos.VerificationSource; +import cn.lili.modules.verification.entity.dos.VerificationSource; import lombok.Data; import java.io.Serializable; diff --git a/framework/src/main/java/cn/lili/modules/system/entity/enums/VerificationSourceEnum.java b/framework/src/main/java/cn/lili/modules/verification/entity/enums/VerificationSourceEnum.java similarity index 87% rename from framework/src/main/java/cn/lili/modules/system/entity/enums/VerificationSourceEnum.java rename to framework/src/main/java/cn/lili/modules/verification/entity/enums/VerificationSourceEnum.java index 43617de3..0994c089 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/enums/VerificationSourceEnum.java +++ b/framework/src/main/java/cn/lili/modules/verification/entity/enums/VerificationSourceEnum.java @@ -1,4 +1,4 @@ -package cn.lili.modules.system.entity.enums; +package cn.lili.modules.verification.entity.enums; /** diff --git a/framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java b/framework/src/main/java/cn/lili/modules/verification/service/VerificationSourceService.java similarity index 76% rename from framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java rename to framework/src/main/java/cn/lili/modules/verification/service/VerificationSourceService.java index cde7dfe8..32946b21 100644 --- a/framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java +++ b/framework/src/main/java/cn/lili/modules/verification/service/VerificationSourceService.java @@ -1,8 +1,8 @@ -package cn.lili.modules.system.service; +package cn.lili.modules.verification.service; import cn.lili.cache.CachePrefix; -import cn.lili.modules.system.entity.dos.VerificationSource; -import cn.lili.modules.system.entity.vo.VerificationDTO; +import cn.lili.modules.verification.entity.dos.VerificationSource; +import cn.lili.modules.verification.entity.dto.VerificationDTO; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java b/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java index 11652061..c5449bc6 100644 --- a/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java @@ -7,9 +7,9 @@ import cn.lili.common.exception.ServiceException; import cn.lili.common.properties.VerificationCodeProperties; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.SerializableStream; -import cn.lili.modules.system.entity.dos.VerificationSource; -import cn.lili.modules.system.entity.vo.VerificationDTO; -import cn.lili.modules.system.service.VerificationSourceService; +import cn.lili.modules.verification.entity.dos.VerificationSource; +import cn.lili.modules.verification.entity.dto.VerificationDTO; +import cn.lili.modules.verification.service.VerificationSourceService; import cn.lili.modules.verification.SliderImageUtil; import cn.lili.modules.verification.enums.VerificationEnums; import cn.lili.modules.verification.service.VerificationService; diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java b/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationSourceServiceImpl.java similarity index 85% rename from framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java rename to framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationSourceServiceImpl.java index 516ffe38..003ae352 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationSourceServiceImpl.java @@ -1,11 +1,11 @@ -package cn.lili.modules.system.serviceimpl; +package cn.lili.modules.verification.service.impl; import cn.lili.cache.Cache; -import cn.lili.modules.system.entity.dos.VerificationSource; -import cn.lili.modules.system.entity.enums.VerificationSourceEnum; -import cn.lili.modules.system.entity.vo.VerificationDTO; +import cn.lili.modules.verification.entity.dos.VerificationSource; +import cn.lili.modules.verification.entity.enums.VerificationSourceEnum; +import cn.lili.modules.verification.entity.dto.VerificationDTO; import cn.lili.modules.system.mapper.VerificationSourceMapper; -import cn.lili.modules.system.service.VerificationSourceService; +import cn.lili.modules.verification.service.VerificationSourceService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java b/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java index 133aeae3..15ea88f4 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java @@ -5,8 +5,8 @@ import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; import cn.lili.modules.system.aspect.annotation.DemoSite; -import cn.lili.modules.system.entity.dos.VerificationSource; -import cn.lili.modules.system.service.VerificationSourceService; +import cn.lili.modules.verification.entity.dos.VerificationSource; +import cn.lili.modules.verification.service.VerificationSourceService; import cn.lili.mybatis.util.PageUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java deleted file mode 100644 index f01e2d92..00000000 --- a/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java +++ /dev/null @@ -1,90 +0,0 @@ -package cn.lili.controller.setting; - -import cn.lili.common.enums.ResultUtil; -import cn.lili.common.vo.PageVO; -import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.system.entity.dos.InstantDelivery; -import cn.lili.modules.system.entity.plugin.ConfigItem; -import cn.lili.modules.system.entity.vo.InstantDeliveryVO; -import cn.lili.modules.system.service.InstantDeliveryService; -import cn.lili.mybatis.util.PageUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 管理端,即时配送接口 - * - * @author pikachu - * @since 2020/11/17 7:56 下午 - */ -@RestController -@Api(tags = "管理端,即时配送接口") -@RequestMapping("/manager/instant-delivery") -public class InstantDeliveryManagerController { - @Autowired - private InstantDeliveryService instantDeliveryService; - - @GetMapping(value = "/getByPage") - @ApiOperation(value = "分页获取") - public ResultMessage> getByPage(PageVO page) { - //查询数据 - IPage data = instantDeliveryService.page(PageUtil.initPage(page)); - //组织数据结构 - IPage newData = instantDeliveryService.getInstantDeliveryPage(data, page); - //返回数据 - return ResultUtil.data(newData); - } - - @ApiOperation(value = "修改即时配送方案参数", response = InstantDeliveryVO.class) - @PutMapping(value = "/{bean}/config") - @ApiImplicitParams({ - @ApiImplicitParam(name = "bean", value = "即时配送bean", required = true, dataType = "String", paramType = "path"), - @ApiImplicitParam(name = "config", value = "即时配送参数", required = true, dataType = "String", paramType = "body") - }) - public ResultMessage edit(@PathVariable String bean, @RequestBody List config) { - InstantDeliveryVO instantDeliveryVO = new InstantDeliveryVO(); - instantDeliveryVO.setDeliveryBean(bean); - instantDeliveryVO.setConfigItems(config); - return ResultUtil.data(this.instantDeliveryService.edit(instantDeliveryVO)); - } - - @ApiOperation(value = "获取即时配送的配置", response = InstantDeliveryVO.class) - @GetMapping("/{bean}") - @ApiImplicitParam(name = "bean", value = "即时配送bean id", required = true, dataType = "String", paramType = "path") - public ResultMessage getInstantDeliverySetting(@PathVariable String bean) { - return ResultUtil.data(this.instantDeliveryService.getInstantDeliveryConfig(bean)); - } - - - @ApiOperation(value = "开启即时配送方案", response = String.class) - @PutMapping("/{bean}/open") - @ApiImplicitParam(name = "bean", value = "bean", required = true, dataType = "String", paramType = "path") - public ResultMessage open(@PathVariable String bean) { - this.instantDeliveryService.openInstantDelivery(bean); - return ResultUtil.success(); - } - - - @ApiOperation(value = "修改封面图片", response = String.class) - @PutMapping("/{bean}/image") - @ApiImplicitParams({ - @ApiImplicitParam(name = "bean", value = "即时配送bean", required = true, dataType = "String", paramType = "path"), - @ApiImplicitParam(name = "images", value = "封面图片", required = true, dataType = "String", paramType = "query") - }) - public ResultMessage open(@PathVariable String bean, String images) { - InstantDelivery instantDelivery = this.instantDeliveryService.getOne(new QueryWrapper().eq("delivery_bean", bean)); - if (instantDelivery != null) { - instantDelivery.setImages(images); - return ResultUtil.data(instantDeliveryService.updateById(instantDelivery)); - } - return ResultUtil.data(false); - } -} diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java index 25a144e6..21325245 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java @@ -2,9 +2,9 @@ package cn.lili.controller.statistics; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.statistics.model.dto.GoodsStatisticsQueryParam; -import cn.lili.modules.statistics.model.vo.CategoryStatisticsDataVO; -import cn.lili.modules.statistics.model.vo.GoodsStatisticsDataVO; +import cn.lili.modules.statistics.entity.dto.GoodsStatisticsQueryParam; +import cn.lili.modules.statistics.entity.vo.CategoryStatisticsDataVO; +import cn.lili.modules.statistics.entity.vo.GoodsStatisticsDataVO; import cn.lili.modules.statistics.service.GoodsStatisticsDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java index f663344b..7ee8eef8 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java @@ -2,13 +2,13 @@ package cn.lili.controller.statistics; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.statistics.model.dto.GoodsStatisticsQueryParam; -import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; -import cn.lili.modules.statistics.model.enums.StatisticsQuery; -import cn.lili.modules.statistics.model.vo.GoodsStatisticsDataVO; -import cn.lili.modules.statistics.model.vo.IndexNoticeVO; -import cn.lili.modules.statistics.model.vo.IndexStatisticsVO; -import cn.lili.modules.statistics.model.vo.StoreStatisticsDataVO; +import cn.lili.modules.statistics.entity.dto.GoodsStatisticsQueryParam; +import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; +import cn.lili.modules.statistics.entity.enums.StatisticsQuery; +import cn.lili.modules.statistics.entity.vo.GoodsStatisticsDataVO; +import cn.lili.modules.statistics.entity.vo.IndexNoticeVO; +import cn.lili.modules.statistics.entity.vo.IndexStatisticsVO; +import cn.lili.modules.statistics.entity.vo.StoreStatisticsDataVO; import cn.lili.modules.statistics.service.IndexStatisticsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java index 234018ef..84af4758 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java @@ -2,8 +2,8 @@ package cn.lili.controller.statistics; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.statistics.model.dos.MemberStatisticsData; -import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; +import cn.lili.modules.statistics.entity.dos.MemberStatisticsData; +import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; import cn.lili.modules.statistics.service.MemberStatisticsDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java index a6d3128c..de151751 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java @@ -7,9 +7,9 @@ import cn.lili.modules.order.order.entity.dos.AfterSale; import cn.lili.modules.order.order.entity.vo.OrderSimpleVO; import cn.lili.modules.order.order.service.AfterSaleService; import cn.lili.modules.order.order.service.OrderService; -import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; -import cn.lili.modules.statistics.model.vo.OrderOverviewVO; -import cn.lili.modules.statistics.model.vo.OrderStatisticsDataVO; +import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; +import cn.lili.modules.statistics.entity.vo.OrderOverviewVO; +import cn.lili.modules.statistics.entity.vo.OrderStatisticsDataVO; import cn.lili.modules.statistics.service.OrderStatisticsDataService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java index 52cfe67c..36dab0da 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java @@ -3,8 +3,8 @@ package cn.lili.controller.statistics; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; -import cn.lili.modules.statistics.model.vo.RefundOrderStatisticsDataVO; +import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; +import cn.lili.modules.statistics.entity.vo.RefundOrderStatisticsDataVO; import cn.lili.modules.statistics.service.RefundOrderStatisticsService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java index 78e09198..67847cce 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java @@ -3,9 +3,9 @@ package cn.lili.controller.statistics; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.vo.MemberDistributionVO; -import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; -import cn.lili.modules.statistics.model.vo.OnlineMemberVO; -import cn.lili.modules.statistics.model.vo.PlatformViewVO; +import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; +import cn.lili.modules.statistics.entity.vo.OnlineMemberVO; +import cn.lili.modules.statistics.entity.vo.PlatformViewVO; import cn.lili.modules.statistics.service.PlatformViewDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java index 39006872..e89475e7 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java @@ -3,8 +3,8 @@ package cn.lili.controller.statistics; import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.context.UserContext; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.statistics.model.dto.GoodsStatisticsQueryParam; -import cn.lili.modules.statistics.model.vo.GoodsStatisticsDataVO; +import cn.lili.modules.statistics.entity.dto.GoodsStatisticsQueryParam; +import cn.lili.modules.statistics.entity.vo.GoodsStatisticsDataVO; import cn.lili.modules.statistics.service.GoodsStatisticsDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java index 56cf0bfc..8187062b 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java @@ -3,9 +3,9 @@ package cn.lili.controller.statistics; import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.context.UserContext; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.statistics.model.dto.GoodsStatisticsQueryParam; -import cn.lili.modules.statistics.model.vo.GoodsStatisticsDataVO; -import cn.lili.modules.statistics.model.vo.StoreIndexStatisticsVO; +import cn.lili.modules.statistics.entity.dto.GoodsStatisticsQueryParam; +import cn.lili.modules.statistics.entity.vo.GoodsStatisticsDataVO; +import cn.lili.modules.statistics.entity.vo.StoreIndexStatisticsVO; import cn.lili.modules.statistics.service.GoodsStatisticsDataService; import cn.lili.modules.statistics.service.IndexStatisticsService; import io.swagger.annotations.Api; diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java index 7353f7bb..1875ac11 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java @@ -8,9 +8,9 @@ import cn.lili.modules.order.order.entity.dos.AfterSale; import cn.lili.modules.order.order.entity.vo.OrderSimpleVO; import cn.lili.modules.order.order.service.AfterSaleService; import cn.lili.modules.order.order.service.OrderService; -import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; -import cn.lili.modules.statistics.model.vo.OrderOverviewVO; -import cn.lili.modules.statistics.model.vo.OrderStatisticsDataVO; +import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; +import cn.lili.modules.statistics.entity.vo.OrderOverviewVO; +import cn.lili.modules.statistics.entity.vo.OrderStatisticsDataVO; import cn.lili.modules.statistics.service.OrderStatisticsDataService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java index 479c32ff..0619e9bd 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java @@ -4,8 +4,8 @@ import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.context.UserContext; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; -import cn.lili.modules.statistics.model.vo.RefundOrderStatisticsDataVO; +import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; +import cn.lili.modules.statistics.entity.vo.RefundOrderStatisticsDataVO; import cn.lili.modules.statistics.service.RefundOrderStatisticsService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java index 3e1128c6..6ecd7480 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java @@ -3,8 +3,8 @@ package cn.lili.controller.statistics; import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.context.UserContext; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; -import cn.lili.modules.statistics.model.vo.PlatformViewVO; +import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; +import cn.lili.modules.statistics.entity.vo.PlatformViewVO; import cn.lili.modules.statistics.service.PlatformViewDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation;