backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加打票机测试

Browse Source
This commit is contained in:
panjj 2024-10-26 20:16:13 +08:00
parent ae356158e7
commit 4a6ee191dd
383 changed files with 53714 additions and 51654 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
mall-account/target/classes/bootstrap-local.yml
View File

@ -1,111 +0,0 @@
spring:
datasource:
url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull
username: fafamall
password: brCnv0qLt8s0VqhI
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
async-init: true
initial-size: 5
max-active: 20
min-idle: 5
max-wait: 60000
validationQuery: SELECT 1
test-while-idle: true
test-on-borrow: false
test-on-return: false
pool-prepared-statements: true
max-pool-prepared-statement-per-connection-size: 20
filters: stat,wall,slf4j
filter:
stat:
enabled: true
db-type: mysql
log-slow-sql: true
slow-sql-millis: 10
aop-patterns: com.suisung.mall.common.service.impl.*,com.suisung.mall.core.web.service.impl.*,com.suisung.mall.account.*
redis:
host: @redis.host@ # Redis服务器地址
database: @redis.database@ # Redis数据库索引（默认为0）
port: @redis.port@ # Redis服务器连接端口
password: @redis.password@ # Redis服务器连接密码（默认为空）
timeout: 3000ms # 连接超时时间（毫秒）
lettuce:
pool:
max-active: 64
max-wait: -1ms
max-idle: 64
min-idle: 0
rabbitmq:
host: @rabbitmq.host@
port: @rabbitmq.port@
virtual-host: @rabbitmq.virtual-host@
listener:
simple:
acknowledge-mode: manual #手动确认消息，不使用默认的消费端确认
username: @rabbitmq.username@
password: @rabbitmq.password@
cloud:
nacos:
discovery:
server-addr: @nacos.server.address@
config:
server-addr: @nacos.server.address@
file-extension: yaml
sentinel:
transport:
dashboard: @sentinel.transport.dashboard@
eager: true
seata:
# 开启自动装配
enabled: true
# 本客户端的微服务名称
application-id: mall-account
data-source-proxy-mode: AT
# 读取哪个事务分组
# 例如此时会读取 SEATA_GROUP 这个分组下的 service.vgroupMapping.my_test_tx_group 这个属性的值。从上面的配置可以知道笔者此处的最终值为 testCluster。后面程序运行会找到 testCluster 这个集群的seata服务端，进行通讯。
tx-service-group: @seata.tx-service-group@
enable-auto-data-source-proxy: true
registry:
type: nacos
nacos:
server-addr: @nacos.server.address@
group: @seata.group@
username: @nacos.username@
password: @nacos.password@
config:
type: nacos
nacos:
server-addr: @nacos.server.address@
group: @seata.group@
username: @nacos.username@
password: @nacos.password@
service:
vgroup-mapping:
my_test_tx_group: default
# 控制台日志信息
logging:
level:
com:
suisung:
mall:
account:
mapper: debug
sun:
mail: error
baomidou: error
alibaba:
cloud:
seata: error
nacos:
client:
naming: error
config: error
netflix: error
org: error
io: error
reactor: error
springfox: error
logstash:
host: @logstash.host@

2
mall-account/target/classes/bootstrap.yml
View File

@ -1,6 +1,6 @@
spring:
profiles:
active: local
active: dev
application:
name: mall-account
jackson:

81
mall-admin/target/classes/bootstrap-local.yml
View File

@ -1,81 +0,0 @@
spring:
resources: # 配置静态文件路径
static-locations: file:D:/wwwroot/mall/public/static/ # 本地环境静态文件路径
mvc:
static-path-pattern: /admin/static/**
datasource:
url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=CONVERT_TO_NULL
username: fafamall
password: brCnv0qLt8s0VqhI
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
async-init: true
initial-size: 5
max-active: 20
min-idle: 5
max-wait: 60000
validationQuery: SELECT 1
test-while-idle: true
test-on-borrow: false
test-on-return: false
pool-prepared-statements: true
max-pool-prepared-statement-per-connection-size: 20
filters: stat,wall,slf4j
filter:
stat:
enabled: true
db-type: mysql
log-slow-sql: true
slow-sql-millis: 10
aop-patterns: com.suisung.mall.common.service.impl.*,com.suisung.mall.core.web.service.impl.*,com.suisung.mall.admin.*
redis:
host: @redis.host@ # Redis服务器地址
database: @redis.database@ # Redis数据库索引（默认为0）
port: @redis.port@ # Redis服务器连接端口
password: @redis.password@ # Redis服务器连接密码（默认为空）
timeout: 3000ms # 连接超时时间（毫秒）
lettuce:
pool:
max-active: 64
max-wait: -1ms
max-idle: 64
min-idle: 0
cloud:
nacos:
discovery:
server-addr: @nacos.server.address@
config:
server-addr: @nacos.server.address@
file-extension: yaml
sentinel:
transport:
dashboard: @sentinel.transport.dashboard@
eager: true
upload: # 图片上传配置
filepath: @upload.filepath@ # 本地环境静态文件路径
# 控制台日志信息
logging:
level:
com:
suisung:
mall:
admin:
mapper: debug
sun:
mail: error
baomidou: error
alibaba:
cloud:
seata: error
nacos:
client:
naming: error
config: error
netflix: error
org: error
io: error
reactor: error
springfox: error
logstash:
host: @logstash.host@

2
mall-admin/target/classes/bootstrap.yml
View File

@ -1,6 +1,6 @@
spring:
profiles:
active: local
active: dev
application:
name: mall-admin
jackson:

8
mall-auth/target/classes/bootstrap-dev.yml
View File

@ -2,13 +2,13 @@ spring:
cloud:
nacos:
discovery:
server-addr: @nacos.server.address@
server-addr: 114.132.210.208:8848
config:
server-addr: @nacos.server.address@
server-addr: 114.132.210.208:8848
file-extension: yaml
sentinel:
transport:
dashboard: @sentinel.transport.dashboard@
dashboard: 114.132.210.208:8718
eager: true
# 控制台日志信息
logging:
@ -25,4 +25,4 @@ logging:
config: error
netflix: error
logstash:
host: @logstash.host@
host: 114.132.210.208

8
mall-auth/target/classes/bootstrap-local.yml
View File

@ -2,13 +2,13 @@ spring:
cloud:
nacos:
discovery:
server-addr: @nacos.server.address@
server-addr: 114.132.210.208:8848
config:
server-addr: @nacos.server.address@
server-addr: 114.132.210.208:8848
file-extension: yaml
sentinel:
transport:
dashboard: @sentinel.transport.dashboard@
dashboard: 114.132.210.208:8718
eager: true
# 控制台日志信息
logging:
@ -25,4 +25,4 @@ logging:
config: error
netflix: error
logstash:
host: @logstash.host@
host: 114.132.210.208

8
mall-auth/target/classes/bootstrap-prod.yml
View File

@ -2,13 +2,13 @@ spring:
cloud:
nacos:
discovery:
server-addr: @nacos.server.address@
server-addr: 114.132.210.208:8848
config:
server-addr: @nacos.server.address@
server-addr: 114.132.210.208:8848
file-extension: yaml
sentinel:
transport:
dashboard: @sentinel.transport.dashboard@
dashboard: 114.132.210.208:8718
eager: true
# 控制台日志信息
logging:
@ -25,4 +25,4 @@ logging:
config: error
netflix: error
logstash:
host: @logstash.host@
host: 114.132.210.208

8
mall-auth/target/classes/bootstrap-test.yml
View File

@ -2,13 +2,13 @@ spring:
cloud:
nacos:
discovery:
server-addr: @nacos.server.address@
server-addr: 114.132.210.208:8848
config:
server-addr: @nacos.server.address@
server-addr: 114.132.210.208:8848
file-extension: yaml
sentinel:
transport:
dashboard: @sentinel.transport.dashboard@
dashboard: 114.132.210.208:8718
eager: true
# 控制台日志信息
logging:
@ -25,4 +25,4 @@ logging:
config: error
netflix: error
logstash:
host: @logstash.host@
host: 114.132.210.208

8
mall-auth/target/classes/bootstrap-uat.yml
View File

@ -2,13 +2,13 @@ spring:
cloud:
nacos:
discovery:
server-addr: @nacos.server.address@
server-addr: 114.132.210.208:8848
config:
server-addr: @nacos.server.address@
server-addr: 114.132.210.208:8848
file-extension: yaml
sentinel:
transport:
dashboard: @sentinel.transport.dashboard@
dashboard: 114.132.210.208:8718
eager: true
# 控制台日志信息
logging:
@ -25,4 +25,4 @@ logging:
config: error
netflix: error
logstash:
host: @logstash.host@
host: 114.132.210.208

2
mall-auth/target/classes/bootstrap.yml
View File

@ -1,6 +1,6 @@
spring:
profiles:
active: local
active: dev
application:
name: mall-auth
jackson:

75
mall-cms/target/classes/bootstrap-local.yml
View File

@ -1,75 +0,0 @@
spring:
datasource:
url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username: fafamall
password: brCnv0qLt8s0VqhI
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
async-init: true
initial-size: 5
max-active: 20
min-idle: 5
max-wait: 60000
validationQuery: SELECT 1
test-while-idle: true
test-on-borrow: false
test-on-return: false
pool-prepared-statements: true
max-pool-prepared-statement-per-connection-size: 20
filters: stat,wall,slf4j
filter:
stat:
enabled: true
db-type: mysql
log-slow-sql: true
slow-sql-millis: 10
aop-patterns: com.suisung.mall.common.service.impl.*,com.suisung.mall.core.web.service.impl.*,com.suisung.mall.cms.*
redis:
host: @redis.host@ # Redis服务器地址
database: @redis.database@ # Redis数据库索引（默认为0）
port: @redis.port@ # Redis服务器连接端口
password: @redis.password@ # Redis服务器连接密码（默认为空）
timeout: 3000ms # 连接超时时间（毫秒）
lettuce:
pool:
max-active: 64
max-wait: -1ms
max-idle: 64
min-idle: 0
cloud:
nacos:
discovery:
server-addr: @nacos.server.address@
config:
server-addr: @nacos.server.address@
file-extension: yaml
sentinel:
transport:
dashboard: @sentinel.transport.dashboard@
eager: true
# 控制台日志信息
logging:
level:
com:
suisung:
mall:
cms:
mapper: debug
sun:
mail: error
baomidou: error
alibaba:
cloud:
seata: error
nacos:
client:
naming: error
config: error
netflix: error
org: error
io: error
reactor: error
springfox: error
logstash:
host: @logstash.host@

2
mall-cms/target/classes/bootstrap.yml
View File

@ -1,6 +1,6 @@
spring:
profiles:
active: local
active: dev
application:
name: mall-cms
jackson:

42
mall-gateway/target/classes/bootstrap-local.yml
View File

@ -1,42 +0,0 @@
spring:
redis:
host: @redis.host@ # Redis服务器地址
database: @redis.database@ # Redis数据库索引（默认为0）
port: @redis.port@ # Redis服务器连接端口
password: @redis.password@ # Redis服务器连接密码（默认为空）
timeout: 3000ms # 连接超时时间（毫秒）
security:
oauth2:
resourceserver:
jwt:
jwk-set-uri: 'http://localhost:8201/mall-auth/rsa/publicKey' #配置RSA的公钥访问地址
cloud:
nacos:
discovery:
server-addr: @nacos.server.address@
config:
server-addr: @nacos.server.address@
file-extension: yaml
sentinel:
transport:
dashboard: @sentinel.transport.dashboard@
eager: true
# 控制台日志信息
logging:
level:
com:
sun:
mail: error
baomidou: error
alibaba:
nacos:
client:
naming: error
config: error
netflix: error
org: error
io: error
reactor: error
springfox: error
logstash:
host: @logstash.host@

2
mall-gateway/target/classes/bootstrap.yml
View File

@ -1,6 +1,6 @@
spring:
profiles:
active: local
active: dev
application:
name: mall-gateway
jackson:

102
mall-im/target/classes/bootstrap-local.yml
View File

@ -1,102 +0,0 @@
spring:
datasource:
url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull
username: fafamall
password: brCnv0qLt8s0VqhI
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
async-init: true
initial-size: 5
max-active: 20
min-idle: 5
max-wait: 60000
validationQuery: SELECT 1
test-while-idle: true
test-on-borrow: false
test-on-return: false
pool-prepared-statements: true
max-pool-prepared-statement-per-connection-size: 20
filters: stat,wall,slf4j
filter:
stat:
enabled: true
db-type: mysql
log-slow-sql: true
slow-sql-millis: 10
aop-patterns: com.suisung.mall.common.service.impl.*,com.suisung.mall.core.web.service.impl.*,com.suisung.mall.im.*
redis:
host: @redis.host@ # Redis服务器地址
database: @redis.database@ # Redis数据库索引（默认为0）
port: @redis.port@ # Redis服务器连接端口
password: @redis.password@ # Redis服务器连接密码（默认为空）
timeout: 3000ms # 连接超时时间（毫秒）
lettuce:
pool:
max-active: 64
max-wait: -1ms
max-idle: 64
min-idle: 0
cloud:
nacos:
discovery:
server-addr: @nacos.server.address@
config:
server-addr: @nacos.server.address@
file-extension: yaml
sentinel:
transport:
dashboard: @sentinel.transport.dashboard@
eager: true
seata:
# 开启自动装配
enabled: true
# 本客户端的微服务名称
application-id: mall-im
data-source-proxy-mode: AT
# 读取哪个事务分组
# 例如此时会读取 SEATA_GROUP 这个分组下的 service.vgroupMapping.my_test_tx_group 这个属性的值。从上面的配置可以知道笔者此处的最终值为 testCluster。后面程序运行会找到 testCluster 这个集群的seata服务端，进行通讯。
tx-service-group: @seata.tx-service-group@
enable-auto-data-source-proxy: true
registry:
type: nacos
nacos:
server-addr: @nacos.server.address@
group: @seata.group@
username: @nacos.username@
password: @nacos.password@
config:
type: nacos
nacos:
server-addr: @nacos.server.address@
group: @seata.group@
username: @nacos.username@
password: @nacos.password@
service:
vgroup-mapping:
my_test_tx_group: default
# 控制台日志信息
logging:
level:
com:
suisung:
mall:
im:
mapper: debug
sun:
mail: error
baomidou: error
alibaba:
cloud:
seata: error
nacos:
client:
naming: error
config: error
netflix: error
org: error
io: error
reactor: error
springfox: error
logstash:
host: @logstash.host@

2
mall-im/target/classes/bootstrap.yml
View File

@ -1,6 +1,6 @@
spring:
profiles:
active: local
active: dev
application:
name: mall-im
jackson:

111
mall-pay/target/classes/bootstrap-local.yml
View File

@ -1,111 +0,0 @@
spring:
datasource:
url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull
username: fafamall
password: brCnv0qLt8s0VqhI
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
async-init: true
initial-size: 5
max-active: 20
min-idle: 5
max-wait: 60000
validationQuery: SELECT 1
test-while-idle: true
test-on-borrow: false
test-on-return: false
pool-prepared-statements: true
max-pool-prepared-statement-per-connection-size: 20
filters: stat,wall,slf4j
filter:
stat:
enabled: true
db-type: mysql
log-slow-sql: true
slow-sql-millis: 10
aop-patterns: com.suisung.mall.common.service.impl.*,com.suisung.mall.core.web.service.impl.*,com.suisung.mall.pay.*
redis:
host: @redis.host@ # Redis服务器地址
database: @redis.database@ # Redis数据库索引（默认为0）
port: @redis.port@ # Redis服务器连接端口
password: @redis.password@ # Redis服务器连接密码（默认为空）
timeout: 3000ms # 连接超时时间（毫秒）
lettuce:
pool:
max-active: 64
max-wait: -1ms
max-idle: 64
min-idle: 0
rabbitmq:
host: @rabbitmq.host@
port: @rabbitmq.port@
virtual-host: @rabbitmq.virtual-host@
listener:
simple:
acknowledge-mode: manual #手动确认消息，不使用默认的消费端确认
username: @rabbitmq.username@
password: @rabbitmq.password@
cloud:
nacos:
discovery:
server-addr: @nacos.server.address@
config:
server-addr: @nacos.server.address@
file-extension: yaml
sentinel:
transport:
dashboard: @sentinel.transport.dashboard@
eager: true
seata:
# 开启自动装配
enabled: true
# 本客户端的微服务名称
application-id: mall-pay
data-source-proxy-mode: AT
# 读取哪个事务分组
# 例如此时会读取 SEATA_GROUP 这个分组下的 service.vgroupMapping.my_test_tx_group 这个属性的值。从上面的配置可以知道笔者此处的最终值为 testCluster。后面程序运行会找到 testCluster 这个集群的seata服务端，进行通讯。
tx-service-group: @seata.tx-service-group@
enable-auto-data-source-proxy: true
registry:
type: nacos
nacos:
server-addr: @nacos.server.address@
group: @seata.group@
username: @nacos.username@
password: @nacos.password@
config:
type: nacos
nacos:
server-addr: @nacos.server.address@
group: @seata.group@
username: @nacos.username@
password: @nacos.password@
service:
vgroup-mapping:
my_test_tx_group: default
# 控制台日志信息
logging:
level:
com:
suisung:
mall:
pay:
mapper: debug
sun:
mail: error
baomidou: error
alibaba:
cloud:
seata: error
nacos:
client:
naming: error
config: error
netflix: error
org: error
io: error
reactor: error
springfox: error
logstash:
host: @logstash.host@

2
mall-pay/target/classes/bootstrap.yml
View File

@ -1,6 +1,6 @@
spring:
profiles:
active: local
active: dev
application:
name: mall-pay
jackson:

84
mall-search/target/classes/bootstrap-local.yml
View File

@ -1,84 +0,0 @@
spring:
datasource:
url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username: fafamall
password: brCnv0qLt8s0VqhI
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
async-init: true
initial-size: 5
max-active: 20
min-idle: 5
max-wait: 60000
validationQuery: SELECT 1
test-while-idle: true
test-on-borrow: false
test-on-return: false
pool-prepared-statements: true
max-pool-prepared-statement-per-connection-size: 20
filters: stat,wall,slf4j
filter:
stat:
enabled: true
db-type: mysql
log-slow-sql: true
slow-sql-millis: 10
aop-patterns: com.suisung.mall.common.service.impl.*,com.suisung.mall.core.web.service.impl.*,com.suisung.mall.search.*
data:
elasticsearch:
repositories:
enabled: true
elasticsearch:
rest:
uris: 101.133.142.46:9200
username: elastic
password: PB256FEN0Oh64pVU
redis:
host: @redis.host@ # Redis服务器地址
database: @redis.database@ # Redis数据库索引（默认为0）
port: @redis.port@ # Redis服务器连接端口
password: @redis.password@ # Redis服务器连接密码（默认为空）
timeout: 3000ms # 连接超时时间（毫秒）
lettuce:
pool:
max-active: 64
max-wait: -1ms
max-idle: 64
min-idle: 0
cloud:
nacos:
discovery:
server-addr: @nacos.server.address@
config:
server-addr: @nacos.server.address@
file-extension: yaml
sentinel:
transport:
dashboard: @sentinel.transport.dashboard@
eager: true
# 控制台日志信息
logging:
level:
com:
suisung:
mall:
search:
dao: debug
sun:
mail: error
baomidou: error
alibaba:
cloud:
seata: error
nacos:
client:
naming: error
config: error
netflix: error
org: error
io: error
reactor: error
springfox: error
logstash:
host: @logstash.host@

2
mall-search/target/classes/bootstrap.yml
View File

@ -1,6 +1,6 @@
spring:
profiles:
active: local
active: dev
application:
name: mall-search
jackson:

92
mall-shop/pom.xml
View File

@ -18,7 +18,6 @@
</parent>
<dependencies>
<!-- mp3文件支持(如语音时长)-->
<dependency>
@ -185,6 +184,97 @@
<artifactId>ip2region</artifactId>
<version>2.7.0</version>
</dependency>
<!--打票机 使用的库 开始-->
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient-win -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-win</artifactId>
<version>4.5.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient-cache -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-cache</artifactId>
<version>4.5.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.9</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.4</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpmime -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.5.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/net.java.dev.jna/jna -->
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>4.1.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/net.java.dev.jna/jna-platform -->
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<version>4.1.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/fluent-hc -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>fluent-hc</artifactId>
<version>4.5.2</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<!--打票机 使用的库 结束-->
</dependencies>
<profiles>

2
mall-shop/src/main/java/com/suisung/mall/shop/activity/service/ShopActivityGroupbookingService.java
View File

@ -41,7 +41,7 @@ public interface ShopActivityGroupbookingService extends IBaseService<ShopActivi
/**
* 拼团结束时间：是否成团检测
*
* @param curTime 当前时间
* @param curTime 当前时间
* @param groupbooking 拼团信息
*/
void checkGroupBooking(Date curTime, ShopActivityGroupbooking groupbooking);

2
mall-shop/src/main/java/com/suisung/mall/shop/activity/service/impl/ShopActivityGroupbookingServiceImpl.java
View File

@ -748,7 +748,7 @@ public class ShopActivityGroupbookingServiceImpl extends BaseServiceImpl<ShopAct
//执行退货申请
flag = shopOrderReturnService.review(Collections.singletonList(return_id), Collections.singletonList(orderReturn), StateCode.RETURN_PROCESS_CHECK, return_next_state_id);
if (!flag){
if (!flag) {
throw new ApiException(ResultCode.FAILED);
}
}

30
mall-shop/src/main/java/com/suisung/mall/shop/analytics/controller/AnalyticsController.java
View File

@ -48,7 +48,7 @@ public class AnalyticsController extends BaseControllerImpl {
return success(timelineRes);
}
@ApiOperation(value = "获取用户访问量")
@RequestMapping(value = "/user/getVisitor", method = RequestMethod.GET)
public CommonRes<DashboardTopRes> getVisitor() {
@ -56,7 +56,7 @@ public class AnalyticsController extends BaseControllerImpl {
return success(topRes);
}
@ApiOperation(value = "获取订单量")
@RequestMapping(value = "/order/getOrderNumToday", method = RequestMethod.GET)
public CommonRes<DashboardTopRes> getOrderNumToday() {
@ -64,7 +64,7 @@ public class AnalyticsController extends BaseControllerImpl {
return success(topRes);
}
@ApiOperation(value = "获取订单量")
@RequestMapping(value = "/order/getOrderNum", method = RequestMethod.GET)
public CommonRes<AnalyticsNumOutput> getOrderNum(AnalyticsOrderReq req) {
@ -101,7 +101,7 @@ public class AnalyticsController extends BaseControllerImpl {
return success(topRes);
}
@ApiOperation(value = "仪表板看板柱形图数据", notes = "[订单数据，用户数据，商品数据，销售额数据]")
@RequestMapping(value = "/order/getDashboardTimeLine", method = RequestMethod.GET)
public CommonRes<DashBoardTimelineRes> getDashboardTimeLine(TimelineReq req) {
@ -110,7 +110,7 @@ public class AnalyticsController extends BaseControllerImpl {
return success(dashBoardTimeLineRes);
}
@ApiOperation(value = "购买商品顾客数量统计")
@RequestMapping(value = "/order/getOrderCustomerNumTimeline", method = RequestMethod.GET)
public CommonRes<List<TimelineOutput>> getOrderCustomerNumTimeline(TimelineReq req) {
@ -119,7 +119,7 @@ public class AnalyticsController extends BaseControllerImpl {
return success(timelineRes);
}
@ApiOperation(value = "订单销售金额对比图")
@RequestMapping(value = "/order/getSaleOrderAmount", method = RequestMethod.GET)
public CommonRes<List<AmountRes>> getSaleOrderAmount(TimelineReq req) {
@ -128,7 +128,7 @@ public class AnalyticsController extends BaseControllerImpl {
return success(amountRes);
}
@ApiOperation(value = "订单数量统计")
@RequestMapping(value = "/order/getOrderNumTimeline", method = RequestMethod.GET)
public CommonRes<List<TimelineOutput>> getOrderNumTimeline(TimelineReq req) {
@ -173,7 +173,7 @@ public class AnalyticsController extends BaseControllerImpl {
return success(timelineRes);
}
@ApiOperation(value = "访客数")
@RequestMapping(value = "/history/getAccessVisitorTimeLine", method = RequestMethod.GET)
public CommonRes<List<TimelineOutput>> getAccessVisitorTimeLine(AccessItemTimelineReq req) {
@ -182,7 +182,7 @@ public class AnalyticsController extends BaseControllerImpl {
return success(timelineRes);
}
@ApiOperation(value = "访客数")
@RequestMapping(value = "/history/getAccessVisitorNum", method = RequestMethod.GET)
public CommonRes<AnalyticsNumOutput> getAccessVisitorNum(AccessItemTimelineReq req) {
@ -191,7 +191,7 @@ public class AnalyticsController extends BaseControllerImpl {
return success(timelineRes);
}
@ApiOperation(value = "浏览量")
@RequestMapping(value = "/history/getAccessNum", method = RequestMethod.GET)
public CommonRes<AnalyticsNumOutput> getAccessNum(AccessItemTimelineReq req) {
@ -200,7 +200,7 @@ public class AnalyticsController extends BaseControllerImpl {
return success(topRes);
}
@ApiOperation(value = "商品浏览量")
@RequestMapping(value = "/history/getAccessItemNum", method = RequestMethod.GET)
public CommonRes<AnalyticsNumOutput> getAccessItemNum(AccessItemTimelineReq req) {
@ -219,7 +219,7 @@ public class AnalyticsController extends BaseControllerImpl {
return success(timelineRes);
}
@ApiOperation(value = "商品访客数")
@RequestMapping(value = "/history/getAccessItemUserNum", method = RequestMethod.GET)
public CommonRes<AnalyticsNumOutput> getAccessItemUserNum(AccessItemTimelineReq req) {
@ -229,7 +229,7 @@ public class AnalyticsController extends BaseControllerImpl {
return success(topRes);
}
@ApiOperation(value = "商品访客数")
@RequestMapping(value = "/order/getOrderItemNum", method = RequestMethod.GET)
public CommonRes<AnalyticsNumOutput> getOrderItemNum(OrderItemNumTimelineReq req) {
@ -240,10 +240,6 @@ public class AnalyticsController extends BaseControllerImpl {
}
@ApiOperation(value = "获取新增店铺数")
@RequestMapping(value = "/store/getStoreNum", method = RequestMethod.GET)
public CommonRes<AnalyticsNumOutput> getStoreNum(TimelineReq req) {

2
mall-shop/src/main/java/com/suisung/mall/shop/analytics/mapper/AnalyticsOrderDao.java
View File

@ -25,6 +25,7 @@ public interface AnalyticsOrderDao {
* @return
*/
OrderNumVo getOrderNum(@Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("order_state_id") List<Integer> orderStateId, @Param("order_is_paid") List<Integer> orderIsPaid, @Param("user_id") Integer userId, @Param("kind_id") Integer kindId, @Param("subsiteId") Integer subsiteId, @Param("storeId") Integer storeId);
CommonNumVo getVoucherActiveNum(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("user_id") Integer userId, @Param("store_id") Integer storeId);
@InterceptorIgnore(tenantLine = "true")
@ -39,6 +40,7 @@ public interface AnalyticsOrderDao {
CommonNumVo getOrderItemNum(@Param("params") OrderItemNumTimelineInput params, @Param("subsiteId") Integer subsiteId, @Param("storeId") Integer storeId);
List<AnalyticsOrderItemNumOutput> listOrderItemNum(@Param("params") OrderItemNumTimelineInput params, @Param("subsiteId") Integer subsiteId, @Param("storeId") Integer storeId);
@InterceptorIgnore(tenantLine = "true")
List<TimelineOutput> getOrderCustomerNumTimeline(@Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("subsiteId") Integer subsiteId, @Param("storeId") Integer storeId);
}

1
mall-shop/src/main/java/com/suisung/mall/shop/analytics/service/AnalyticsReturnService.java
View File

@ -54,6 +54,7 @@ public interface AnalyticsReturnService {
* @return
*/
DashboardTopRes getReturnNumToday();
AnalyticsNumOutput getReturnNum(AnalyticsReturnInput input);
AnalyticsNumOutput getReturnAmount(AnalyticsReturnInput input);

83
mall-shop/src/main/java/com/suisung/mall/shop/analytics/service/impl/AnalyticsOrderServiceImpl.java
View File

@ -77,10 +77,10 @@ public class AnalyticsOrderServiceImpl implements AnalyticsOrderService {
throw new ApiException(ResultCode.UNAUTHORIZED);
}
Integer siteId = user.getSiteid() ;
Integer storeId =user.getStoreId() ;
Integer chainId =user.getChainId() ;
Integer userId =user.getUserId() ;
Integer siteId = user.getSiteid();
Integer storeId = user.getStoreId();
Integer chainId = user.getChainId();
Integer userId = user.getUserId();
DashBoardTimelineRes dashBoardTimeLineRes = new DashBoardTimelineRes();
@ -106,10 +106,10 @@ public class AnalyticsOrderServiceImpl implements AnalyticsOrderService {
throw new ApiException(ResultCode.UNAUTHORIZED);
}
Integer siteId = user.getSiteid() ;
Integer storeId =user.getStoreId() ;
Integer chainId =user.getChainId() ;
Integer userId =user.getUserId() ;
Integer siteId = user.getSiteid();
Integer storeId = user.getStoreId();
Integer chainId = user.getChainId();
Integer userId = user.getUserId();
return analyticsOrderDao.getSaleOrderAmount(input.getStime(), input.getEtime(), siteId, storeId);
}
@ -188,12 +188,12 @@ public class AnalyticsOrderServiceImpl implements AnalyticsOrderService {
throw new ApiException(ResultCode.UNAUTHORIZED);
}
Integer siteId = user.getSiteid() ;
Integer storeId =user.getStoreId() ;
Integer chainId =user.getChainId() ;
Integer userId =user.getUserId() ;
Integer siteId = user.getSiteid();
Integer storeId = user.getStoreId();
Integer chainId = user.getChainId();
Integer userId = user.getUserId();
return analyticsOrderDao.getOrderCustomerNumTimeline(input.getStime(), input.getEtime(),siteId, storeId);
return analyticsOrderDao.getOrderCustomerNumTimeline(input.getStime(), input.getEtime(), siteId, storeId);
}
/**
@ -208,10 +208,10 @@ public class AnalyticsOrderServiceImpl implements AnalyticsOrderService {
throw new ApiException(ResultCode.UNAUTHORIZED);
}
Integer siteId = user.getSiteid() ;
Integer storeId =user.getStoreId() ;
Integer chainId =user.getChainId() ;
Integer userId =user.getUserId() ;
Integer siteId = user.getSiteid();
Integer storeId = user.getStoreId();
Integer chainId = user.getChainId();
Integer userId = user.getUserId();
DashboardTopRes topRes = new DashboardTopRes();
@ -265,10 +265,10 @@ public class AnalyticsOrderServiceImpl implements AnalyticsOrderService {
throw new ApiException(ResultCode.UNAUTHORIZED);
}
Integer siteId = user.getSiteid() ;
Integer storeId =user.getStoreId() ;
Integer chainId =user.getChainId() ;
Integer userId =user.getUserId() ;
Integer siteId = user.getSiteid();
Integer storeId = user.getStoreId();
Integer chainId = user.getChainId();
Integer userId = user.getUserId();
AnalyticsNumOutput topRes = new AnalyticsNumOutput();
@ -336,11 +336,10 @@ public class AnalyticsOrderServiceImpl implements AnalyticsOrderService {
throw new ApiException(ResultCode.UNAUTHORIZED);
}
Integer siteId = user.getSiteid() ;
Integer storeId =user.getStoreId() ;
Integer chainId =user.getChainId() ;
Integer userId =user.getUserId() ;
Integer siteId = user.getSiteid();
Integer storeId = user.getStoreId();
Integer chainId = user.getChainId();
Integer userId = user.getUserId();
DashboardTopRes topRes = new DashboardTopRes();
@ -349,7 +348,7 @@ public class AnalyticsOrderServiceImpl implements AnalyticsOrderService {
TimeRange input = TimeUtil.today();
// 获取当前周期内数据
CommonNumVo regUser = analyticsOrderDao.getVoucherActiveNum(input.getStart()==null?null : new Date(input.getStart()), input.getEnd()==null?null : new Date(input.getEnd()), null, storeId);
CommonNumVo regUser = analyticsOrderDao.getVoucherActiveNum(input.getStart() == null ? null : new Date(input.getStart()), input.getEnd() == null ? null : new Date(input.getEnd()), null, storeId);
CommonNumVo currentRegNum = new CommonNumVo();
currentRegNum.setNum(regUser.getNum());
@ -359,7 +358,7 @@ public class AnalyticsOrderServiceImpl implements AnalyticsOrderService {
TimeRange preInput = TimeUtil.yestoday();
CommonNumVo preRegUser = analyticsOrderDao.getVoucherActiveNum(preInput.getStart()==null?null : new Date(preInput.getStart()), preInput.getEnd()==null?null : new Date(preInput.getEnd()), null, storeId);
CommonNumVo preRegUser = analyticsOrderDao.getVoucherActiveNum(preInput.getStart() == null ? null : new Date(preInput.getStart()), preInput.getEnd() == null ? null : new Date(preInput.getEnd()), null, storeId);
CommonNumVo preRegNum = new CommonNumVo();
preRegNum.setNum(preRegUser.getNum());
@ -382,7 +381,7 @@ public class AnalyticsOrderServiceImpl implements AnalyticsOrderService {
//本月
TimeRange range = TimeUtil.month();
CommonNumVo monthOrderNum = analyticsOrderDao.getVoucherActiveNum(range.getStart()==null?null : new Date(range.getStart()), range.getEnd()==null?null : new Date(range.getEnd()), null, storeId);
CommonNumVo monthOrderNum = analyticsOrderDao.getVoucherActiveNum(range.getStart() == null ? null : new Date(range.getStart()), range.getEnd() == null ? null : new Date(range.getEnd()), null, storeId);
if (ObjectUtil.isNotEmpty(monthOrderNum)) {
topRes.setMonth(monthOrderNum.getNum());
}
@ -396,7 +395,7 @@ public class AnalyticsOrderServiceImpl implements AnalyticsOrderService {
AnalyticsNumOutput topRes = new AnalyticsNumOutput();
// 获取当前周期内数据
CommonNumVo regUser = analyticsOrderDao.getVoucherActiveNum(input.getStime()==null?null : new Date(input.getStime()), input.getEtime()==null?null : new Date(input.getEtime()), input.getUserId(), input.getStoreId());
CommonNumVo regUser = analyticsOrderDao.getVoucherActiveNum(input.getStime() == null ? null : new Date(input.getStime()), input.getEtime() == null ? null : new Date(input.getEtime()), input.getUserId(), input.getStoreId());
CommonNumVo currentRegNum = new CommonNumVo();
currentRegNum.setNum(regUser.getNum());
@ -412,7 +411,7 @@ public class AnalyticsOrderServiceImpl implements AnalyticsOrderService {
preInput.setEtime(input.getStime());
CommonNumVo preRegUser = analyticsOrderDao.getVoucherActiveNum(preInput.getStime()==null?null : new Date(preInput.getStime()), preInput.getEtime()==null?null : new Date(preInput.getEtime()), input.getUserId(), input.getStoreId());
CommonNumVo preRegUser = analyticsOrderDao.getVoucherActiveNum(preInput.getStime() == null ? null : new Date(preInput.getStime()), preInput.getEtime() == null ? null : new Date(preInput.getEtime()), input.getUserId(), input.getStoreId());
CommonNumVo preRegNum = new CommonNumVo();
preRegNum.setNum(preRegUser.getNum());
@ -444,10 +443,10 @@ public class AnalyticsOrderServiceImpl implements AnalyticsOrderService {
throw new ApiException(ResultCode.UNAUTHORIZED);
}
Integer siteId = user.getSiteid() ;
Integer storeId =user.getStoreId() ;
Integer chainId =user.getChainId() ;
Integer userId =user.getUserId() ;
Integer siteId = user.getSiteid();
Integer storeId = user.getStoreId();
Integer chainId = user.getChainId();
Integer userId = user.getUserId();
AnalyticsNumOutput topRes = new AnalyticsNumOutput();
@ -504,10 +503,10 @@ public class AnalyticsOrderServiceImpl implements AnalyticsOrderService {
throw new ApiException(ResultCode.UNAUTHORIZED);
}
Integer siteId = user.getSiteid() ;
Integer storeId =user.getStoreId() ;
Integer chainId =user.getChainId() ;
Integer userId =user.getUserId() ;
Integer siteId = user.getSiteid();
Integer storeId = user.getStoreId();
Integer chainId = user.getChainId();
Integer userId = user.getUserId();
return analyticsOrderDao.getOrderTimeLine(input.getStime(), input.getEtime(), siteId, storeId);
}
@ -520,7 +519,7 @@ public class AnalyticsOrderServiceImpl implements AnalyticsOrderService {
throw new ApiException(ResultCode.UNAUTHORIZED);
}
Integer siteId = user.getSite_id() ;
Integer siteId = user.getSite_id();
Integer storeId = Convert.toInt(user.getStore_id());
siteId = CheckUtil.isEmpty(siteId) ? null : siteId;
@ -535,7 +534,7 @@ public class AnalyticsOrderServiceImpl implements AnalyticsOrderService {
throw new ApiException(ResultCode.UNAUTHORIZED);
}
Integer siteId = user.getSite_id() ;
Integer siteId = user.getSite_id();
Integer storeId = Convert.toInt(user.getStore_id());
siteId = CheckUtil.isEmpty(siteId) ? null : siteId;
@ -585,7 +584,7 @@ public class AnalyticsOrderServiceImpl implements AnalyticsOrderService {
throw new ApiException(ResultCode.UNAUTHORIZED);
}
Integer siteId = user.getSite_id() ;
Integer siteId = user.getSite_id();
Integer storeId = Convert.toInt(user.getStore_id());
siteId = CheckUtil.isEmpty(siteId) ? null : siteId;

82
mall-shop/src/main/java/com/suisung/mall/shop/analytics/service/impl/AnalyticsReturnServiceImpl.java
View File

@ -43,10 +43,10 @@ public class AnalyticsReturnServiceImpl implements AnalyticsReturnService {
throw new ApiException(ResultCode.UNAUTHORIZED);
}
Integer siteId = user.getSiteid() ;
Integer storeId =user.getStoreId() ;
Integer chainId =user.getChainId() ;
Integer userId =user.getUserId() ;
Integer siteId = user.getSiteid();
Integer storeId = user.getStoreId();
Integer chainId = user.getChainId();
Integer userId = user.getUserId();
//统计没有取消的退单
List<Integer> returnStateIds = Arrays.asList(StateCode.RETURN_PROCESS_FINISH, StateCode.RETURN_PROCESS_CHECK, StateCode.RETURN_PROCESS_RECEIVED, StateCode.RETURN_PROCESS_REFUND, StateCode.RETURN_PROCESS_RECEIPT_CONFIRMATION, StateCode.RETURN_PROCESS_REFUSED, StateCode.RETURN_PROCESS_SUBMIT);
@ -63,10 +63,10 @@ public class AnalyticsReturnServiceImpl implements AnalyticsReturnService {
throw new ApiException(ResultCode.UNAUTHORIZED);
}
Integer siteId = user.getSiteid() ;
Integer storeId =user.getStoreId() ;
Integer chainId =user.getChainId() ;
Integer userId =user.getUserId() ;
Integer siteId = user.getSiteid();
Integer storeId = user.getStoreId();
Integer chainId = user.getChainId();
Integer userId = user.getUserId();
// 获取当日交易额
TimeRange range = TimeUtil.today();
@ -75,7 +75,7 @@ public class AnalyticsReturnServiceImpl implements AnalyticsReturnService {
List<Integer> returnStateIds = Arrays.asList(StateCode.RETURN_PROCESS_FINISH, StateCode.RETURN_PROCESS_CHECK, StateCode.RETURN_PROCESS_RECEIVED, StateCode.RETURN_PROCESS_REFUND, StateCode.RETURN_PROCESS_RECEIPT_CONFIRMATION, StateCode.RETURN_PROCESS_REFUSED, StateCode.RETURN_PROCESS_SUBMIT);
// 获取当前周期内数据
CommonNumVo currentRegNum = analyticsReturnDao.getReturnNum(range.getStart()==null ? null : new Date(range.getStart()), range.getEnd()==null ? null : new Date(range.getEnd()), returnStateIds, siteId, storeId);
CommonNumVo currentRegNum = analyticsReturnDao.getReturnNum(range.getStart() == null ? null : new Date(range.getStart()), range.getEnd() == null ? null : new Date(range.getEnd()), returnStateIds, siteId, storeId);
if (currentRegNum != null) {
topRes.setToday(currentRegNum.getNum());
@ -83,7 +83,7 @@ public class AnalyticsReturnServiceImpl implements AnalyticsReturnService {
//昨日
range = TimeUtil.yestoday();
CommonNumVo preRegNum = analyticsReturnDao.getReturnNum(range.getStart()==null ? null : new Date(range.getStart()), range.getEnd()==null ? null : new Date(range.getEnd()), returnStateIds, siteId, storeId);
CommonNumVo preRegNum = analyticsReturnDao.getReturnNum(range.getStart() == null ? null : new Date(range.getStart()), range.getEnd() == null ? null : new Date(range.getEnd()), returnStateIds, siteId, storeId);
if (ObjectUtil.isNotEmpty(preRegNum)) {
topRes.setYestoday(preRegNum.getNum());
@ -102,7 +102,7 @@ public class AnalyticsReturnServiceImpl implements AnalyticsReturnService {
//本月
range = TimeUtil.month();
CommonNumVo monthTradeAmount = analyticsReturnDao.getReturnNum(range.getStart()==null ? null : new Date(range.getStart()), range.getEnd()==null ? null : new Date(range.getEnd()), returnStateIds, siteId, storeId);
CommonNumVo monthTradeAmount = analyticsReturnDao.getReturnNum(range.getStart() == null ? null : new Date(range.getStart()), range.getEnd() == null ? null : new Date(range.getEnd()), returnStateIds, siteId, storeId);
if (ObjectUtil.isNotEmpty(monthTradeAmount)) {
topRes.setMonth(monthTradeAmount.getNum());
}
@ -117,10 +117,10 @@ public class AnalyticsReturnServiceImpl implements AnalyticsReturnService {
throw new ApiException(ResultCode.UNAUTHORIZED);
}
Integer siteId = user.getSiteid() ;
Integer storeId =user.getStoreId() ;
Integer chainId =user.getChainId() ;
Integer userId =user.getUserId() ;
Integer siteId = user.getSiteid();
Integer storeId = user.getStoreId();
Integer chainId = user.getChainId();
Integer userId = user.getUserId();
AnalyticsNumOutput topRes = new AnalyticsNumOutput();
@ -129,7 +129,7 @@ public class AnalyticsReturnServiceImpl implements AnalyticsReturnService {
input.setReturnStateId(returnStateIds);
// 获取当前周期内数据
CommonNumVo currentRegNum = analyticsReturnDao.getReturnNum(input.getStime()==null ? null : new Date(input.getStime()), input.getStime()==null ? null : new Date(input.getEtime()), input.getReturnStateId(), siteId, storeId);
CommonNumVo currentRegNum = analyticsReturnDao.getReturnNum(input.getStime() == null ? null : new Date(input.getStime()), input.getStime() == null ? null : new Date(input.getEtime()), input.getReturnStateId(), siteId, storeId);
if (currentRegNum != null) {
topRes.setCurrent(currentRegNum.getNum());
@ -142,7 +142,7 @@ public class AnalyticsReturnServiceImpl implements AnalyticsReturnService {
preInput.setStime(input.getStime() - (input.getEtime() - input.getStime()));
preInput.setEtime(input.getStime());
CommonNumVo preRegNum = analyticsReturnDao.getReturnNum(preInput.getStime()==null ? null : new Date(preInput.getStime()), preInput.getStime()==null ? null : new Date(preInput.getEtime()), preInput.getReturnStateId(), siteId, storeId);
CommonNumVo preRegNum = analyticsReturnDao.getReturnNum(preInput.getStime() == null ? null : new Date(preInput.getStime()), preInput.getStime() == null ? null : new Date(preInput.getEtime()), preInput.getReturnStateId(), siteId, storeId);
if (ObjectUtil.isNotEmpty(preRegNum)) {
topRes.setPre(preRegNum.getNum());
@ -170,10 +170,10 @@ public class AnalyticsReturnServiceImpl implements AnalyticsReturnService {
throw new ApiException(ResultCode.UNAUTHORIZED);
}
Integer siteId = user.getSiteid() ;
Integer storeId =user.getStoreId() ;
Integer chainId =user.getChainId() ;
Integer userId =user.getUserId() ;
Integer siteId = user.getSiteid();
Integer storeId = user.getStoreId();
Integer chainId = user.getChainId();
Integer userId = user.getUserId();
AnalyticsNumOutput topRes = new AnalyticsNumOutput();
@ -225,10 +225,10 @@ public class AnalyticsReturnServiceImpl implements AnalyticsReturnService {
throw new ApiException(ResultCode.UNAUTHORIZED);
}
Integer siteId = user.getSiteid() ;
Integer storeId =user.getStoreId() ;
Integer chainId =user.getChainId() ;
Integer userId =user.getUserId() ;
Integer siteId = user.getSiteid();
Integer storeId = user.getStoreId();
Integer chainId = user.getChainId();
Integer userId = user.getUserId();
//统计没有取消的退单
List<Integer> returnStateIds = Arrays.asList(StateCode.RETURN_PROCESS_FINISH, StateCode.RETURN_PROCESS_CHECK, StateCode.RETURN_PROCESS_RECEIVED, StateCode.RETURN_PROCESS_REFUND, StateCode.RETURN_PROCESS_RECEIPT_CONFIRMATION, StateCode.RETURN_PROCESS_REFUSED, StateCode.RETURN_PROCESS_SUBMIT);
@ -243,10 +243,10 @@ public class AnalyticsReturnServiceImpl implements AnalyticsReturnService {
throw new ApiException(ResultCode.UNAUTHORIZED);
}
Integer siteId = user.getSiteid() ;
Integer storeId =user.getStoreId() ;
Integer chainId =user.getChainId() ;
Integer userId =user.getUserId() ;
Integer siteId = user.getSiteid();
Integer storeId = user.getStoreId();
Integer chainId = user.getChainId();
Integer userId = user.getUserId();
return analyticsReturnDao.getReturnItemNumTimeLine(input, siteId, storeId);
}
@ -258,10 +258,10 @@ public class AnalyticsReturnServiceImpl implements AnalyticsReturnService {
throw new ApiException(ResultCode.UNAUTHORIZED);
}
Integer siteId = user.getSiteid() ;
Integer storeId =user.getStoreId() ;
Integer chainId =user.getChainId() ;
Integer userId =user.getUserId() ;
Integer siteId = user.getSiteid();
Integer storeId = user.getStoreId();
Integer chainId = user.getChainId();
Integer userId = user.getUserId();
AnalyticsNumOutput topRes = new AnalyticsNumOutput();
@ -308,10 +308,10 @@ public class AnalyticsReturnServiceImpl implements AnalyticsReturnService {
throw new ApiException(ResultCode.UNAUTHORIZED);
}
Integer siteId = user.getSiteid() ;
Integer storeId =user.getStoreId() ;
Integer chainId =user.getChainId() ;
Integer userId =user.getUserId() ;
Integer siteId = user.getSiteid();
Integer storeId = user.getStoreId();
Integer chainId = user.getChainId();
Integer userId = user.getUserId();
return analyticsReturnDao.listReturnItemNum(input, siteId, storeId);
}
@ -329,10 +329,10 @@ public class AnalyticsReturnServiceImpl implements AnalyticsReturnService {
throw new ApiException(ResultCode.UNAUTHORIZED);
}
Integer siteId = user.getSiteid() ;
Integer storeId =user.getStoreId() ;
Integer chainId =user.getChainId() ;
Integer userId =user.getUserId() ;
Integer siteId = user.getSiteid();
Integer storeId = user.getStoreId();
Integer chainId = user.getChainId();
Integer userId = user.getUserId();
return null;
}

2
mall-shop/src/main/java/com/suisung/mall/shop/analytics/service/impl/AnalyticsStoreServiceImpl.java
View File

@ -87,7 +87,7 @@ public class AnalyticsStoreServiceImpl implements AnalyticsStoreService {
AnalyticsNumOutput topRes = new AnalyticsNumOutput();
// 获取当前周期内数据
CommonNumVo regUser = analyticsStoreDao.getStoreNum(CheckUtil.isNotEmpty(input.getStime()) ? new Date(input.getStime()) : null, CheckUtil.isNotEmpty(input.getEtime()) ? new Date(input.getEtime()) : null);
CommonNumVo currentRegNum = BeanUtil.copyProperties(regUser, CommonNumVo.class);

40
mall-shop/src/main/java/com/suisung/mall/shop/analytics/service/impl/AnalyticsSysServiceImpl.java
View File

@ -164,10 +164,10 @@ public class AnalyticsSysServiceImpl implements AnalyticsSysService {
throw new ApiException(ResultCode.UNAUTHORIZED);
}
Integer siteId = user.getSiteid() ;
Integer storeId =user.getStoreId() ;
Integer chainId =user.getChainId() ;
Integer userId =user.getUserId() ;
Integer siteId = user.getSiteid();
Integer storeId = user.getStoreId();
Integer chainId = user.getChainId();
Integer userId = user.getUserId();
return analyticsSysDao.getAccessItemTimeLine(input.getStime(), input.getEtime(), input.getItemId(), storeId);
}
@ -179,10 +179,10 @@ public class AnalyticsSysServiceImpl implements AnalyticsSysService {
throw new ApiException(ResultCode.UNAUTHORIZED);
}
Integer siteId = user.getSiteid() ;
Integer storeId =user.getStoreId() ;
Integer chainId =user.getChainId() ;
Integer userId =user.getUserId() ;
Integer siteId = user.getSiteid();
Integer storeId = user.getStoreId();
Integer chainId = user.getChainId();
Integer userId = user.getUserId();
AnalyticsNumOutput topRes = new AnalyticsNumOutput();
@ -227,10 +227,10 @@ public class AnalyticsSysServiceImpl implements AnalyticsSysService {
throw new ApiException(ResultCode.UNAUTHORIZED);
}
Integer siteId = user.getSiteid() ;
Integer storeId =user.getStoreId() ;
Integer chainId =user.getChainId() ;
Integer userId =user.getUserId() ;
Integer siteId = user.getSiteid();
Integer storeId = user.getStoreId();
Integer chainId = user.getChainId();
Integer userId = user.getUserId();
return analyticsSysDao.getAccessItemUserTimeLine(input.getStime(), input.getEtime(), input.getItemId(), storeId);
}
@ -242,10 +242,10 @@ public class AnalyticsSysServiceImpl implements AnalyticsSysService {
throw new ApiException(ResultCode.UNAUTHORIZED);
}
Integer siteId = user.getSiteid() ;
Integer storeId =user.getStoreId() ;
Integer chainId =user.getChainId() ;
Integer userId =user.getUserId() ;
Integer siteId = user.getSiteid();
Integer storeId = user.getStoreId();
Integer chainId = user.getChainId();
Integer userId = user.getUserId();
AnalyticsNumOutput topRes = new AnalyticsNumOutput();
@ -295,10 +295,10 @@ public class AnalyticsSysServiceImpl implements AnalyticsSysService {
throw new ApiException(ResultCode.UNAUTHORIZED);
}
Integer siteId = user.getSiteid() ;
Integer storeId =user.getStoreId() ;
Integer chainId =user.getChainId() ;
Integer userId =user.getUserId() ;
Integer siteId = user.getSiteid();
Integer storeId = user.getStoreId();
Integer chainId = user.getChainId();
Integer userId = user.getUserId();
return analyticsSysDao.listAccessItem(timelineInput, storeId);
}

10
mall-shop/src/main/java/com/suisung/mall/shop/api/mobile/KdApiExpressSearchController.java
View File

@ -27,17 +27,17 @@ public class KdApiExpressSearchController {
private KdApiExpressSearchService kdApiExpressSearchService;
@RequestMapping(value = "/viewLogistics", method = RequestMethod.POST)
public CommonResult select(@RequestParam String order_id,@RequestParam String stock_bill_id) throws UnsupportedEncodingException, NoSuchAlgorithmException {
public CommonResult select(@RequestParam String order_id, @RequestParam String stock_bill_id) throws UnsupportedEncodingException, NoSuchAlgorithmException {
return kdApiExpressSearchService.select(order_id,stock_bill_id);
return kdApiExpressSearchService.select(order_id, stock_bill_id);
}
@RequestMapping(value = "/returnlogistics", method = RequestMethod.POST)
public CommonResult returnLogistics(@RequestParam String return_tracking_name,
@RequestParam String return_tracking_number,
@RequestParam(value = "order_id",required = false) String order_id) throws UnsupportedEncodingException, NoSuchAlgorithmException {
@RequestParam String return_tracking_number,
@RequestParam(value = "order_id", required = false) String order_id) throws UnsupportedEncodingException, NoSuchAlgorithmException {
return kdApiExpressSearchService.returnLogistics(return_tracking_name,return_tracking_number, order_id);
return kdApiExpressSearchService.returnLogistics(return_tracking_name, return_tracking_number, order_id);
}
}

4
mall-shop/src/main/java/com/suisung/mall/shop/api/service/KdApiExpressSearchService.java
View File

@ -13,7 +13,7 @@ import java.security.NoSuchAlgorithmException;
**/
public interface KdApiExpressSearchService {
CommonResult select(String order_id,String stock_bill_id) throws UnsupportedEncodingException, NoSuchAlgorithmException;
CommonResult select(String order_id, String stock_bill_id) throws UnsupportedEncodingException, NoSuchAlgorithmException;
CommonResult returnLogistics(String return_tracking_name, String return_tracking_number, String order_id) throws UnsupportedEncodingException, NoSuchAlgorithmException;
CommonResult returnLogistics(String return_tracking_name, String return_tracking_number, String order_id) throws UnsupportedEncodingException, NoSuchAlgorithmException;
}

2
mall-shop/src/main/java/com/suisung/mall/shop/base/controller/admin/ShopBaseHelpController.java
View File

@ -40,7 +40,7 @@ public class ShopBaseHelpController {
@ApiOperation(value = "站点帮助", notes = "站点帮助")
@RequestMapping(value = "/savePcHelp", method = RequestMethod.POST)
public CommonResult savePcHelp(@RequestParam(name = "pc_help") String pcHelp) {
AccountBaseConfig accountBaseConfig=new AccountBaseConfig();
AccountBaseConfig accountBaseConfig = new AccountBaseConfig();
accountBaseConfig.setConfig_key("page_pc_help");
accountBaseConfig.setConfig_value(pcHelp);
accountBaseConfig.setConfig_type("text");

2
mall-shop/src/main/java/com/suisung/mall/shop/base/controller/admin/ShopBaseProductBrandController.java
View File

@ -100,7 +100,7 @@ public class ShopBaseProductBrandController extends BaseControllerImpl {
public CommonResult getBrandS() {
String brand_name = getParameter("brand_name");
QueryWrapper<ShopBaseProductBrand> queryWrapper = new QueryWrapper<>();
queryWrapper.like("brand_name",brand_name);
queryWrapper.like("brand_name", brand_name);
return CommonResult.success(shopBaseProductBrandService.find(queryWrapper));
}
}

2
mall-shop/src/main/java/com/suisung/mall/shop/base/controller/admin/ShopBaseProductCategoryMobileController.java
View File

@ -81,7 +81,7 @@ public class ShopBaseProductCategoryMobileController {
@ApiOperation(value = "移动端首页分类使用-修改状态", notes = "移动端首页分类使用-修改状态")
@RequestMapping(value = "/editState", method = RequestMethod.POST)
public CommonResult editState(@RequestParam(name = "category_id") Integer category_id,
@RequestParam(name = "category_is_store") Integer category_is_store) {
@RequestParam(name = "category_is_store") Integer category_is_store) {
ShopBaseProductCategoryMobile categoryMobile = new ShopBaseProductCategoryMobile();
categoryMobile.setCategory_id(category_id);
categoryMobile.setCategory_is_store(category_is_store);

2
mall-shop/src/main/java/com/suisung/mall/shop/base/controller/admin/ShopBaseProductCategoryNavController.java
View File

@ -50,7 +50,7 @@ public class ShopBaseProductCategoryNavController {
if (CheckUtil.isNotEmpty(shopBaseProductCategoryNav.getCategory_image())) {
queryWrapper.like("category_name", shopBaseProductCategoryNav.getCategory_name());
}
return CommonResult.success(shopBaseProductCategoryNavService.lists(queryWrapper, pageNum, pageSize));
}

2
mall-shop/src/main/java/com/suisung/mall/shop/base/controller/admin/ShopBaseProductSpecController.java
View File

@ -51,7 +51,7 @@ public class ShopBaseProductSpecController {
@ApiOperation(value = "商品规格表-分页列表查询", notes = "商品规格表-分页列表查询")
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult list(ShopBaseProductSpec shopBaseProductSpec,
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
QueryWrapper<ShopBaseProductSpec> queryWrapper = new QueryWrapper<>();
queryWrapper.orderByAsc("spec_id");

5
mall-shop/src/main/java/com/suisung/mall/shop/base/controller/admin/ShopBaseProductTypeController.java
View File

@ -85,7 +85,7 @@ public class ShopBaseProductTypeController {
public CommonResult getLists() {
QueryWrapper<ShopBaseProductType> queryWrapper = new QueryWrapper<>();
queryWrapper.orderByAsc("type_id");
queryWrapper.eq("type_is_draft",0);
queryWrapper.eq("type_is_draft", 0);
return CommonResult.success(shopBaseProductTypeService.find(queryWrapper));
}
@ -132,8 +132,7 @@ public class ShopBaseProductTypeController {
if (StrUtil.isBlank(type_spec_ids)) {
shopBaseProductType.setType_spec_ids("");
}
else {
} else {
}

1
mall-shop/src/main/java/com/suisung/mall/shop/base/service/AccountBaseConfigService.java
View File

@ -48,5 +48,6 @@ public interface AccountBaseConfigService extends IBaseService<AccountBaseConfig
String qrcode(String chain_code, Integer width, Integer high);
boolean saveOrUpdate(Collection<AccountBaseConfig> configs);
boolean saveOrUpdate(AccountBaseConfig config);
}

9
mall-shop/src/main/java/com/suisung/mall/shop/base/service/ShopBaseProductCategoryService.java
View File

@ -57,6 +57,7 @@ public interface ShopBaseProductCategoryService extends IBaseService<ShopBasePro
Map getLists();
Map lists();
Page<ShopBaseProductCategory> lists(ProductCategoryListReq req);
/**
@ -69,7 +70,8 @@ public interface ShopBaseProductCategoryService extends IBaseService<ShopBasePro
/**
* 删除操作,支持单条/多条删除
* @param category_id 分类编号
*
* @param category_id 分类编号
* @return del_flag 是否成功
* @access public
*/
@ -77,7 +79,8 @@ public interface ShopBaseProductCategoryService extends IBaseService<ShopBasePro
/**
* 添加操作,支持单条
* @param shopBaseProductCategory 分类实体
*
* @param shopBaseProductCategory 分类实体
* @return bool $del_flag 是否成功
* @access public
*/
@ -85,12 +88,14 @@ public interface ShopBaseProductCategoryService extends IBaseService<ShopBasePro
/**
* 清理分类缓存
*
* @access public
*/
boolean cleanCategoryCache();
/**
* 获取查询店铺类型
*
* @param user
* @return
*/

1
mall-shop/src/main/java/com/suisung/mall/shop/base/service/ShopBaseProductTypeService.java
View File

@ -19,5 +19,6 @@ public interface ShopBaseProductTypeService extends IBaseService<ShopBaseProduct
boolean removeType(List<String> ids);
Map getType(String type_id);
Map getType(String type_id, Long product_id);
}

6
mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/AccountBaseConfigServiceImpl.java
View File

@ -162,8 +162,7 @@ public class AccountBaseConfigServiceImpl extends BaseServiceImpl<AccountBaseCon
//用户等级
Integer user_level_id = 1001;
if (user_row != null)
{
if (user_row != null) {
user_level_id = user_row.getUser_level_id();
}
@ -259,6 +258,7 @@ public class AccountBaseConfigServiceImpl extends BaseServiceImpl<AccountBaseCon
/**
* 同步配置表缓存
*
* @param loop
*/
@Async
@ -309,7 +309,7 @@ public class AccountBaseConfigServiceImpl extends BaseServiceImpl<AccountBaseCon
}
}
@Override
public boolean saveOrUpdate(Collection<AccountBaseConfig> configs) {
boolean b = super.saveOrUpdate(configs);

2
mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductTypeServiceImpl.java
View File

@ -96,7 +96,7 @@ public class ShopBaseProductTypeServiceImpl extends BaseServiceImpl<ShopBaseProd
public Map getType(String type_id, Long product_id) {
Map data = getType(type_id);
if (CheckUtil.isNotEmpty(product_id)){
if (CheckUtil.isNotEmpty(product_id)) {
//读取商品，判断是否为供应商分销商品
ShopProductBase shopProductBase = shopProductBaseService.get(product_id);
if (!shopProductBase.getProduct_src_id().equals(0)) {

5
mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseStateCodeServiceImpl.java
View File

@ -49,8 +49,7 @@ public class ShopBaseStateCodeServiceImpl extends BaseServiceImpl<ShopBaseStateC
// todo cache
@Override
public Map getText(List<Integer> codes, String type) {
if (CheckUtil.isEmpty(type))
{
if (CheckUtil.isEmpty(type)) {
type = "1";
}
@ -71,7 +70,7 @@ public class ShopBaseStateCodeServiceImpl extends BaseServiceImpl<ShopBaseStateC
/**
* @param code
* @param type 默认值 "state_code_code"
* todo 加缓存
* todo 加缓存
*/
@Override
public String getCode(Integer code, String type) {

2
mall-shop/src/main/java/com/suisung/mall/shop/base/vo/CatChildVo.java
View File

@ -57,5 +57,5 @@ public class CatChildVo {
private Integer id;
private Integer value;
}

6
mall-shop/src/main/java/com/suisung/mall/shop/chain/controller/admin/ShopChainUserController.java
View File

@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController("admin-shop-chain-user")
@RequestMapping("/admin/shop/shop-chain-user")
public class ShopChainUserController extends BaseControllerImpl {
@Autowired
private ShopChainUserService shopChainUserService;
@ -87,8 +87,8 @@ public class ShopChainUserController extends BaseControllerImpl {
* 编辑更新
*
* @param chain_user_id
* @Param rights_group_id
* @return
* @Param rights_group_id
*/
@ApiOperation(value = "权限组表-编辑", notes = "权限组表-编辑")
@RequestMapping(value = "/editRightGroupIds", method = RequestMethod.POST)
@ -111,5 +111,5 @@ public class ShopChainUserController extends BaseControllerImpl {
}
return CommonResult.success();
}
}

2
mall-shop/src/main/java/com/suisung/mall/shop/chain/controller/admin/ShopChainUserRightsGroupController.java
View File

@ -74,8 +74,8 @@ public class ShopChainUserRightsGroupController extends BaseControllerImpl {
* 编辑更新
*
* @param rights_group_id
* @Param rights_group_rights_ids
* @return
* @Param rights_group_rights_ids
*/
@ApiOperation(value = "权限组表-编辑", notes = "权限组表-编辑")
@RequestMapping(value = "/edit", method = RequestMethod.POST)

1
mall-shop/src/main/java/com/suisung/mall/shop/chain/service/ShopChainTnService.java
View File

@ -17,6 +17,7 @@ public interface ShopChainTnService extends IBaseService<ShopChainTn> {
/**
* 门店技师表-分页列表查询
*
* @param queryWrapper
* @param pageNum
* @param pageSize

6
mall-shop/src/main/java/com/suisung/mall/shop/components/BaiduAi.java
View File

@ -25,7 +25,7 @@ public class BaiduAi {
static final OkHttpClient HTTP_CLIENT = new OkHttpClient().newBuilder().build();
public static void main(String []args) throws IOException{
public static void main(String[] args) throws IOException {
String url = "https://lancerdt.oss-accelerate.aliyuncs.com/mall/images/media/store/10002/20240123d3c27007baf740c9bdc429f850259501.jpg";
BaiduAiBriefDTO brief = new BaiduAiBriefDTO();
@ -133,7 +133,7 @@ public class BaiduAi {
System.out.println(resultStr);
JSONObject jsonObject = JSONUtil.parseObj(resultStr);
Integer errCode = Convert.toInt(jsonObject.get("error_code"));
String errMessage = Convert.toStr(jsonObject.get("error_msg"));
String contSign = Convert.toStr(jsonObject.get("cont_sign"));
@ -244,7 +244,7 @@ public class BaiduAi {
throw new ApiException(I18nUtil._("返回结果为空！"));
}
items = JSONUtil.toList(resData, Map.class);
items = JSONUtil.toList(resData, Map.class);
} else {
return items;
}

23
mall-shop/src/main/java/com/suisung/mall/shop/components/IpLocation.java
View File

@ -14,6 +14,7 @@ public class IpLocation {
static ByteBuffer indexBuffer;
static int offset;
static int[] index = new int[256];
static {
try {
fin = new FileInputStream(file);
@ -39,7 +40,9 @@ public class IpLocation {
} catch (IOException ioe) {
//
} finally {
try {fin.close();} catch (IOException e){
try {
fin.close();
} catch (IOException e) {
//
}
}
@ -47,12 +50,11 @@ public class IpLocation {
public static IpLocation ip = new IpLocation();
public static void main(String[] args){
public static void main(String[] args) {
for (int i = 0; i < 100; i++)
{
new Thread(){
public void run(){
for (int i = 0; i < 100; i++) {
new Thread() {
public void run() {
System.out.println(java.util.Arrays.toString(ip.find("118.28.8.8")));
}
}.start();
@ -62,9 +64,9 @@ public class IpLocation {
/**
* 确保线程安全
*/
public String[] find(String ip){
public String[] find(String ip) {
int ip_prefix_value = new Integer(ip.substring(0, ip.indexOf(".")));
long ip2long_value = ip2long(ip);
long ip2long_value = ip2long(ip);
int start = index[ip_prefix_value];
int max_comp_len = offset - 1028;
long tmpInt;
@ -92,7 +94,8 @@ public class IpLocation {
public static long bytesToLong(byte a, byte b, byte c, byte d) {
return int2long((((a & 0xff) << 24) | ((b & 0xff) << 16) | ((c & 0xff) << 8) | (d & 0xff)));
}
private static int str2Ip(String ip) {
private static int str2Ip(String ip) {
String[] ss = ip.split("\\.");
int a, b, c, d;
a = Integer.parseInt(ss[0]);
@ -102,7 +105,7 @@ public class IpLocation {
return (a << 24) | (b << 16) | (c << 8) | d;
}
private static long ip2long(String ip) {
private static long ip2long(String ip) {
return int2long(str2Ip(ip));
}

1
mall-shop/src/main/java/com/suisung/mall/shop/components/poster/core/decorators/LabelTextDecorator.java
View File

@ -5,6 +5,7 @@ import com.suisung.mall.shop.components.poster.core.abst.Poster;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.awt.FontMetrics;
import java.awt.*;

1
mall-shop/src/main/java/com/suisung/mall/shop/components/poster/core/decorators/TextDecorator.java
View File

@ -6,6 +6,7 @@ import com.suisung.mall.shop.components.poster.core.abst.Poster;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.awt.FontMetrics;
import java.awt.*;

1
mall-shop/src/main/java/com/suisung/mall/shop/components/quartz/job/CheckGroupBookingJob.java
View File

@ -52,5 +52,4 @@ public class CheckGroupBookingJob extends QuartzJobBean {
}
}

1
mall-shop/src/main/java/com/suisung/mall/shop/components/quartz/job/RsyncLogJob.java
View File

@ -202,7 +202,6 @@ public class RsyncLogJob extends QuartzJobBean {
}
analyticsAccessHistoryService.save(queue_row);
times--;

2
mall-shop/src/main/java/com/suisung/mall/shop/components/quartz/job/StoreValidTimeJod.java
View File

@ -63,7 +63,7 @@ public class StoreValidTimeJod extends QuartzJobBean {
try {
Thread.sleep(10000);
} catch (InterruptedException e) {
logger.error("店铺自动下架定时任务线程异常！"+e.getMessage(),e);
logger.error("店铺自动下架定时任务线程异常！" + e.getMessage(), e);
}
page++;
}

2
mall-shop/src/main/java/com/suisung/mall/shop/components/quartz/job/UpdateProductStatusJob.java
View File

@ -94,7 +94,7 @@ public class UpdateProductStatusJob extends QuartzJobBean {
try {
Thread.sleep(10000);
} catch (InterruptedException e) {
logger.error("商品上架定时任务线程异常！"+e.getMessage(),e);
logger.error("商品上架定时任务线程异常！" + e.getMessage(), e);
}
page++;
}

2
mall-shop/src/main/java/com/suisung/mall/shop/config/I18nConfig.java
View File

@ -42,7 +42,7 @@ public class I18nConfig implements WebMvcConfigurer {
//设置默认区域,
slr.setCookieName("source_lang");
slr.setDefaultLocale(Locale.SIMPLIFIED_CHINESE);
slr.setCookieMaxAge(3600*30*12);//设置cookie有效期.
slr.setCookieMaxAge(3600 * 30 * 12);//设置cookie有效期.
return slr;
}

1
mall-shop/src/main/java/com/suisung/mall/shop/config/OssConfig.java
View File

@ -23,7 +23,6 @@ public class OssConfig {
private String ALIYUN_OSS_ACCESSKEYSECRET;
@Bean
public OSSClient ossClient() {

7
mall-shop/src/main/java/com/suisung/mall/shop/config/OssUtils.java
View File

@ -34,8 +34,8 @@ public class OssUtils {
* oos直传,本地不存储图片
*
* @param netImageUrl 图片地址
* @param dir 文件夹
* @param uploadName 文件名
* @param dir 文件夹
* @param uploadName 文件名
*/
public String uploadFile(String netImageUrl, String dir, String uploadName) {
HttpURLConnection connection = null;
@ -81,10 +81,11 @@ public class OssUtils {
/**
* 网络图片转输入流
*
* @param fileUrl
* @return
*/
public static InputStream urlToInputSteam(String fileUrl){
public static InputStream urlToInputSteam(String fileUrl) {
HttpURLConnection connection = null;
InputStream is = null;
InputStream stream = null;

15
mall-shop/src/main/java/com/suisung/mall/shop/config/RabbitMqConfig.java
View File

@ -21,7 +21,6 @@ public class RabbitMqConfig {
/**
* 序列化
*
*/
@Bean
public RabbitTemplate rabbitTemplate(ConnectionFactory connectionFactory) {
@ -29,7 +28,7 @@ public class RabbitMqConfig {
converter.setAssumeSupportedContentType(true);
RabbitTemplate rabbitTemplate = new RabbitTemplate(connectionFactory);
// 消息抵达确认通知
rabbitTemplate.setConfirmCallback((data, ack, cause)->{
rabbitTemplate.setConfirmCallback((data, ack, cause) -> {
if (ack) {
String msgId = data.getId();
mqMessageService.setMessageStatus(msgId, MqConstant.DELIVERED);
@ -41,7 +40,7 @@ public class RabbitMqConfig {
}
});
// 消息投递失败通知
rabbitTemplate.setReturnCallback((msg, respCode, respText, exchange, routingKey)-> {
rabbitTemplate.setReturnCallback((msg, respCode, respText, exchange, routingKey) -> {
log.error("交换机抵达队列失败，消息编号：{}，状态码：{}，失败原因：{}，当前交换机：{}，当前路由键： {}", msg, respCode, respText, exchange, routingKey);
String msgId = msg.getMessageProperties().getMessageId();
mqMessageService.setMessageStatus(msgId, MqConstant.FAILURE);
@ -53,10 +52,9 @@ public class RabbitMqConfig {
/**
* 反序列化
*
*/
@Bean
public SimpleRabbitListenerContainerFactory rabbitListenerContainerFactory(ConnectionFactory connectionFactory){
public SimpleRabbitListenerContainerFactory rabbitListenerContainerFactory(ConnectionFactory connectionFactory) {
SimpleRabbitListenerContainerFactory factory = new SimpleRabbitListenerContainerFactory();
factory.setConnectionFactory(connectionFactory);
factory.setMessageConverter(new Jackson2JsonMessageConverter());
@ -66,6 +64,7 @@ public class RabbitMqConfig {
/**
* 默认交换机
*
* @return
*/
@Bean
@ -75,6 +74,7 @@ public class RabbitMqConfig {
/**
* 处理支付回调队列配置
*
* @return
*/
@Bean
@ -85,6 +85,7 @@ public class RabbitMqConfig {
/**
* 处理支付回调路由键配置
*
* @return
*/
@Bean
@ -98,6 +99,7 @@ public class RabbitMqConfig {
/**
* 站内信队列配置
*
* @return
*/
@Bean
@ -108,6 +110,7 @@ public class RabbitMqConfig {
/**
* 站内信路由键配置
*
* @return
*/
@Bean
@ -121,6 +124,7 @@ public class RabbitMqConfig {
/**
* 修改SPOrderCenter订单状态队列配置
*
* @return
*/
@Bean
@ -131,6 +135,7 @@ public class RabbitMqConfig {
/**
* 修改SPOrderCenter订单状态队列配置
*
* @return
*/
@Bean

3
mall-shop/src/main/java/com/suisung/mall/shop/config/RedissionConfig.java
View File

@ -26,10 +26,11 @@ public class RedissionConfig {
/**
* 所有对Redisson的使用都是通过RedissonClient
*
* @return
* @throws IOException
*/
@Bean(destroyMethod="shutdown")
@Bean(destroyMethod = "shutdown")
public RedissonClient redisson() throws IOException {
//1、创建配置
Config config = new Config();

4
mall-shop/src/main/java/com/suisung/mall/shop/distribution/service/impl/ShopDistributionUserServiceImpl.java
View File

@ -746,7 +746,7 @@ public class ShopDistributionUserServiceImpl extends BaseServiceImpl<ShopDistrib
if (uploadType.equals(1)) {
url = ConfigConstant.URL_BASE + "/admin/oss/upload/" + dir + "/" + filename; // 文件本地路径
} else if (uploadType.equals(2)){
} else if (uploadType.equals(2)) {
// oss 服务
try {
Map streamMap = OssUtils.toStreamMap(image);
@ -838,7 +838,7 @@ public class ShopDistributionUserServiceImpl extends BaseServiceImpl<ShopDistrib
if (uploadType.equals(1)) {
postUrl = ConfigConstant.URL_BASE + "/admin/oss/upload/" + dir + "/" + filename; // 文件本地路径
} else if (uploadType.equals(2)){
} else if (uploadType.equals(2)) {
// oss 服务
try {
Map streamMap = OssUtils.toStreamMap(bufferedImage);

4
mall-shop/src/main/java/com/suisung/mall/shop/hall/controller/admin/HallPurchaseOrderBaseController.java
View File

@ -75,8 +75,8 @@ public class HallPurchaseOrderBaseController {
@ApiOperation(value = "智客订单-分页列表查询", notes = "智客订单-分页列表查询")
@RequestMapping(value = "/getSupplyOrderList", method = RequestMethod.GET)
public CommonResult getSupplyOrderList(HallSupplyOrderBase supplyOrderBase,
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
return CommonResult.success(supplyOrderBaseService.getSupplyOrderList(supplyOrderBase, pageNum, pageSize));
}
}

1
mall-shop/src/main/java/com/suisung/mall/shop/hall/service/HallSupplyOrderBaseService.java
View File

@ -25,6 +25,7 @@ public interface HallSupplyOrderBaseService extends IBaseService<HallSupplyOrder
/**
* 智客订单-分页列表查询
*
* @param supplyOrderBase
* @param pageNum
* @param pageSize

1
mall-shop/src/main/java/com/suisung/mall/shop/hall/service/impl/HallSupplyOrderBaseServiceImpl.java
View File

@ -136,6 +136,7 @@ public class HallSupplyOrderBaseServiceImpl extends BaseServiceImpl<HallSupplyOr
/**
* 选标 -- 生成订单
*
* @return
*/
@Override

66
mall-shop/src/main/java/com/suisung/mall/shop/order/controller/mobile/UserOrderController.java
View File

@ -116,36 +116,36 @@ public class UserOrderController extends BaseControllerImpl {
@ApiOperation(value = "添加订单详细信息", notes = "添加订单详细信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "ud_id", value = "收货地址编号", paramType = "query", required = true, dataType = "int"),
@ApiImplicitParam(name = "is_edu", value = "是教育", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "is_voucher", value = "是券", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "chain_id", value = "门店编号", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "if_chain", value = "是否自提", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "checked_store", value = "店铺编号", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "ifcart", value = "购物车", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "pfgb_id", value = "pfgb_id", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "activity_id", value = "活动id", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "quantity", value = "数量", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "channel_type", value = "货品类型", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "delivery_type_id", value = "配送方式(ENUM):5-自提; 10-快递;", paramType = "query", required = true, dataType = "int"),
@ApiImplicitParam(name = "checkout_row", value = "", paramType = "body", required = false, dataType = "checkout_row"),
@ApiImplicitParam(name = "user_invoice_id", value = "发票编号", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "cart_id", value = "商品信息(23477|1 : itemId|数量)", paramType = "query", required = true, dataType = "String"),
@ApiImplicitParam(name = "cart_file", value = "文件", paramType = "query", required = false, dataType = "String"),
@ApiImplicitParam(name = "payment_form_id", value = "支付方式(BOOL):1-先预约后支付;0-先支付后预约", paramType = "query", required = true, dataType = "String"),
@ApiImplicitParam(name = "salesperson_id", value = "导购员用户编号", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "order_message", value = "备注", paramType = "query", required = false, dataType = "String"),
@ApiImplicitParam(name = "distributor_user_id", value = "分销商店铺用户编号", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "distributor_id", value = "分销商店铺编号", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "gb_id", value = "拼团编号", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "ac_id", value = "砍价编号", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "source_item_id", value = "是否单品推广", paramType = "query", required = false, dataType = "String"),
@ApiImplicitParam(name = "user_voucher_ids", value = "使用优惠券ids", paramType = "query", required = false, dataType = "String"),
@ApiImplicitParam(name = "order_is_offline", value = "线下订单(BOOL):0-线上;1-线下", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "virtual_service_time", value = "虚拟兑换码使用时间", paramType = "query", required = false, dataType = "String"),
@ApiImplicitParam(name = "virtual_service_date", value = "virtual_service_date", paramType = "query", required = false, dataType = "String"),
@ApiImplicitParam(name = "chain_code_status", value = "虚拟码状态(ENUM): 0-未使用; 1-已使用; 2-冻结", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "kind_id", value = "类型", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "ud_id", value = "收货地址编号", paramType = "query", required = true, dataType = "int"),
@ApiImplicitParam(name = "is_edu", value = "是教育", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "is_voucher", value = "是券", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "chain_id", value = "门店编号", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "if_chain", value = "是否自提", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "checked_store", value = "店铺编号", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "ifcart", value = "购物车", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "pfgb_id", value = "pfgb_id", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "activity_id", value = "活动id", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "quantity", value = "数量", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "channel_type", value = "货品类型", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "delivery_type_id", value = "配送方式(ENUM):5-自提; 10-快递;", paramType = "query", required = true, dataType = "int"),
@ApiImplicitParam(name = "checkout_row", value = "", paramType = "body", required = false, dataType = "checkout_row"),
@ApiImplicitParam(name = "user_invoice_id", value = "发票编号", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "cart_id", value = "商品信息(23477|1 : itemId|数量)", paramType = "query", required = true, dataType = "String"),
@ApiImplicitParam(name = "cart_file", value = "文件", paramType = "query", required = false, dataType = "String"),
@ApiImplicitParam(name = "payment_form_id", value = "支付方式(BOOL):1-先预约后支付;0-先支付后预约", paramType = "query", required = true, dataType = "String"),
@ApiImplicitParam(name = "salesperson_id", value = "导购员用户编号", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "order_message", value = "备注", paramType = "query", required = false, dataType = "String"),
@ApiImplicitParam(name = "distributor_user_id", value = "分销商店铺用户编号", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "distributor_id", value = "分销商店铺编号", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "gb_id", value = "拼团编号", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "ac_id", value = "砍价编号", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "source_item_id", value = "是否单品推广", paramType = "query", required = false, dataType = "String"),
@ApiImplicitParam(name = "user_voucher_ids", value = "使用优惠券ids", paramType = "query", required = false, dataType = "String"),
@ApiImplicitParam(name = "order_is_offline", value = "线下订单(BOOL):0-线上;1-线下", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "virtual_service_time", value = "虚拟兑换码使用时间", paramType = "query", required = false, dataType = "String"),
@ApiImplicitParam(name = "virtual_service_date", value = "virtual_service_date", paramType = "query", required = false, dataType = "String"),
@ApiImplicitParam(name = "chain_code_status", value = "虚拟码状态(ENUM): 0-未使用; 1-已使用; 2-冻结", paramType = "query", required = false, dataType = "int"),
@ApiImplicitParam(name = "kind_id", value = "类型", paramType = "query", required = false, dataType = "int"),
})
@RequestMapping(value = "/add", method = {RequestMethod.POST, RequestMethod.GET})
public CommonResult add() {
@ -273,8 +273,6 @@ public class UserOrderController extends BaseControllerImpl {
Integer chain_id = orderInfo.getChain_id();
Map data = shopUserCartService.addCart(user_id, item_id, cart_quantity, activity_id, activity_item_id, cart_type, chain_id, cart_file);
Boolean cart_id = Convert.toBool(data.get("cart_id"));
if (!cart_id) {
@ -309,8 +307,8 @@ public class UserOrderController extends BaseControllerImpl {
@ApiOperation(value = "我的发票", notes = "我的发票")
@RequestMapping(value = "/listInvoice", method = RequestMethod.GET)
public CommonResult listInvoice(ShopOrderInvoice orderInvoice,
@RequestParam(name = "page", defaultValue = "1") Integer page,
@RequestParam(name = "size", defaultValue = "10") Integer size) {
@RequestParam(name = "page", defaultValue = "1") Integer page,
@RequestParam(name = "size", defaultValue = "10") Integer size) {
QueryWrapper<ShopOrderInvoice> queryWrapper = new QueryWrapper<>();

2
mall-shop/src/main/java/com/suisung/mall/shop/order/controller/mobile/UserReturnController.java
View File

@ -100,7 +100,7 @@ public class UserReturnController extends BaseControllerImpl {
@ApiOperation(value = "退货原因列表", notes = "退货原因列表")
@RequestMapping(value = "/returnReasonList", method = RequestMethod.GET)
public CommonResult returnReasonList(@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
QueryWrapper<ShopOrderReturnReason> queryWrapper = new QueryWrapper<>();
queryWrapper.orderByAsc("return_reason_id");
return CommonResult.success(shopOrderReturnReasonService.lists(queryWrapper, pageNum, pageSize));

2
mall-shop/src/main/java/com/suisung/mall/shop/order/mapper/ShopOrderUserFormMapper.java
View File

@ -12,7 +12,7 @@ import java.util.Map;
/**
* <p>
* Mapper 接口
* Mapper 接口
* </p>
*
* @author Xinze

6
mall-shop/src/main/java/com/suisung/mall/shop/order/service/ShopOrderBaseService.java
View File

@ -27,6 +27,7 @@ public interface ShopOrderBaseService extends IBaseService<ShopOrderBase> {
/**
* 订单状态数量统计
*
* @return
*/
List<Map<String, Object>> statisticState();
@ -262,7 +263,7 @@ public interface ShopOrderBaseService extends IBaseService<ShopOrderBase> {
/**
* 是否可发货
*
* @param order_state_id
* @param order_state_id
* @return
*/
boolean ifShipping(Integer order_state_id);
@ -402,6 +403,7 @@ public interface ShopOrderBaseService extends IBaseService<ShopOrderBase> {
/**
* 完成订单数量统计
*
* @param user_id
* @param store_id
* @param chain_id
@ -436,6 +438,7 @@ public interface ShopOrderBaseService extends IBaseService<ShopOrderBase> {
* @return
*/
boolean receive(List<String> order_ids, List<ShopOrderBase> order_rows);
boolean receive(String order_id, ShopOrderBase orderBase);
/**
@ -484,6 +487,7 @@ public interface ShopOrderBaseService extends IBaseService<ShopOrderBase> {
* @access public
*/
boolean reviewToState(List<String> order_ids, List<Map> order_rows, int to_order_state_id, ShopOrderLogistics orderLogistics);
boolean reviewPickUp(List<String> order_ids, List<Map> order_rows, Integer to_order_state_id, ShopOrderLogistics orderLogistics);
Map listsOrderAndsProduct(Integer pageNum, Integer pageSize);

6
mall-shop/src/main/java/com/suisung/mall/shop/order/service/ShopOrderReturnService.java
View File

@ -48,8 +48,8 @@ public interface ShopOrderReturnService extends IBaseService<ShopOrderReturn> {
/**
* 退单审核
*
* @param return_ids 退单编号
* @param return_rows 退单数据
* @param return_ids 退单编号
* @param return_rows 退单数据
* @param state_id
* @param return_next_state_id
* @return
@ -132,6 +132,7 @@ public interface ShopOrderReturnService extends IBaseService<ShopOrderReturn> {
/**
* 添加退款退货-整单退货
*
* @param order_id
* @return
*/
@ -139,6 +140,7 @@ public interface ShopOrderReturnService extends IBaseService<ShopOrderReturn> {
/**
* 退货单转单-供应商
*
* @param return_id
* @return
*/

11
mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
View File

@ -913,7 +913,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
base_row.put("order_state_name", shopBaseStateCodeService.getText(order_state_id, ObjectUtil.equal(kind_id, StateCode.PRODUCT_KIND_ENTITY) ? "1" : "3"));
if (order_state_id.equals(StateCode.ORDER_STATE_PICKING)
&& order_is_shipped.equals(StateCode.ORDER_SHIPPED_STATE_PART)) {
&& order_is_shipped.equals(StateCode.ORDER_SHIPPED_STATE_PART)) {
base_row.put("order_state_name", "部分发货");
}
@ -3202,6 +3202,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
/**
* 修改订单完成时间和修改付款状态
*
* @param time
* @param order_id_row
*/
@ -3510,7 +3511,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
if (CollectionUtil.isNotEmpty(orderItemList)) {
BigDecimal costPriceTotal = orderItemList.stream().map(ShopOrderItem::getItem_cost_price).reduce(BigDecimal::add).get();
settle_amount= NumberUtil.sub(settle_amount, costPriceTotal);
settle_amount = NumberUtil.sub(settle_amount, costPriceTotal);
}
}
@ -4405,7 +4406,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
settle_amount = NumberUtil.sub(settle_amount, commission_amount);
//供应商成本价扣减
BigDecimal allCostPrice = items.stream().map(s -> Convert.toBigDecimal(s.get("cost_price_total"), BigDecimal.ZERO)).reduce(BigDecimal::add).get();
settle_amount= NumberUtil.sub(settle_amount, allCostPrice);
settle_amount = NumberUtil.sub(settle_amount, allCostPrice);
data.put("settle_amount", settle_amount);
@ -7810,7 +7811,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
} else {
order_info_row.put("order_state_name", shopBaseStateCodeService.getText(order_state_id, null));
if (order_state_id.equals(StateCode.ORDER_STATE_PICKING)
&& order_is_shipped.equals(StateCode.ORDER_SHIPPED_STATE_PART)) {
&& order_is_shipped.equals(StateCode.ORDER_SHIPPED_STATE_PART)) {
order_info_row.put("order_state_name", "部分发货");
}
}
@ -7947,7 +7948,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
if (orderPaymentAmount.get("paymentAmount") == null) {
return BigDecimal.ZERO;
}
return Convert.toBigDecimal(orderPaymentAmount.get("paymentAmount"), BigDecimal.ZERO);
}

2
mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderCommentServiceImpl.java
View File

@ -28,7 +28,7 @@ public class ShopOrderCommentServiceImpl extends BaseServiceImpl<ShopOrderCommen
@Override
public int getCommentCount(Integer store_id) {
QueryWrapper<ShopOrderComment> wrapper = new QueryWrapper<>();
wrapper.eq("store_id",store_id);
wrapper.eq("store_id", store_id);
List<ShopOrderComment> shopOrderComments = shopOrderCommentMapper.selectList(wrapper);
return shopOrderComments.size();
}

2
mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderLogisticsServiceImpl.java
View File

@ -135,7 +135,7 @@ public class ShopOrderLogisticsServiceImpl extends BaseServiceImpl<ShopOrderLogi
// 临时使用，从ERP角度来说，需要加入物流公司信息 shop_store_express_logistics， 传入logistics_id， 根据logistics_id获取express_id等等信息
Integer logistics_id = orderLogistics.getLogistics_id();
// 判断是否需要物流发货
if(CheckUtil.isNotEmpty(logistics_id)) {
if (CheckUtil.isNotEmpty(logistics_id)) {
QueryWrapper<ShopStoreExpressLogistics> logisticsQueryWrapper = new QueryWrapper<>();
logisticsQueryWrapper.eq("logistics_id", logistics_id);
ShopStoreExpressLogistics express_row = shopStoreExpressLogisticsService.findOne(logisticsQueryWrapper);

3
mall-shop/src/main/java/com/suisung/mall/shop/page/controller/admin/ShopPageAppController.java
View File

@ -246,7 +246,8 @@ public class ShopPageAppController extends BaseControllerImpl {
String url = "\"url\":\"//test.lancerdt.com";
String url_new = "\"url\":\"" + ConfigConstant.URL_PC;
String link = "\"link\":\"//test.lancerdt.com";
String link_new = "\"link\":\"" + ConfigConstant.URL_PC;;
String link_new = "\"link\":\"" + ConfigConstant.URL_PC;
;
pm_json = pm_json.replace(url, url_new).replace(link, link_new);
shopPageModule.setPm_json(pm_json);

9
mall-shop/src/main/java/com/suisung/mall/shop/page/service/impl/OssServiceImpl.java
View File

@ -112,7 +112,7 @@ public class OssServiceImpl implements OssService {
// 创建唯一文件名称
String suffix = fileName.substring(fileName.lastIndexOf("."));
String uploadName = IdUtil.simpleUUID() + suffix;
String uploadPath = FILEPATH + "/" + dir + "/" + uploadName;
String uploadPath = FILEPATH + "/" + dir + "/" + uploadName;
String imageAllowExt = configService.getConfig("image_allow_ext", "");
String[] imageAllowExtList = imageAllowExt.split(",");
@ -169,7 +169,7 @@ public class OssServiceImpl implements OssService {
if (uploadType.equals(1)) {
ossUrl = ConfigConstant.URL_BASE + "/admin/oss/upload/" + dir + "/" + uploadName; // 文件本地路径
} else if (uploadType.equals(2)){
} else if (uploadType.equals(2)) {
// oss 服务
try {
ossUrl = uploadObject2OSS(new File(uploadPath), ALIYUN_OSS_DIR_PREFIX.concat("/").concat(dir).concat("/").concat(uploadName), null, null, null);
@ -196,7 +196,7 @@ public class OssServiceImpl implements OssService {
// String cover_path = uploadPath.replace("." + VideoUtil.getVideoFormat(uploadPath), ".jpg");
String cover_upname = uploadName.replace("." + VideoUtil.getVideoFormat(uploadName), ".jpg");
String floder = ALIYUN_OSS_DIR_PREFIX.concat("/") + dir +"/video/frame1/";
String floder = ALIYUN_OSS_DIR_PREFIX.concat("/") + dir + "/video/frame1/";
thumb_file_url = videoUtil.getVideoCoverV2(ossUrl, floder, cover_upname);
/*if (VideoUtil.getVideoCover(uploadPath, cover_path, 1, "375*667")) {
try {
@ -244,7 +244,7 @@ public class OssServiceImpl implements OssService {
// 创建唯一文件名称
String suffix = fileName.substring(fileName.lastIndexOf("."));
String uploadName = IdUtil.simpleUUID() + suffix;
String uploadPath = FILEPATH + "/" + dir + "/" + uploadName;
String uploadPath = FILEPATH + "/" + dir + "/" + uploadName;
String imageAllowExt = configService.getConfig("image_allow_ext", "");
String[] imageAllowExtList = imageAllowExt.split(",");
@ -266,6 +266,7 @@ public class OssServiceImpl implements OssService {
/**
* 腾讯云上传
*
* @param file
* @param concat
* @return

6
mall-shop/src/main/java/com/suisung/mall/shop/page/service/impl/ShopPageAppServiceImpl.java
View File

@ -195,7 +195,7 @@ public class ShopPageAppServiceImpl extends BaseServiceImpl<ShopPageAppMapper, S
view.addObject("page_config", page_config);
view.addObject("app_page_list", app_page_list);
view.addObject("items", page_base.get("items"));
view.addObject("app_member_center",JSONUtil.toJsonStr( page_row_temp));
view.addObject("app_member_center", JSONUtil.toJsonStr(page_row_temp));
view.addObject("authorization", getParameter("authorization"));
view.addObject("URL_BASE", ConfigConstant.URL_BASE);
@ -803,8 +803,8 @@ public class ShopPageAppServiceImpl extends BaseServiceImpl<ShopPageAppMapper, S
List items = (List) app_row.get("items");
// 带登录的轮播
Map indexShufflingMap = new HashMap<>();
indexShufflingMap.put("module_id",8888);
indexShufflingMap.put("module_name","带登录的轮播");
indexShufflingMap.put("module_id", 8888);
indexShufflingMap.put("module_name", "带登录的轮播");
String module_config = "{\"setting\":{\"showMegamenus\":0},\"banner1\":{\"name\":\"FURNITURE\",\"url\":\"//test.lancerdt.com/\",\"picimg\":\"//static.lancerdt.com/pagepreview/data/01_210x210.png\",\"imgSize\":\"210x210\"},\"banner2\":{\"name\":\"FURNITURE\",\"url\":\"//test.lancerdt.com/\",\"picimg\":\"//static.lancerdt.com/pagepreview/data/01_210x210.png\",\"imgSize\":\"210x210\"},\"items\":[{\"url\":\"//test.lancerdt.com/index.php/Product/detail/item_id/1\",\"picimg\":\"//static.lancerdt.com/pagepreview/data/01_1920x453.png\",\"name\":\"商品信息\",\"imgSize\":\"1920x453\",\"bgColor\":\"#fff\"},{\"url\":\"//test.lancerdt.com/index.php/Product/detail/item_id/1\",\"picimg\":\"//static.lancerdt.com/pagepreview/data/02_1920x453.png\",\"name\":\"商品信息\",\"imgSize\":\"1920x453\",\"bgColor\":\"#fff\"}]}";
indexShufflingMap.put("module_config", module_config);
indexShufflingMap.put("module_preview", "https://lancerdt.oss-accelerate.aliyuncs.com/mall/images/media/plantform/20230521/3e84c04b07fc4d4cb9e0ec4dc6d1b00f.png");

2
mall-shop/src/main/java/com/suisung/mall/shop/page/service/impl/ShopPageBaseServiceImpl.java
View File

@ -454,7 +454,7 @@ public class ShopPageBaseServiceImpl extends BaseServiceImpl<ShopPageBaseMapper,
// {
// }
BigDecimal int_item_unit_price = item_unit_price.compareTo(BigDecimal.ZERO) > 0 ? NumberUtil.mul(item_unit_price, currency_exchange_rate): BigDecimal.ZERO;
BigDecimal int_item_unit_price = item_unit_price.compareTo(BigDecimal.ZERO) > 0 ? NumberUtil.mul(item_unit_price, currency_exchange_rate) : BigDecimal.ZERO;
BigDecimal round_item_sale_price = NumberUtil.round(NumberUtil.mul(itemSalePrice, currency_exchange_rate), 2);
Integer int_item_unit_points = item_unit_points.compareTo(BigDecimal.ZERO) > 0 ? NumberUtil.mul(item_unit_points, currency_exchange_rate).intValue() : 0;
Integer int_item_unit_sp = item_unit_sp.compareTo(BigDecimal.ZERO) > 0 ? NumberUtil.mul(item_unit_sp, currency_exchange_rate).intValue() : 0;

5
mall-shop/src/main/java/com/suisung/mall/shop/page/utis/VideoUtil.java
View File

@ -220,8 +220,9 @@ public class VideoUtil {
/**
* 截取视频第一帧，此方法无需配置系统环境
* @param video 视频文件
* @param dir 图片文件地址
*
* @param video 视频文件
* @param dir 图片文件地址
* @param uploadName 图片文件名称
* @return
*/

3
mall-shop/src/main/java/com/suisung/mall/shop/plantform/service/impl/ShopPlantformSubsiteServiceImpl.java
View File

@ -113,8 +113,7 @@ public class ShopPlantformSubsiteServiceImpl extends BaseServiceImpl<ShopPlantfo
if (CheckUtil.isNotEmpty(user_is_admin)) {
throw new ApiException(I18nUtil._("设定的分站管理员已经为管理员身份！"));
}
}
else {
} else {
//修改分站
QueryWrapper<ShopPlantformSubsiteUser> queryWrapper = new QueryWrapper();
queryWrapper.eq("subsite_id", subsite_id);

17
mall-shop/src/main/java/com/suisung/mall/shop/printing/controller/mobile/DemoController.java
View File

@ -1,21 +1,28 @@
package com.suisung.mall.shop.printing.controller.mobile;
import com.suisung.mall.shop.printing.utis.FeieUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.ws.rs.*;
@Api(tags = "店铺打印业务")
@RestController
@RequestMapping("/admin/shop/printing")
@RequestMapping("/mobile/shop/printing")
public class DemoController {
@ApiOperation(value = "店铺添加打票机", notes = "店铺添加打票机")
@RequestMapping(value = "/add/printers", method = {RequestMethod.POST,RequestMethod.GET})
@RequestMapping(value = "/add/printers", method = {RequestMethod.POST, RequestMethod.GET})
public String addPrinters() {
return "Hello, World!";
String snlist = "922441475#r6ZXPvHH#核销柜台";
return FeieUtil.addprinter(snlist);
}
@ApiOperation(value = "店铺添加打票机", notes = "店铺添加打票机")
@RequestMapping(value = "/print/order", method = {RequestMethod.POST, RequestMethod.GET})
public String printOrder() {
return FeieUtil.print("922441475");
}
}

437
mall-shop/src/main/java/com/suisung/mall/shop/printing/utis/FeieUtil.java Normal file
View File

@ -0,0 +1,437 @@
package com.suisung.mall.shop.printing.utis;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.util.EntityUtils;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
public class FeieUtil {
public static final String URL = "http://api.feieyun.cn/Api/Open/";//不需要修改
public static final String USER = "46790855@qq.com";//*必填*：账号名
public static final String UKEY = "5NIBL2gWV5yqZDUN";//*必填*: 飞鹅云后台注册账号后生成的UKEY 【备注：这不是填打印机的KEY】
public static final String SN = "922441475";//*必填*：打印机编号，必须要在管理后台里添加打印机或调用API接口添加之后，才能调用API
//=====================以下是函数实现部分================================================
public static String addprinter(String snlist) {
//通过POST请求，发送打印信息到服务器
RequestConfig requestConfig = RequestConfig.custom()
.setSocketTimeout(30000)//读取超时
.setConnectTimeout(30000)//连接超时
.build();
CloseableHttpClient httpClient = HttpClients.custom()
.setDefaultRequestConfig(requestConfig)
.build();
HttpPost post = new HttpPost(URL);
List<NameValuePair> nvps = new ArrayList<NameValuePair>();
nvps.add(new BasicNameValuePair("user", USER));
String STIME = String.valueOf(System.currentTimeMillis() / 1000);
nvps.add(new BasicNameValuePair("stime", STIME));
nvps.add(new BasicNameValuePair("sig", signature(USER, UKEY, STIME)));
nvps.add(new BasicNameValuePair("apiname", "Open_printerAddlist"));//固定值,不需要修改
nvps.add(new BasicNameValuePair("printerContent", snlist));
CloseableHttpResponse response = null;
String result = null;
try {
post.setEntity(new UrlEncodedFormEntity(nvps, "utf-8"));
response = httpClient.execute(post);
int statecode = response.getStatusLine().getStatusCode();
if (statecode == 200) {
HttpEntity httpentity = response.getEntity();
if (httpentity != null) {
result = EntityUtils.toString(httpentity);
}
}
} catch (Exception e) {
e.printStackTrace();
} finally {
try {
if (response != null) {
response.close();
}
} catch (IOException e) {
e.printStackTrace();
}
try {
post.abort();
} catch (Exception e) {
e.printStackTrace();
}
try {
httpClient.close();
} catch (IOException e) {
e.printStackTrace();
}
}
return result;
}
//方法1
public static String print(String sn) {
//标签说明：
//单标签:
//"<BR>"为换行,"<CUT>"为切刀指令(主动切纸,仅限切刀打印机使用才有效果)
//"<LOGO>"为打印LOGO指令(前提是预先在机器内置LOGO图片),"<PLUGIN>"为钱箱或者外置音响指令
//成对标签：
//"<CB></CB>"为居中放大一倍,"<B></B>"为放大一倍,"<C></C>"为居中,<L></L>字体变高一倍
//<W></W>字体变宽一倍,"<QR></QR>"为二维码,"<BOLD></BOLD>"为字体加粗,"<RIGHT></RIGHT>"为右对齐
//拼凑订单内容时可参考如下格式
//根据打印纸张的宽度，自行调整内容的格式，可参考下面的样例格式
String content;
content = "<CB>测试打印</CB><BR>";
content += "名称　　　　　 单价 数量 金额<BR>";
content += "--------------------------------<BR>";
content += "饭　　　　　　 1.0 1 1.0<BR>";
content += "炒饭　　　　　 10.0 10 10.0<BR>";
content += "蛋炒饭　　　　 10.0 10 100.0<BR>";
content += "鸡蛋炒饭　　　 100.0 1 100.0<BR>";
content += "番茄蛋炒饭　　 1000.0 1 100.0<BR>";
content += "西红柿蛋炒饭　 1000.0 1 100.0<BR>";
content += "西红柿鸡蛋炒饭 100.0 10 100.0<BR>";
content += "备注：加辣<BR>";
content += "--------------------------------<BR>";
content += "合计：xx.0元<BR>";
content += "送货地点：广州市南沙区xx路xx号<BR>";
content += "联系电话：13888888888888<BR>";
content += "订餐时间：2016-08-08 08:08:08<BR>";
content += "<QR>http://www.dzist.com</QR>";
//通过POST请求，发送打印信息到服务器
RequestConfig requestConfig = RequestConfig.custom()
.setSocketTimeout(30000)//读取超时
.setConnectTimeout(30000)//连接超时
.build();
CloseableHttpClient httpClient = HttpClients.custom()
.setDefaultRequestConfig(requestConfig)
.build();
HttpPost post = new HttpPost(URL);
List<NameValuePair> nvps = new ArrayList<NameValuePair>();
nvps.add(new BasicNameValuePair("user", USER));
String STIME = String.valueOf(System.currentTimeMillis() / 1000);
nvps.add(new BasicNameValuePair("stime", STIME));
nvps.add(new BasicNameValuePair("sig", signature(USER, UKEY, STIME)));
nvps.add(new BasicNameValuePair("apiname", "Open_printMsg"));//固定值,不需要修改
nvps.add(new BasicNameValuePair("sn", sn));
nvps.add(new BasicNameValuePair("content", content));
nvps.add(new BasicNameValuePair("times", "1"));//打印联数
CloseableHttpResponse response = null;
String result = null;
try {
post.setEntity(new UrlEncodedFormEntity(nvps, "utf-8"));
response = httpClient.execute(post);
int statecode = response.getStatusLine().getStatusCode();
if (statecode == 200) {
HttpEntity httpentity = response.getEntity();
if (httpentity != null) {
//服务器返回的JSON字符串，建议要当做日志记录起来
result = EntityUtils.toString(httpentity);
}
}
} catch (Exception e) {
e.printStackTrace();
} finally {
try {
if (response != null) {
response.close();
}
} catch (IOException e) {
e.printStackTrace();
}
try {
post.abort();
} catch (Exception e) {
e.printStackTrace();
}
try {
httpClient.close();
} catch (IOException e) {
e.printStackTrace();
}
}
return result;
}
//方法2
public static String printLabelMsg(String sn) {
String content;
content = "<DIRECTION>1</DIRECTION>";//设定打印时出纸和打印字体的方向，n 0 或 1，每次设备重启后都会初始化为 0 值设置，1：正向出纸，0：反向出纸，
content += "<TEXT x='9' y='10' font='12' w='1' h='2' r='0'>#001 五号桌 1/3</TEXT><TEXT x='80' y='80' font='12' w='2' h='2' r='0'>可乐鸡翅</TEXT><TEXT x='9' y='180' font='12' w='1' h='1' r='0'>张三先生 13800138000</TEXT>";//40mm宽度标签纸打印例子，打开注释调用标签打印接口打印
//通过POST请求，发送打印信息到服务器
RequestConfig requestConfig = RequestConfig.custom()
.setSocketTimeout(30000)//读取超时
.setConnectTimeout(30000)//连接超时
.build();
CloseableHttpClient httpClient = HttpClients.custom()
.setDefaultRequestConfig(requestConfig)
.build();
HttpPost post = new HttpPost(URL);
List<NameValuePair> nvps = new ArrayList<NameValuePair>();
nvps.add(new BasicNameValuePair("user", USER));
String STIME = String.valueOf(System.currentTimeMillis() / 1000);
nvps.add(new BasicNameValuePair("stime", STIME));
nvps.add(new BasicNameValuePair("sig", signature(USER, UKEY, STIME)));
nvps.add(new BasicNameValuePair("apiname", "Open_printLabelMsg"));//固定值,不需要修改
nvps.add(new BasicNameValuePair("sn", sn));
nvps.add(new BasicNameValuePair("content", content));
nvps.add(new BasicNameValuePair("times", "1"));//打印联数
CloseableHttpResponse response = null;
String result = null;
try {
post.setEntity(new UrlEncodedFormEntity(nvps, "utf-8"));
response = httpClient.execute(post);
int statecode = response.getStatusLine().getStatusCode();
if (statecode == 200) {
HttpEntity httpentity = response.getEntity();
if (httpentity != null) {
//服务器返回的JSON字符串，建议要当做日志记录起来
result = EntityUtils.toString(httpentity);
}
}
} catch (Exception e) {
e.printStackTrace();
} finally {
try {
if (response != null) {
response.close();
}
} catch (IOException e) {
e.printStackTrace();
}
try {
post.abort();
} catch (Exception e) {
e.printStackTrace();
}
try {
httpClient.close();
} catch (IOException e) {
e.printStackTrace();
}
}
return result;
}
//方法3
public static String queryOrderState(String orderid) {
//通过POST请求，发送打印信息到服务器
RequestConfig requestConfig = RequestConfig.custom()
.setSocketTimeout(30000)//读取超时
.setConnectTimeout(30000)//连接超时
.build();
CloseableHttpClient httpClient = HttpClients.custom()
.setDefaultRequestConfig(requestConfig)
.build();
HttpPost post = new HttpPost(URL);
List<NameValuePair> nvps = new ArrayList<NameValuePair>();
nvps.add(new BasicNameValuePair("user", USER));
String STIME = String.valueOf(System.currentTimeMillis() / 1000);
nvps.add(new BasicNameValuePair("stime", STIME));
nvps.add(new BasicNameValuePair("sig", signature(USER, UKEY, STIME)));
nvps.add(new BasicNameValuePair("apiname", "Open_queryOrderState"));//固定值,不需要修改
nvps.add(new BasicNameValuePair("orderid", orderid));
CloseableHttpResponse response = null;
String result = null;
try {
post.setEntity(new UrlEncodedFormEntity(nvps, "utf-8"));
response = httpClient.execute(post);
int statecode = response.getStatusLine().getStatusCode();
if (statecode == 200) {
HttpEntity httpentity = response.getEntity();
if (httpentity != null) {
//服务器返回
result = EntityUtils.toString(httpentity);
}
}
} catch (Exception e) {
e.printStackTrace();
} finally {
try {
if (response != null) {
response.close();
}
} catch (IOException e) {
e.printStackTrace();
}
try {
post.abort();
} catch (Exception e) {
e.printStackTrace();
}
try {
httpClient.close();
} catch (IOException e) {
e.printStackTrace();
}
}
return result;
}
//方法4
public static String queryOrderInfoByDate(String sn, String strdate) {
//通过POST请求，发送打印信息到服务器
RequestConfig requestConfig = RequestConfig.custom()
.setSocketTimeout(30000)//读取超时
.setConnectTimeout(30000)//连接超时
.build();
CloseableHttpClient httpClient = HttpClients.custom()
.setDefaultRequestConfig(requestConfig)
.build();
HttpPost post = new HttpPost(URL);
List<NameValuePair> nvps = new ArrayList<NameValuePair>();
nvps.add(new BasicNameValuePair("user", USER));
String STIME = String.valueOf(System.currentTimeMillis() / 1000);
nvps.add(new BasicNameValuePair("stime", STIME));
nvps.add(new BasicNameValuePair("sig", signature(USER, UKEY, STIME)));
nvps.add(new BasicNameValuePair("apiname", "Open_queryOrderInfoByDate"));//固定值,不需要修改
nvps.add(new BasicNameValuePair("sn", sn));
nvps.add(new BasicNameValuePair("date", strdate));//yyyy-MM-dd格式
CloseableHttpResponse response = null;
String result = null;
try {
post.setEntity(new UrlEncodedFormEntity(nvps, "utf-8"));
response = httpClient.execute(post);
int statecode = response.getStatusLine().getStatusCode();
if (statecode == 200) {
HttpEntity httpentity = response.getEntity();
if (httpentity != null) {
//服务器返回
result = EntityUtils.toString(httpentity);
}
}
} catch (Exception e) {
e.printStackTrace();
} finally {
try {
if (response != null) {
response.close();
}
} catch (IOException e) {
e.printStackTrace();
}
try {
post.abort();
} catch (Exception e) {
e.printStackTrace();
}
try {
httpClient.close();
} catch (IOException e) {
e.printStackTrace();
}
}
return result;
}
//方法5
private static String queryPrinterStatus(String sn) {
//通过POST请求，发送打印信息到服务器
RequestConfig requestConfig = RequestConfig.custom()
.setSocketTimeout(30000)//读取超时
.setConnectTimeout(30000)//连接超时
.build();
CloseableHttpClient httpClient = HttpClients.custom()
.setDefaultRequestConfig(requestConfig)
.build();
HttpPost post = new HttpPost(URL);
List<NameValuePair> nvps = new ArrayList<NameValuePair>();
nvps.add(new BasicNameValuePair("user", USER));
String STIME = String.valueOf(System.currentTimeMillis() / 1000);
nvps.add(new BasicNameValuePair("stime", STIME));
nvps.add(new BasicNameValuePair("sig", signature(USER, UKEY, STIME)));
nvps.add(new BasicNameValuePair("apiname", "Open_queryPrinterStatus"));//固定值,不需要修改
nvps.add(new BasicNameValuePair("sn", sn));
CloseableHttpResponse response = null;
String result = null;
try {
post.setEntity(new UrlEncodedFormEntity(nvps, "utf-8"));
response = httpClient.execute(post);
int statecode = response.getStatusLine().getStatusCode();
if (statecode == 200) {
HttpEntity httpentity = response.getEntity();
if (httpentity != null) {
//服务器返回
result = EntityUtils.toString(httpentity);
}
}
} catch (Exception e) {
e.printStackTrace();
} finally {
try {
if (response != null) {
response.close();
}
} catch (IOException e) {
e.printStackTrace();
}
try {
post.abort();
} catch (Exception e) {
e.printStackTrace();
}
try {
httpClient.close();
} catch (IOException e) {
e.printStackTrace();
}
}
return result;
}
//生成签名字符串
private static String signature(String USER, String UKEY, String STIME) {
String s = DigestUtils.sha1Hex(USER + UKEY + STIME);
return s;
}
}

3
mall-shop/src/main/java/com/suisung/mall/shop/product/controller/admin/ShopController.java
View File

@ -274,8 +274,7 @@ public class ShopController {
try {
ShopDistributionUserCommission one = commissionService.get(shopDistributionUserCommission.getUser_id());
if (one != null)
{
if (one != null) {
one.setCommission_settled(NumberUtil.sub(one.getCommission_settled(), shopDistributionUserCommission.getCommission_settled()));
flag = commissionService.saveOrUpdate(one);
}

5
mall-shop/src/main/java/com/suisung/mall/shop/product/controller/admin/ShopPageUserFormController.java
View File

@ -27,7 +27,6 @@ public class ShopPageUserFormController {
private ShopPageUserFormService shopPageUserFormService;
/**
*
* @param shopPageUserForm
* @param pageNum
* @param pageSize
@ -39,7 +38,7 @@ public class ShopPageUserFormController {
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
QueryWrapper<ShopPageUserForm> shopPageUserFormWrapper = new QueryWrapper<>();
return CommonResult.success(shopPageUserFormService.lists(shopPageUserFormWrapper,pageNum, pageSize));
return CommonResult.success(shopPageUserFormService.lists(shopPageUserFormWrapper, pageNum, pageSize));
}
/**
@ -64,7 +63,7 @@ public class ShopPageUserFormController {
@ApiOperation(value = "用户试驾信息采集服务表-删除", notes = "用户试驾信息采集服务表-删除")
@RequestMapping(value = "/delete", method = RequestMethod.POST)
public CommonResult delete(@RequestParam(name = "id") String id) {
return CommonResult.success(shopPageUserFormService.remove(id)) ;
return CommonResult.success(shopPageUserFormService.remove(id));
}
}

6
mall-shop/src/main/java/com/suisung/mall/shop/product/controller/mobile/ShopProductBaseController.java
View File

@ -80,9 +80,9 @@ public class ShopProductBaseController extends BaseControllerImpl {
@ApiOperation(value = "猜你喜欢", notes = "猜你喜欢")
@RequestMapping(value = "/recommend", method = RequestMethod.GET)
public CommonResult recommend(
@RequestParam(name = "product_id") Long product_id,
@RequestParam(name = "curpage", defaultValue = "1", required = false) Integer pageNum,
@RequestParam(name = "rows", defaultValue = "10", required = false) Integer pageSize) {
@RequestParam(name = "product_id") Long product_id,
@RequestParam(name = "curpage", defaultValue = "1", required = false) Integer pageNum,
@RequestParam(name = "rows", defaultValue = "10", required = false) Integer pageSize) {
return CommonResult.success(shopProductBaseService.recommend(product_id, pageNum, pageSize));
}

14
mall-shop/src/main/java/com/suisung/mall/shop/product/service/ShopProductBaseService.java
View File

@ -148,10 +148,10 @@ public interface ShopProductBaseService extends IBaseService<ShopProductBase> {
* 数据库查询商品
*
* @param queryWrapper 商品编号分页数据
* @param page 当前页码
* @param rows 每页显示记录数
* @param show_type SPU/SKU
* @param chain_id 门店编号
* @param page 当前页码
* @param rows 每页显示记录数
* @param show_type SPU/SKU
* @param chain_id 门店编号
* @access public
*/
Map listProduct(QueryWrapper<ShopProductIndex> queryWrapper, Integer page, Integer rows, String show_type, Integer chain_id);
@ -168,8 +168,8 @@ public interface ShopProductBaseService extends IBaseService<ShopProductBase> {
* 显示商品列表
*
* @param productIdPage 商品编号分页数据
* @param show_type SPU/SKU
* @param chain_id 门店编号
* @param show_type SPU/SKU
* @param chain_id 门店编号
* @access public
*/
Map listProduct(Page<Serializable> productIdPage, String show_type, Integer chain_id);
@ -234,6 +234,7 @@ public interface ShopProductBaseService extends IBaseService<ShopProductBase> {
/**
* 供应商分销复制产品-批量分销
*
* @param product_ids
* @param store_id
* @return
@ -242,6 +243,7 @@ public interface ShopProductBaseService extends IBaseService<ShopProductBase> {
/**
* 同步修改分销商品
*
* @param product_src_id
* @return
*/

6
mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductAnalyticsServiceImpl.java
View File

@ -44,8 +44,7 @@ public class ShopProductAnalyticsServiceImpl extends BaseServiceImpl<ShopProduct
@Override
public Map getAnalytics(Long product_id) {
ShopProductAnalytics product_analytics = get(product_id);
if (ObjectUtil.isNull(product_analytics))
{
if (ObjectUtil.isNull(product_analytics)) {
//初始化兼容
product_analytics = new ShopProductAnalytics();
product_analytics.setProduct_id(product_id);
@ -68,8 +67,7 @@ public class ShopProductAnalyticsServiceImpl extends BaseServiceImpl<ShopProduct
for (int k = 0; k < product_ids.size(); k++) {
Long product_id = product_ids.get(k);
if (!product_id_row.contains(product_id))
{
if (!product_id_row.contains(product_id)) {
//初始化兼容
ShopProductAnalytics product_analytics = new ShopProductAnalytics();
product_analytics.setProduct_id(product_id);

2
mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductAskBaseServiceImpl.java
View File

@ -49,7 +49,7 @@ public class ShopProductAskBaseServiceImpl extends BaseServiceImpl<ShopProductAs
UserDto user = getCurrentUser();
QueryWrapper<ShopProductAskBase> wrapper = new QueryWrapper<>();
if (user!=null && !user.isPlatform()) {
if (user != null && !user.isPlatform()) {
Integer store_id = Convert.toInt(user.getStore_id());
wrapper.eq("store_id", store_id);
}

2
mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java
View File

@ -1502,7 +1502,7 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl<ShopProductBaseM
boolean img_search_enable = accountBaseConfigService.getConfig("img_search_enable", false);
if (img_search_enable && CheckUtil.isNotEmpty(productSearchDTO.getProduct_img_url())) {
try {
List<Map> product_contsign_map = BaiduAi.searchProductImg(productSearchDTO.getProduct_img_url(), productSearchDTO.getPage()-1, productSearchDTO.getRows());
List<Map> product_contsign_map = BaiduAi.searchProductImg(productSearchDTO.getProduct_img_url(), productSearchDTO.getPage() - 1, productSearchDTO.getRows());
//List<String> contsigns = product_contsign_map.stream().map(s -> Convert.toStr(s.get("cont_sign"))).distinct().collect(Collectors.toList());
List<String> contsigns = new ArrayList<>();

1
mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductCommentServiceImpl.java
View File

@ -543,6 +543,7 @@ public class ShopProductCommentServiceImpl extends BaseServiceImpl<ShopProductCo
/**
* 获取用户已评论的订单数量
*
* @param user_id
* @return
*/

70
mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductItemServiceImpl.java
View File

@ -207,7 +207,7 @@ public class ShopProductItemServiceImpl extends BaseServiceImpl<ShopProductItemM
@Autowired
private ThreadPoolExecutor executor;
@Override
public Map detail(Map params) {
@ -283,7 +283,7 @@ public class ShopProductItemServiceImpl extends BaseServiceImpl<ShopProductItemM
if (CheckUtil.isNotEmpty(comment_flag)) {
item_row.put("last_comment_row", new ArrayList<>());
item_row.put("last_comment_rows", new ArrayList<>());
QueryWrapper<ShopProductComment> commentQueryWrapper = new QueryWrapper<>();
commentQueryWrapper.eq("product_id", final_product_id).eq("comment_enable", 1).orderByDesc("comment_id");
List<ShopProductComment> productCommentList = shopProductCommentService.lists(commentQueryWrapper, 1, 5).getRecords();
@ -310,13 +310,13 @@ public class ShopProductItemServiceImpl extends BaseServiceImpl<ShopProductItemM
item_row.put("contractlist", contractTypes);
}
// 读取辅助属性，在详情地方显示
QueryWrapper<ShopProductAssistIndex> assistQueryWrapper = new QueryWrapper<>();
assistQueryWrapper.eq("product_id", final_product_id);
List<ShopProductAssistIndex> assistIndexList = shopProductAssistIndexService.find(assistQueryWrapper);
List<Map> product_assist_index_rows = Convert.toList(Map.class, assistIndexList);
List<Integer> assist_ids = new ArrayList<>();
List<Integer> assist_item_ids = new ArrayList<>();
if (CollUtil.isNotEmpty(product_assist_index_rows)) {
@ -328,10 +328,10 @@ public class ShopProductItemServiceImpl extends BaseServiceImpl<ShopProductItemM
assist_item_ids.addAll(assist_item_id_List);
}
});
List<ShopBaseProductAssist> assistList = assistService.gets(assist_ids);
List<ShopBaseProductAssistItem> assistItemList = assistItemService.gets(assist_item_ids);
product_assist_index_rows.forEach(product_assist_index_row -> {
if (ObjectUtil.isNotEmpty(product_assist_index_row.get("assist_item_id")) && !"0".equals(product_assist_index_row.get("assist_item_id").toString())) {
Integer assist_id = Convert.toInt(product_assist_index_row.get("assist_id"));
@ -340,7 +340,7 @@ public class ShopProductItemServiceImpl extends BaseServiceImpl<ShopProductItemM
ShopBaseProductAssist assist = assistOpl.get();
product_assist_index_row.put("assist_name", assist.getAssist_name());
}
List<String> assist_item_name = new ArrayList<>();
String str_assist_id = Convert.toStr(product_assist_index_row.get("assist_item_id"));
List<Integer> assist_item_id_List = Arrays.stream(str_assist_id.split(",")).map(Integer::parseInt).collect(Collectors.toList());
@ -355,7 +355,7 @@ public class ShopProductItemServiceImpl extends BaseServiceImpl<ShopProductItemM
}
});
}
item_row.put("product_assist_index_rows", product_assist_index_rows);
}, executor);
@ -378,18 +378,18 @@ public class ShopProductItemServiceImpl extends BaseServiceImpl<ShopProductItemM
}
item_row.put("product_tag_names", names);
}
// 设置课程信息
Map course = shopProductItemService.getCourseData(final_product_id);
Integer user_id = Convert.toInt(course.get("user_id"));
AccountUserBase userBase = accountService.getUserBase(user_id);
AccountUserInfo userInfo = accountService.getUserInfo(user_id);
course.put("user_nickname", userBase.getUser_nickname());
course.put("user_avatar", userInfo.getUser_avatar());
item_row.put("course", course);
//空数据配送区域信息, 维持前端一致
Map product_freight_info = new HashMap();
product_freight_info.put("district_info", _("上海市/上海市"));
@ -403,10 +403,10 @@ public class ShopProductItemServiceImpl extends BaseServiceImpl<ShopProductItemM
// todo 状态正常、可配送区域、商品数量
Map product_freight_info = shopProductBaseService.getProductFreightInfo(item_row, district_id);
data.put("product_freight_info", product_freight_info);
data.put("cat", new ArrayList<>());
Integer category_id = Convert.toInt(item_row.get("category_id"));
if (ObjectUtil.isNotNull(category_id)) {
// 读取上级分类信息
List<ShopBaseProductCategory> parentCategoryListById = shopBaseProductCategoryService.getParentCategory(category_id);
@ -431,7 +431,7 @@ public class ShopProductItemServiceImpl extends BaseServiceImpl<ShopProductItemM
data.put("goods_commend_list", new ArrayList<>());
Integer multishop_enable = accountBaseConfigService.getConfig("multishop_enable", 0);
// 店铺数据
Integer storeId = Convert.toInt(item_row.get("store_id"));
ShopStoreBase shopStoreBase = shopStoreBaseService.get(storeId);
@ -439,20 +439,20 @@ public class ShopProductItemServiceImpl extends BaseServiceImpl<ShopProductItemM
ShopStoreAnalytics shopStoreAnalytics = shopStoreAnalyticsService.get(storeId);
Map analytics_row = (Map) item_row.get("analytics_row");
//是否为商家后台访问
if (null == user || !(user.isAdmin())) {
//虚拟销量
Integer product_virtual_salenum = accountBaseConfigService.getConfig("product_virtual_salenum", 0);
if (product_virtual_salenum.compareTo(0) > 0) {
int add_num_id = CheckUtil.bkdrHash(analytics_row.get("product_id").toString());
int add_num = add_num_id % product_virtual_salenum.intValue();
analytics_row.put("product_sale_num", Convert.toInt(analytics_row.get("product_sale_num")).intValue() + add_num);
}
}
Map baseMap = Convert.toMap(String.class, Object.class, shopStoreBase);
Map analyticsMap = Convert.toMap(String.class, Object.class, shopStoreAnalytics);
if (analyticsMap != null) {
@ -471,17 +471,17 @@ public class ShopProductItemServiceImpl extends BaseServiceImpl<ShopProductItemM
baseMap.put("store_close_hours", store_close_hours);
}
}
Integer im_enable = accountBaseConfigService.getConfig("im_enable", 0);
baseMap.put("im_chat", im_enable);
data.put("product_analytics", analytics_row);
data.put("store_info", baseMap);
data.put("multishop_enable", multishop_enable);
data.put("is_had_bought", 0);
// 收藏标记
data.put("is_favorite", 0);
if (CheckUtil.isNotEmpty(userId)) {
QueryWrapper<ShopUserFavoritesItem> fQueryWrapper = new QueryWrapper<>();
fQueryWrapper.eq("user_id", userId).eq("item_id", final_item_id);
@ -492,20 +492,20 @@ public class ShopProductItemServiceImpl extends BaseServiceImpl<ShopProductItemM
data.put("is_favorite", 1);
}
}
// 用户信息
Map store_info = Convert.toMap(String.class, Object.class, data.get("store_info"));
Integer user_id = Convert.toInt(store_info.get("user_id"));
AccountUserInfo user_info = accountService.getUserInfo(user_id);
data.put("user_info", user_info);
// 客服信息
Integer store_id_info = Convert.toInt(store_info.get("store_id"));
QueryWrapper<ShopStoreCustomService> serviceQueryWrapper = new QueryWrapper<>();
serviceQueryWrapper.eq("store_id", store_id_info).eq("custom_service_enable", 1);
List<ShopStoreCustomService> custom_service_rows = shopStoreCustomServiceService.find(serviceQueryWrapper);
store_info.put("custom_service_rows", custom_service_rows);
// 是否是合伙人
if (CheckUtil.isNotEmpty(userId)) {
ShopDistributionUser distribution_row = shopDistributionUserService.get(userId);
@ -513,7 +513,7 @@ public class ShopProductItemServiceImpl extends BaseServiceImpl<ShopProductItemM
data.put("user_is_pt", distribution_row.getUser_is_pt());
}
}
// 商品SEO设置
/*String typ = (String) params.get("typ");
if (StrUtil.isNotBlank(typ) && "e".equals(typ)) {
@ -533,7 +533,7 @@ public class ShopProductItemServiceImpl extends BaseServiceImpl<ShopProductItemM
// todo setKeywords
// todo setDescription
}*/
// 判断是否有优惠套餐
Integer activity_type_id = Convert.toInt(item_row.get("activity_type_id"));
if (activity_type_id != null && ObjectUtil.equal(activity_type_id, StateCode.ACTIVITY_TYPE_DISCOUNT_PACKAGE)) {
@ -547,7 +547,7 @@ public class ShopProductItemServiceImpl extends BaseServiceImpl<ShopProductItemM
// 套餐商品存在
if (discount != null) {
item_row.put("package_item_rows", package_item_rows);
// 套餐原价
for (Map package_item_row : package_item_rows) {
BigDecimal item_unit_price = Convert.toBigDecimal(package_item_row.get("item_unit_price"), BigDecimal.ZERO);
@ -555,7 +555,7 @@ public class ShopProductItemServiceImpl extends BaseServiceImpl<ShopProductItemM
}
}
buy.put("original_price", original_price);
BigDecimal subtotal = Convert.toBigDecimal(buy.get("subtotal"), BigDecimal.ZERO);
buy.put("spare_price", NumberUtil.sub(original_price, subtotal));
}
@ -1098,23 +1098,23 @@ public class ShopProductItemServiceImpl extends BaseServiceImpl<ShopProductItemM
// 剔除或者选中
String tradeTypes = getParameter("tradeTypes");
if (CheckUtil.isNotEmpty(tradeTypes)){
if (CheckUtil.isNotEmpty(tradeTypes)) {
param.put("tradeTypes", tradeTypes);
}
String brand_id = getParameter("brand_id");
if (CheckUtil.isNotEmpty(brand_id)){
if (CheckUtil.isNotEmpty(brand_id)) {
param.put("brand_id", brand_id);
}
Integer kind_id = getParameter("kind_id", Integer.class);
if (CheckUtil.isNotEmpty(kind_id)){
if (CheckUtil.isNotEmpty(kind_id)) {
param.put("kind_id", kind_id);
}
//商品状态
String product_state_id = getParameter("product_state_id");
if (CheckUtil.isNotEmpty(product_state_id)){
if (CheckUtil.isNotEmpty(product_state_id)) {
param.put("product_state_id", product_state_id);
}
@ -1810,6 +1810,7 @@ public class ShopProductItemServiceImpl extends BaseServiceImpl<ShopProductItemM
/**
* 来自商品分类传入数据
*
* @param productVo
* @return
*/
@ -1887,7 +1888,7 @@ public class ShopProductItemServiceImpl extends BaseServiceImpl<ShopProductItemM
val.put("product_item_name", product_item_name);
} else {
val.put("product_item_name", product_name);
}
}
val.put("spec_info", item_spec_name);
val.put("item_name", item_name);
@ -2224,6 +2225,7 @@ public class ShopProductItemServiceImpl extends BaseServiceImpl<ShopProductItemM
/**
* 锁定库存
*
* @param itemId
* @param cart_quantity
* @return

4
mall-shop/src/main/java/com/suisung/mall/shop/store/controller/mobile/ShopStoreActivityBaseController.java
View File

@ -64,14 +64,14 @@ public class ShopStoreActivityBaseController {
@RequestParam(name = "page", defaultValue = "1") Integer page,
@RequestParam(name = "item_id", required = false) Long item_id,
@RequestParam(name = "rows", defaultValue = "100") Integer rows,
@RequestParam(name = "activity_type" ,defaultValue = "0") Integer activity_type,
@RequestParam(name = "activity_type", defaultValue = "0") Integer activity_type,
@RequestParam(name = "met", required = false) String met) {
Map params = new HashMap<>();
params.put("store_id", store_id);
params.put("page", page);
params.put("rows", rows);
params.put("met", met);
if(CheckUtil.isNotEmpty(activity_type)){
if (CheckUtil.isNotEmpty(activity_type)) {
params.put("activity_type", activity_type);
}

2
mall-shop/src/main/java/com/suisung/mall/shop/store/controller/mobile/StoreController.java
View File

@ -173,7 +173,7 @@ public class StoreController extends BaseControllerImpl {
@RequestMapping(value = "/editAddress", method = RequestMethod.GET)
public CommonResult editAddress(ShopStoreShippingAddress shopStoreShippingAddress) {
if (!PhoneUtil.isMobile(shopStoreShippingAddress.getSs_mobile())){
if (!PhoneUtil.isMobile(shopStoreShippingAddress.getSs_mobile())) {
throw new ApiException("手机号输入有误,请验证后再输入");
}

2
mall-shop/src/main/java/com/suisung/mall/shop/store/mapper/ShopStoreActivityCodeMapper.java
View File

@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository;
/**
* <p>
* Mapper 接口
* Mapper 接口
* </p>
*
* @author Xinze

2
mall-shop/src/main/java/com/suisung/mall/shop/store/mapper/ShopStoreActivityShareMapper.java
View File

@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository;
/**
* <p>
* Mapper 接口
* Mapper 接口
* </p>
*
* @author Xinze

1
mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStoreActivityCodeService.java
View File

@ -18,6 +18,7 @@ public interface ShopStoreActivityCodeService extends IBaseService<ShopStoreActi
/**
* 兑换码导出
*
* @param response
* @param activity_id
*/

2
mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStoreActivityShareService.java
View File

@ -5,7 +5,7 @@ import com.suisung.mall.core.web.service.IBaseService;
/**
* <p>
* 服务类
* 服务类
* </p>
*
* @author Xinze

1
mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStoreBaseService.java
View File

@ -88,5 +88,6 @@ public interface ShopStoreBaseService extends IBaseService<ShopStoreBase> {
long getStoreNum(Integer store_state_id, Integer subsite_id);
Integer getStoreId(Integer user_id);
Boolean removeStore(Integer storeId);
}

2
mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStoreProductCategoryService.java
View File

@ -35,5 +35,5 @@ public interface ShopStoreProductCategoryService extends IBaseService<ShopStoreP
* @param store_id
* @return
*/
boolean cleanCategoryCache(Integer store_id);
boolean cleanCategoryCache(Integer store_id);
}

6
mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreActivityBaseServiceImpl.java
View File

@ -1360,7 +1360,7 @@ public class ShopStoreActivityBaseServiceImpl extends BaseServiceImpl<ShopStoreA
BigDecimal item_sale_price = Convert.toBigDecimal(it.get("item_sale_price"));
BigDecimal cart_quantity = Convert.toBigDecimal(it.get("cart_quantity"));
activity_single_amount = NumberUtil.add(activity_single_amount, NumberUtil.mul(item_sale_price, cart_quantity));
index ++;
index++;
}
}
//比例
@ -1378,14 +1378,14 @@ public class ShopStoreActivityBaseServiceImpl extends BaseServiceImpl<ShopStoreA
BigDecimal remainAmount = NumberUtil.sub(reduceMoney, share_amount);
_item.put("reduceMoney", remainAmount);
_item.put("item_discount_amount", remainAmount);
_item.put("reduction",activity_row);
_item.put("reduction", activity_row);
} else {
BigDecimal item_sale_price = Convert.toBigDecimal(_item.get("item_sale_price"));
BigDecimal cart_quantity = Convert.toBigDecimal(_item.get("cart_quantity"));
BigDecimal item_share = NumberUtil.round(NumberUtil.mul(NumberUtil.mul(item_sale_price, cart_quantity), single_rate), 2);
_item.put("reduceMoney", item_share);
_item.put("item_discount_amount", item_share);
_item.put("reduction",activity_row);
_item.put("reduction", activity_row);
share_amount = NumberUtil.add(share_amount, item_share);
item_index++;
}

2
mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreExpressLogisticsServiceImpl.java
View File

@ -116,7 +116,7 @@ public class ShopStoreExpressLogisticsServiceImpl extends BaseServiceImpl<ShopSt
String logistics_mobile = shopStoreExpressLogistics.getLogistics_mobile();
// 手机号验证
if (!PhoneUtil.isMobile(logistics_mobile)){
if (!PhoneUtil.isMobile(logistics_mobile)) {
throw new ApiException("手机号输入有误,请输入正确的手机号");
}

Some files were not shown because too many files have changed in this diff Show More