增加打票机测试

mall-account/target/classes/bootstrap-local.yml

@@ -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@

mall-account/target/classes/bootstrap.yml

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

mall-admin/target/classes/bootstrap-local.yml

@@ -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@

mall-admin/target/classes/bootstrap.yml

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

mall-auth/target/classes/bootstrap-dev.yml

@@ -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

mall-auth/target/classes/bootstrap-local.yml

@@ -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

mall-auth/target/classes/bootstrap-prod.yml

@@ -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

mall-auth/target/classes/bootstrap-test.yml

@@ -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

mall-auth/target/classes/bootstrap-uat.yml

@@ -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

mall-auth/target/classes/bootstrap.yml

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

mall-cms/target/classes/bootstrap-local.yml

@@ -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@

mall-cms/target/classes/bootstrap.yml

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

mall-gateway/target/classes/bootstrap-local.yml

@@ -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@

mall-gateway/target/classes/bootstrap.yml

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

mall-im/target/classes/bootstrap-local.yml

@@ -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@

mall-im/target/classes/bootstrap.yml

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

mall-pay/target/classes/bootstrap-local.yml

@@ -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@

mall-pay/target/classes/bootstrap.yml

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

mall-search/target/classes/bootstrap-local.yml

@@ -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@

mall-search/target/classes/bootstrap.yml

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

mall-shop/pom.xml

@@ -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>

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

@@ -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);
                         }
                     }

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

@@ -240,10 +240,6 @@ public class AnalyticsController extends BaseControllerImpl {
     }
 
 
-
-
-
-
     @ApiOperation(value = "获取新增店铺数")
     @RequestMapping(value = "/store/getStoreNum", method = RequestMethod.GET)
     public CommonRes<AnalyticsNumOutput> getStoreNum(TimelineReq req) {

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

@@ -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);
 }

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

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

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

@@ -77,10 +77,10 @@ public class AnalyticsOrderServiceImpl implements AnalyticsOrderService {
             throw new ApiException(ResultCode.UNAUTHORIZED);
         }
 
-        Integer siteId = user.getSiteid() ;
+        Integer siteId = user.getSiteid();
-        Integer storeId =user.getStoreId() ;
+        Integer storeId = user.getStoreId();
-        Integer chainId =user.getChainId() ;
+        Integer chainId = user.getChainId();
-        Integer userId =user.getUserId() ;
+        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 siteId = user.getSiteid();
-        Integer storeId =user.getStoreId() ;
+        Integer storeId = user.getStoreId();
-        Integer chainId =user.getChainId() ;
+        Integer chainId = user.getChainId();
-        Integer userId =user.getUserId() ;
+        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 siteId = user.getSiteid();
-        Integer storeId =user.getStoreId() ;
+        Integer storeId = user.getStoreId();
-        Integer chainId =user.getChainId() ;
+        Integer chainId = user.getChainId();
-        Integer userId =user.getUserId() ;
+        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 siteId = user.getSiteid();
-        Integer storeId =user.getStoreId() ;
+        Integer storeId = user.getStoreId();
-        Integer chainId =user.getChainId() ;
+        Integer chainId = user.getChainId();
-        Integer userId =user.getUserId() ;
+        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 siteId = user.getSiteid();
-        Integer storeId =user.getStoreId() ;
+        Integer storeId = user.getStoreId();
-        Integer chainId =user.getChainId() ;
+        Integer chainId = user.getChainId();
-        Integer userId =user.getUserId() ;
+        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 siteId = user.getSiteid();
-        Integer storeId =user.getStoreId() ;
+        Integer storeId = user.getStoreId();
-        Integer chainId =user.getChainId() ;
+        Integer chainId = user.getChainId();
-        Integer userId =user.getUserId() ;
+        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 siteId = user.getSiteid();
-        Integer storeId =user.getStoreId() ;
+        Integer storeId = user.getStoreId();
-        Integer chainId =user.getChainId() ;
+        Integer chainId = user.getChainId();
-        Integer userId =user.getUserId() ;
+        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 siteId = user.getSiteid();
-        Integer storeId =user.getStoreId() ;
+        Integer storeId = user.getStoreId();
-        Integer chainId =user.getChainId() ;
+        Integer chainId = user.getChainId();
-        Integer userId =user.getUserId() ;
+        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;

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

@@ -43,10 +43,10 @@ public class AnalyticsReturnServiceImpl implements AnalyticsReturnService {
             throw new ApiException(ResultCode.UNAUTHORIZED);
         }
 
-        Integer siteId = user.getSiteid() ;
+        Integer siteId = user.getSiteid();
-        Integer storeId =user.getStoreId() ;
+        Integer storeId = user.getStoreId();
-        Integer chainId =user.getChainId() ;
+        Integer chainId = user.getChainId();
-        Integer userId =user.getUserId() ;
+        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 siteId = user.getSiteid();
-        Integer storeId =user.getStoreId() ;
+        Integer storeId = user.getStoreId();
-        Integer chainId =user.getChainId() ;
+        Integer chainId = user.getChainId();
-        Integer userId =user.getUserId() ;
+        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 siteId = user.getSiteid();
-        Integer storeId =user.getStoreId() ;
+        Integer storeId = user.getStoreId();
-        Integer chainId =user.getChainId() ;
+        Integer chainId = user.getChainId();
-        Integer userId =user.getUserId() ;
+        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 siteId = user.getSiteid();
-        Integer storeId =user.getStoreId() ;
+        Integer storeId = user.getStoreId();
-        Integer chainId =user.getChainId() ;
+        Integer chainId = user.getChainId();
-        Integer userId =user.getUserId() ;
+        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 siteId = user.getSiteid();
-        Integer storeId =user.getStoreId() ;
+        Integer storeId = user.getStoreId();
-        Integer chainId =user.getChainId() ;
+        Integer chainId = user.getChainId();
-        Integer userId =user.getUserId() ;
+        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 siteId = user.getSiteid();
-        Integer storeId =user.getStoreId() ;
+        Integer storeId = user.getStoreId();
-        Integer chainId =user.getChainId() ;
+        Integer chainId = user.getChainId();
-        Integer userId =user.getUserId() ;
+        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 siteId = user.getSiteid();
-        Integer storeId =user.getStoreId() ;
+        Integer storeId = user.getStoreId();
-        Integer chainId =user.getChainId() ;
+        Integer chainId = user.getChainId();
-        Integer userId =user.getUserId() ;
+        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 siteId = user.getSiteid();
-        Integer storeId =user.getStoreId() ;
+        Integer storeId = user.getStoreId();
-        Integer chainId =user.getChainId() ;
+        Integer chainId = user.getChainId();
-        Integer userId =user.getUserId() ;
+        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 siteId = user.getSiteid();
-        Integer storeId =user.getStoreId() ;
+        Integer storeId = user.getStoreId();
-        Integer chainId =user.getChainId() ;
+        Integer chainId = user.getChainId();
-        Integer userId =user.getUserId() ;
+        Integer userId = user.getUserId();
 
         return null;
     }

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

@@ -164,10 +164,10 @@ public class AnalyticsSysServiceImpl implements AnalyticsSysService {
             throw new ApiException(ResultCode.UNAUTHORIZED);
         }
 
-        Integer siteId = user.getSiteid() ;
+        Integer siteId = user.getSiteid();
-        Integer storeId =user.getStoreId() ;
+        Integer storeId = user.getStoreId();
-        Integer chainId =user.getChainId() ;
+        Integer chainId = user.getChainId();
-        Integer userId =user.getUserId() ;
+        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 siteId = user.getSiteid();
-        Integer storeId =user.getStoreId() ;
+        Integer storeId = user.getStoreId();
-        Integer chainId =user.getChainId() ;
+        Integer chainId = user.getChainId();
-        Integer userId =user.getUserId() ;
+        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 siteId = user.getSiteid();
-        Integer storeId =user.getStoreId() ;
+        Integer storeId = user.getStoreId();
-        Integer chainId =user.getChainId() ;
+        Integer chainId = user.getChainId();
-        Integer userId =user.getUserId() ;
+        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 siteId = user.getSiteid();
-        Integer storeId =user.getStoreId() ;
+        Integer storeId = user.getStoreId();
-        Integer chainId =user.getChainId() ;
+        Integer chainId = user.getChainId();
-        Integer userId =user.getUserId() ;
+        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 siteId = user.getSiteid();
-        Integer storeId =user.getStoreId() ;
+        Integer storeId = user.getStoreId();
-        Integer chainId =user.getChainId() ;
+        Integer chainId = user.getChainId();
-        Integer userId =user.getUserId() ;
+        Integer userId = user.getUserId();
 
         return analyticsSysDao.listAccessItem(timelineInput, storeId);
     }

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

@@ -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(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);
     }
 
 }

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

@@ -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;
 }

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

@@ -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");

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

@@ -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));
     }
 }

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

@@ -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 {
 
         }
 

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

@@ -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);
 }

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

@@ -57,6 +57,7 @@ public interface ShopBaseProductCategoryService extends IBaseService<ShopBasePro
     Map getLists();
 
     Map lists();
+
     Page<ShopBaseProductCategory> lists(ProductCategoryListReq req);
 
     /**
@@ -69,6 +70,7 @@ public interface ShopBaseProductCategoryService extends IBaseService<ShopBasePro
 
     /**
      * 删除操作,支持单条/多条删除
+     *
      * @param category_id 分类编号
      * @return del_flag 是否成功
      * @access public
@@ -77,6 +79,7 @@ public interface ShopBaseProductCategoryService extends IBaseService<ShopBasePro
 
     /**
      * 添加操作,支持单条
+     *
      * @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
      */

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

@@ -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);
 }

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

@@ -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

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

@@ -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)) {

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

@@ -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";
         }
 

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

@@ -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)

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

@@ -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)

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

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

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

@@ -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();

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

@@ -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++)
+        for (int i = 0; i < 100; i++) {
-        {
+            new Thread() {
-            new Thread(){
+                public void run() {
-                public void run(){
                     System.out.println(java.util.Arrays.toString(ip.find("118.28.8.8")));
                 }
             }.start();
@@ -62,7 +64,7 @@ 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);
         int start = index[ip_prefix_value];
@@ -92,6 +94,7 @@ 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) {
         String[] ss = ip.split("\\.");
         int a, b, c, d;

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

@@ -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.*;

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

@@ -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.*;

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

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

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

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

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

@@ -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++;
         }

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

@@ -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++;
         }

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

@@ -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;
     }

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

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

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

@@ -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;

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

@@ -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

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

@@ -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();

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

@@ -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);

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

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

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

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

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

@@ -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) {

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

@@ -27,6 +27,7 @@ public interface ShopOrderBaseService extends IBaseService<ShopOrderBase> {
 
     /**
      * 订单状态数量统计
+     *
      * @return
      */
     List<Map<String, Object>> statisticState();
@@ -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);

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

@@ -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
      */

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

@@ -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);
 

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

@@ -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();
     }

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

@@ -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);

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

@@ -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);

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

@@ -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 {
@@ -266,6 +266,7 @@ public class OssServiceImpl implements OssService {
 
     /**
      * 腾讯云上传
+     *
      * @param file
      * @param concat
      * @return

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

@@ -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_id", 8888);
-        indexShufflingMap.put("module_name","带登录的轮播");
+        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");

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

@@ -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;

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

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

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

@@ -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);

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

@@ -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");
     }
 }

mall-shop/src/main/java/com/suisung/mall/shop/printing/utis/FeieUtil.java

@@ -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;
+    }
+
+
+}

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

@@ -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);
             }

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

@@ -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));
 
     }
 }

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

@@ -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
      */

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

@@ -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);

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

@@ -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);
         }

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

@@ -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<>();

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

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

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

@@ -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
      */
@@ -2224,6 +2225,7 @@ public class ShopProductItemServiceImpl extends BaseServiceImpl<ShopProductItemM
 
     /**
      * 锁定库存
+     *
      * @param itemId
      * @param cart_quantity
      * @return

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

@@ -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);
         }
 

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

@@ -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("手机号输入有误,请验证后再输入");
         }
 

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

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

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

@@ -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);
 }

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

@@ -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++;
                                         }

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

@@ -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("手机号输入有误,请输入正确的手机号");
         }
 

mall-shop/src/main/java/com/suisung/mall/shop/user/service/ShopUserCartService.java

@@ -44,6 +44,7 @@ public interface ShopUserCartService extends IBaseService<ShopUserCart> {
 
     /**
      * 修改购物车数量
+     *
      * @return
      */
     CommonResult editQuantity();
@@ -72,7 +73,6 @@ public interface ShopUserCartService extends IBaseService<ShopUserCart> {
      * @param activity_item_id 活动前置条件商品编号
      * @param cart_type        1:购买  2:积分兑换
      * @param chain_id         门店编号
-     *
      * @return bool flag 是否成功
      * @access public
      */
@@ -87,7 +87,6 @@ public interface ShopUserCartService extends IBaseService<ShopUserCart> {
     CommonResult addCart();
 
     /**
-     *
      * @param cart_id
      * @param activity_id
      * @return
@@ -115,6 +114,7 @@ public interface ShopUserCartService extends IBaseService<ShopUserCart> {
      * @access public
      */
     Map checkout();
+
     Map checkout(OrderCheckoutDTO orderCheckoutDTO);
 
     /**
@@ -151,6 +151,7 @@ public interface ShopUserCartService extends IBaseService<ShopUserCart> {
 
     /**
      * 可使用优惠券
+     *
      * @param cart_data
      * @param buyer_user_id
      */

mall-shop/src/main/java/com/suisung/mall/shop/user/service/impl/ShopUserCartServiceImpl.java

@@ -640,14 +640,14 @@ public class ShopUserCartServiceImpl extends BaseServiceImpl<ShopUserCartMapper,
                         // todo 发送消息
                         String message_id = "commodity-inventory-notice";
                         Map args = new HashMap();
-                        args.put("store_name",product_row.getStore_name());
+                        args.put("store_name", product_row.getStore_name());
-                        args.put("chain_name",product_row.getStore_name());
+                        args.put("chain_name", product_row.getStore_name());
-                        args.put("product_id",product_item_row.getProduct_id());
+                        args.put("product_id", product_item_row.getProduct_id());
-                        args.put("item_id",product_item_row.getItem_id());
+                        args.put("item_id", product_item_row.getItem_id());
-                        args.put("product_item_name",product_item_row.getItem_name()!=null ? product_item_row.getItem_name().split(",") : product_row.getProduct_name());
+                        args.put("product_item_name", product_item_row.getItem_name() != null ? product_item_row.getItem_name().split(",") : product_row.getProduct_name());
-                        args.put("item_quantity",product_item_row.getItem_quantity());
+                        args.put("item_quantity", product_item_row.getItem_quantity());
 
-                        messageService.sendNoticeMsg(0,product_row.getStore_id(),message_id,args);
+                        messageService.sendNoticeMsg(0, product_row.getStore_id(), message_id, args);
                         /*
                         message_id = "commodity-inventory-notice";
                         args       = array(
@@ -683,7 +683,7 @@ public class ShopUserCartServiceImpl extends BaseServiceImpl<ShopUserCartMapper,
                     cart_row.put("pfgb_id", pfgb_id);
                 }
 
-                data = formatCartRows(cart_rows, activity_rows, null,null);
+                data = formatCartRows(cart_rows, activity_rows, null, null);
             }
         }
 
@@ -1277,7 +1277,10 @@ public class ShopUserCartServiceImpl extends BaseServiceImpl<ShopUserCartMapper,
         boolean single_item = cart_rows.size() == 1;
         boolean single_activity = false;
 
-        List<Integer> allowTransportIds = new ArrayList<Integer>(){{add(5);add(10);}}; //允许的配送方式
+        List<Integer> allowTransportIds = new ArrayList<Integer>() {{
+            add(5);
+            add(10);
+        }}; //允许的配送方式
 
         BigDecimal orderSelProductAmount = BigDecimal.ZERO; //商品订单原价
         BigDecimal orderSelFreightAmount = BigDecimal.ZERO;
@@ -1544,7 +1547,7 @@ public class ShopUserCartServiceImpl extends BaseServiceImpl<ShopUserCartMapper,
                 // 平台等级则不启用平台等级折扣
                 List<Map> items = (List) store_row.get("items");
 
-                if (user_level_id==null && user_level_rate_enable) {
+                if (user_level_id == null && user_level_rate_enable) {
                     if (CollUtil.isEmpty(user_info_row)) {
                         if (items.size() > 0) {
                             Map item = items.get(0);

mall-shop/src/main/java/com/suisung/mall/shop/user/service/impl/ShopUserPointsHistoryServiceImpl.java

@@ -53,7 +53,7 @@ public class ShopUserPointsHistoryServiceImpl extends BaseServiceImpl<ShopUserPo
         Map data = getLists(queryWrapper, page, rows);
 
         Map resource = payService.resource();
-        Map resource_data = Convert.toMap(String.class, Object.class,resource.get("data"));
+        Map resource_data = Convert.toMap(String.class, Object.class, resource.get("data"));
         data.put("user_points", resource_data.get("user_points"));
         data.put("user_points_frozen", resource_data.get("user_points_frozen"));
 

mall-shop/src/main/java/com/suisung/mall/shop/user/service/impl/ShopUserVoucherServiceImpl.java

@@ -390,8 +390,7 @@ public class ShopUserVoucherServiceImpl extends BaseServiceImpl<ShopUserVoucherM
 
         ShopStoreActivityBase activityBase = storeActivityBaseService.get(activity_id);
 
-        if (activityBase == null)
+        if (activityBase == null) {
-        {
             throw new ApiException(I18nUtil._("代金券活动有误！"));
         }
 
@@ -648,5 +647,4 @@ public class ShopUserVoucherServiceImpl extends BaseServiceImpl<ShopUserVoucherM
     }
 
 
-
 }

mall-shop/src/main/java/com/suisung/mall/shop/wechat/controller/ShopWechatTplmsgController.java

@@ -48,6 +48,7 @@ public class ShopWechatTplmsgController {
 
     /**
      * 初始化微信模板消息
+     *
      * @return
      */
     @ApiOperation(value = "初始化微信模板消息", notes = "初始化微信模板消息")

mall-shop/src/main/java/com/suisung/mall/shop/wechat/service/impl/ShopWechatTplmsgServiceImpl.java

@@ -91,6 +91,7 @@ public class ShopWechatTplmsgServiceImpl extends BaseServiceImpl<ShopWechatTplms
 
     /**
      * 添加模板消息 (最多设置25条模板信息)
+     *
      * @param tpl_id
      * @param accessToken
      * @return

mall-shop/src/main/java/com/suisung/mall/shop/wechat/service/impl/WxQrCodeServiceImpl.java

@@ -158,7 +158,7 @@ public class WxQrCodeServiceImpl implements WxQrCodeService {
 
                 if (uploadType.equals(1)) {
                     floderUrl = ConfigConstant.URL_BASE + "/admin/oss/upload/" + dir + "/" + qr_filename; // 文件本地路径
-                } else if (uploadType.equals(2)){
+                } else if (uploadType.equals(2)) {
                     // oss 服务
                     String floder = ALIYUN_OSS_DIR_PREFIX.concat("/") + dir + "poster/2/";
                     floderUrl = ossService.uploadObject2OSS(null, floder + qr_filename, stream, qr_filename, Convert.toLong(bytes.length));

mall-shop/src/main/resources/i18n/messages_en_US.properties

@@ -44,7 +44,7 @@
 \u4F59\u989D\u4E0D\u8DB3 %s \u5143\uFF0C\u8BF7\u5148\u5145\u503C\u540E\u518D\u7533\u8BF7\u5F00\u901A\u5E97\u94FA!=The balance is less than%s yuan, please recharge first and then apply to open shop!
 \u4F63\u91D1\u4F59\u989D\u5C0F\u4E8E\u6700\u5C0F\u63D0\u73B0\u91D1\u989D=The commission balance is less than the minimum cash withdrawal amount
 \u4F63\u91D1\u7ED3\u7B97\u4FDD\u5B58\u6570\u636E\u5931\u8D25!=Failed to save data of commission settlement!
-\u4F63\u91D1\u7ED3\u7B97\u7F16\u53F7 : %s=Commission settlement No.:%s
+\u4F63\u91D1\u7ED3\u7B97\u7F16\u53F7:%s=Commission settlement No.:%s
 \u4F63\u91D1\u7ED3\u7B97\u8BB0\u5F55\u5931\u8D25!=Commission settlement record failed!
 \u4F9B\u5E94\u5546\u5206\u9500\u4EA7\u54C1\u6709\u8BEF=The supplier distributes products incorrectly
 \u4F9B\u5E94\u5546\u540D\u79F0=Name of supplier
@@ -174,13 +174,13 @@
 \u53D1\u8D27\u5730\u5740\u8868\u4FEE\u6539\u5931\u8D25\uFF01=Failed to modify the shipping address table!
 \u53D1\u8D27\u5BA1\u6838\u5458=Delivery auditor
 \u53D1\u8D27\u901F\u5EA6=Delivery speed
-\u53D1\u9001\u6D88\u606F\u5931\u8D25 : %s - %s - %s - %s=Failed to send message:%s -%s -%s -%s
+\u53D1\u9001\u6D88\u606F\u5931\u8D25:%s - %s - %s - %s=Failed to send message:%s -%s -%s -%s
 \u53D6\u6D88=Cancelation 
 \u552E\u540E\u6570\u636E=After sales data
-\u5546\u54C1: %s \u5DF2\u7ECF\u8D85\u8FC7\u6700\u5927\u8D2D\u4E70\u4E0A\u9650 %d \uFF01\u5F53\u524D\u53EF\u8D2D\u4E70\uFF1A %d=PRODUCT:%s has exceeded the maximum purchase limit%d! Currently available:%d
+\u5546\u54C1:%s \u5DF2\u7ECF\u8D85\u8FC7\u6700\u5927\u8D2D\u4E70\u4E0A\u9650 %d \uFF01\u5F53\u524D\u53EF\u8D2D\u4E70\uFF1A %d=PRODUCT:%s has exceeded the maximum purchase limit%d! Currently available:%d
-\u5546\u54C1: %s \u5E93\u5B58\u4E0D\u8DB3\uFF01\u5F53\u524D\u53EF\u8D2D\u4E70\uFF1A %d=Merchandise:%s out of stock! Currently available:%d
+\u5546\u54C1:%s \u5E93\u5B58\u4E0D\u8DB3\uFF01\u5F53\u524D\u53EF\u8D2D\u4E70\uFF1A %d=Merchandise:%s out of stock! Currently available:%d
-\u5546\u54C1: %s \u88AB\u5E73\u53F0\u5220\u9664,\u5982\u6709\u7591\u95EE\u8BF7\u8054\u7CFB\u5E73\u53F0\u3002=product:%s is deleted by the platform, if any doubt please contact the platform.
+\u5546\u54C1:%s \u88AB\u5E73\u53F0\u5220\u9664,\u5982\u6709\u7591\u95EE\u8BF7\u8054\u7CFB\u5E73\u53F0\u3002=product:%s is deleted by the platform, if any doubt please contact the platform.
-\u5546\u54C1: %s \u8D2D\u4E70\u6570\u91CF\u5FC5\u987B\u5927\u4E8E\uFF1A %d=Item%s purchase quantity must be greater than%d
+\u5546\u54C1:%s \u8D2D\u4E70\u6570\u91CF\u5FC5\u987B\u5927\u4E8E\uFF1A %d=Item%s purchase quantity must be greater than%d
 \u5546\u54C1\u4E0A\u67B6\u5B9A\u65F6\u4EFB\u52A1\u7EBF\u7A0B\u5F02\u5E38\uFF01=The thread of scheduled task for commodity listing is abnormal!
 \u5546\u54C1\u4EE3\u7801=Commodity code
 \u5546\u54C1\u5151\u6362=Commodity exchange
@@ -191,14 +191,14 @@
 \u5546\u54C1\u603B\u91D1\u989D=Total amount of merchandise
 \u5546\u54C1\u7C7B\u522B=Commodity category
 \u5546\u54C1\u7F16\u53F7 \u3010%s\u3011\u4F7F\u7528\u6B64\u5206\u7C7B\uFF0C\u4E0D\u53EF\u4EE5\u5220\u9664\uFF01=Product number [%s ] uses this classification and can not be removed!
-\u5546\u54C1\u7F16\u53F7: %s \u5C1A\u672A\u5BA1\u6838\u901A\u8FC7\uFF0C\u4E0D\u53EF\u4EE5\u4E0A\u67B6=Product Code:%s has not been examined and approved, can not be on the shelf
+\u5546\u54C1\u7F16\u53F7:%s \u5C1A\u672A\u5BA1\u6838\u901A\u8FC7\uFF0C\u4E0D\u53EF\u4EE5\u4E0A\u67B6=Product Code:%s has not been examined and approved, can not be on the shelf
-\u5546\u54C1\u89C4\u683C\u7F16\u53F7\u5F02\u5E38\uFF01spec_id: =Abnormal product specification number! spec_ id:
+\u5546\u54C1\u89C4\u683C\u7F16\u53F7\u5F02\u5E38\uFF01spec_id:=Abnormal product specification number! spec_ id:
 \u5546\u54C1\u8BC4\u8BBA=Product Review
 \u5546\u54C1\u8D27\u53F7\u5DF2\u7ECF\u5B58\u5728\uFF0C\u4E0D\u53EF\u91CD\u590D\uFF01=The article number already exists and cannot be repeated!
 \u5546\u54C1\u8FD0\u8D39\u8BBE\u7F6E\u6709\u8BEF\uFF01=The commodity freight is set incorrectly!
 \u5546\u54C1\uFF1A %s \u5DF2\u7ECF\u4E0B\u67B6\uFF0C\u4E0D\u53EF\u4E0B\u5355=PRODUCTS:%s has been removed from shelves, can not be ordered
 \u5546\u57CE\u5185\u90E8\u4EA4\u6613\u5355\u53F7=Mall internal transaction No
-\u5546\u5BB6\u4FE1\u606F\u6709\u8BEF\uFF01\u5546\u5BB6\u4E3B\u8D26\u53F7Id: %s=Merchant error! MERCHANT MASTER ACCOUNT ID:%s
+\u5546\u5BB6\u4FE1\u606F\u6709\u8BEF\uFF01\u5546\u5BB6\u4E3B\u8D26\u53F7Id:%s=Merchant error! MERCHANT MASTER ACCOUNT ID:%s
 \u5546\u5BB6\u7ED3\u7B97\u6B3E\u9879=Merchant settlement
 \u56E2\u8D2D\u5546\u54C1\u8D85\u8FC7\u8D2D\u4E70\u9650\u5236\uFF01=Group purchases exceed the purchase limit!
 \u56E2\u8D2D\u5931\u8D25=Failed groupon
@@ -219,7 +219,7 @@
 \u597D\u53CB\u8F6C\u5165=Friend transfer
 \u597D\u53CB\u8F6C\u51FA=Friend transfer out
 \u5B8C\u6210=Completed
-\u5B9A\u65F6\u4E0A\u67B6 : %s \u51FA\u9519=Scheduled launch:%s error
+\u5B9A\u65F6\u4E0A\u67B6:%s \u51FA\u9519=Scheduled launch:%s error
 \u5B9A\u65F6\u4EFB\u52A1\u811A\u672C\u4E0D\u5B58\u5728\uFF01=Scheduled task script does not exist!
 \u5B9D\u8D1D\u6807\u9898=Baby title
 \u5BA1\u6838\u5931\u8D25\uFF01=Audit failed!
@@ -275,7 +275,7 @@
 \u5F85\u9000=Stand down
 \u5FC5\u987B\u5B9E\u540D\u8BA4\u8BC1\u540E\u624D\u80FD\u4E0B\u5355\uFF01=Must be real name authentication after the order!
 \u60A8\u6240\u9009\u4E2D\u7684\u5546\u54C1\u5747\u5728\u53C2\u4E0E\u6D3B\u52A8!=Your selected products are participating in the event!
-\u60A8\u9009\u4E2D\u7684 =You selected
+\u60A8\u9009\u4E2D\u7684=You selected
 \u60A8\u9009\u4E2D\u7684\u5546\u54C1\u5DF2\u53C2\u4E0E\u6B64\u6D3B\u52A8=The product you selected has participated in this activity
 \u6210\u529F\u52A0\u5165\u5C0F\u5E97=To join the store
 \u6211\u7684\u62FC\u56E2=My Group
@@ -362,7 +362,7 @@
 \u6682\u505C\u5B9A\u65F6\u4EFB\u52A1\u5931\u8D25\uFF01=Failed to pause scheduled task!
 \u6682\u505C\u6210\u529F\uFF01=Pause succeeded!
 \u6682\u672A\u767B\u5F55\u6216token\u5DF2\u7ECF\u8FC7\u671F\uFF01=Not logged in temporarily or the token has expired!
-\u66F4\u6539: %s \u51BB\u7ED3\u5E93\u5B58\u5931\u8D25!=CHANGE:%s frozen stock failed!
+\u66F4\u6539:%s \u51BB\u7ED3\u5E93\u5B58\u5931\u8D25!=CHANGE:%s frozen stock failed!
 \u66F4\u6539\u8BA2\u5355\u7ED3\u7B97\u72B6\u6001\u5931\u8D25\uFF01=Failed to change order settlement status!
 \u66F4\u6539\u9000\u6B3E\u7ED3\u7B97\u72B6\u6001\uFF01=Change the refund settlement status!
 \u66F4\u65B0\u4F18\u60E0\u5238\u4FE1\u606F\u5931\u8D25\uFF01=Failed to update coupon information!
@@ -635,7 +635,7 @@
 \u91C7\u8D2D\u7A0E\u7387=Purchase tax rate
 \u91C7\u8D2D\u91D1\u989D(\u4E0D\u542B\u7A0E)=Purchase amount (excluding tax)
 \u91C7\u8D2D\u91D1\u989D(\u542B\u7A0E)=Purchase amount (tax included)
-\u91CA\u653E: %s \u51BB\u7ED3\u5E93\u5B58\u5931\u8D25!=RELEASE:%s FROZEN STOCK FAILED!
+\u91CA\u653E:%s \u51BB\u7ED3\u5E93\u5B58\u5931\u8D25!=RELEASE:%s FROZEN STOCK FAILED!
 \u9500\u552E\u5355\u4EF7(\u4E0D\u542B\u7A0E)=Sales unit price (excluding tax)
 \u9500\u552E\u5355\u4EF7(\u542B\u7A0E)=Sales unit price (tax included)
 \u9500\u552E\u6570\u91CF=Quantity sold

mall-shop/src/main/resources/mapper/activity/ShopActivityLotteryHistoryMapper.xml

@@ -4,7 +4,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        alh_id, user_id, activity_id, alh_item_id, alh_date, alh_datetime, alh_is_send, user_name, user_phone, user_address, alh_award_flag
+        alh_id, user_id, activity_id, alh_item_id, alh_date, alh_datetime, alh_is_send, user_name, user_phone,
+        user_address, alh_award_flag
     </sql>
 
 </mapper>

mall-shop/src/main/resources/mapper/analytics/AnalyticsAccessHistoryMapper.xml

@@ -5,7 +5,10 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         access_id
-        , user_id, access_client_id, access_os, access_browser_name, access_browser_version, access_spider, access_country, access_province, access_city, access_county, access_lang, access_ip, access_url, access_time, access_year, access_month, access_day, access_hour, access_date, access_datetime, access_refer_domain, access_refer_url, access_mobile, access_pad, access_pc, access_device, access_type, access_from
+        , user_id, access_client_id, access_os, access_browser_name, access_browser_version, access_spider,
+        access_country, access_province, access_city, access_county, access_lang, access_ip, access_url, access_time,
+        access_year, access_month, access_day, access_hour, access_date, access_datetime, access_refer_domain,
+        access_refer_url, access_mobile, access_pad, access_pc, access_device, access_type, access_from
     </sql>
 
     <select id="getAccessOs" resultType="java.util.Map">

mall-shop/src/main/resources/mapper/analytics/AnalyticsOrderXml.xml

@@ -11,7 +11,9 @@
                 AND order_time BETWEEN #{startTime} AND #{endTime}
             </if>
             <if test="order_state_id!=null ">
-                AND order_state_id IN <foreach item="id" collection="order_state_id" separator="," open="(" close=")" index="i">#{id}</foreach>
+                AND order_state_id IN
+                <foreach item="id" collection="order_state_id" separator="," open="(" close=")" index="i">#{id}
+                </foreach>
             </if>
             <if test="user_id!=null ">
                 AND buyer_user_id=#{user_id}
@@ -20,7 +22,8 @@
                 AND kind_id=#{kind_id}
             </if>
             <if test="order_is_paid!=null">
-                AND order_is_paid IN <foreach item="id" collection="order_is_paid" separator="," open="(" close=")" index="i">#{id}</foreach>
+                AND order_is_paid IN
+                <foreach item="id" collection="order_is_paid" separator="," open="(" close=")" index="i">#{id}</foreach>
             </if>
             <if test="subsiteId != null">
                 AND subsite_id = #{subsiteId}
@@ -135,10 +138,14 @@
             </if>
             <if test="params.itemId != null">
                 AND i.item_id in
-                <foreach collection="params.itemId" item="item_id" index="index" open="(" close=")" separator=",">#{item_id}</foreach>
+                <foreach collection="params.itemId" item="item_id" index="index" open="(" close=")" separator=",">
+                    #{item_id}
+                </foreach>
             </if>
             <if test="params.categoryId != null ">
-                AND i.category_id IN <foreach item="id" collection="params.categoryId" separator="," open="(" close=")" index="i">#{id}</foreach>
+                AND i.category_id IN
+                <foreach item="id" collection="params.categoryId" separator="," open="(" close=")" index="i">#{id}
+                </foreach>
             </if>
             <if test="params.productName != null and params.productName !=''">
                 AND i.product_name like concat('%', #{params.productName}, '%')
@@ -180,10 +187,14 @@
             </if>
             <if test="params.itemId != null">
                 AND i.item_id in
-                <foreach collection="params.itemId" item="item_id" index="index" open="(" close=")" separator=",">#{item_id}</foreach>
+                <foreach collection="params.itemId" item="item_id" index="index" open="(" close=")" separator=",">
+                    #{item_id}
+                </foreach>
             </if>
             <if test="params.categoryId != null ">
-                AND i.category_id IN <foreach item="id" collection="params.categoryId" separator="," open="(" close=")" index="i">#{id}</foreach>
+                AND i.category_id IN
+                <foreach item="id" collection="params.categoryId" separator="," open="(" close=")" index="i">#{id}
+                </foreach>
             </if>
             <if test="params.productName != null and params.productName !=''">
                 AND i.product_name like concat('%', #{params.productName}, '%')
@@ -229,10 +240,14 @@
             </if>
             <if test="params.itemId != null">
                 AND i.item_id in
-                <foreach collection="params.itemId" item="item_id" index="index" open="(" close=")" separator=",">#{item_id}</foreach>
+                <foreach collection="params.itemId" item="item_id" index="index" open="(" close=")" separator=",">
+                    #{item_id}
+                </foreach>
             </if>
             <if test="params.categoryId != null ">
-                AND i.category_id IN <foreach item="id" collection="params.categoryId" separator="," open="(" close=")" index="i">#{id}</foreach>
+                AND i.category_id IN
+                <foreach item="id" collection="params.categoryId" separator="," open="(" close=")" index="i">#{id}
+                </foreach>
             </if>
             <if test="params.productName != null and params.productName !=''">
                 AND i.product_name like concat('%', #{params.productName}, '%')

mall-shop/src/main/resources/mapper/analytics/AnalyticsReturnXml.xml

@@ -11,7 +11,9 @@
                 AND return_add_time BETWEEN #{startTime} AND #{endTime}
             </if>
             <if test="return_state_ids!=null ">
-                AND return_state_id IN <foreach item="id" collection="return_state_ids" separator="," open="(" close=")" index="i">#{id}</foreach>
+                AND return_state_id IN
+                <foreach item="id" collection="return_state_ids" separator="," open="(" close=")" index="i">#{id}
+                </foreach>
             </if>
             <if test="subsiteId != null">
                 AND subsite_id = #{subsiteId}
@@ -33,7 +35,9 @@
                 AND shop_order_return.return_add_time BETWEEN #{startTime} AND #{endTime}
             </if>
             <if test="return_state_ids!=null ">
-                AND return_state_id IN <foreach item="id" collection="return_state_ids" separator="," open="(" close=")" index="i">#{id}</foreach>
+                AND return_state_id IN
+                <foreach item="id" collection="return_state_ids" separator="," open="(" close=")" index="i">#{id}
+                </foreach>
             </if>
             <if test="subsiteId != null">
                 AND subsite_id = #{subsiteId}
@@ -55,7 +59,9 @@
                 AND shop_order_return.return_add_time BETWEEN #{startTime} AND #{endTime}
             </if>
             <if test="return_state_ids!=null ">
-                AND shop_order_return.return_state_id IN <foreach item="id" collection="return_state_ids" separator="," open="(" close=")" index="i">#{id}</foreach>
+                AND shop_order_return.return_state_id IN
+                <foreach item="id" collection="return_state_ids" separator="," open="(" close=")" index="i">#{id}
+                </foreach>
             </if>
             <if test="subsiteId != null">
                 AND shop_order_return.subsite_id = #{subsiteId}
@@ -130,10 +136,14 @@
             </if>
             <if test="params.itemId != null">
                 AND i.item_id in
-                <foreach collection="params.itemId" item="item_id" index="index" open="(" close=")" separator=",">#{item_id}</foreach>
+                <foreach collection="params.itemId" item="item_id" index="index" open="(" close=")" separator=",">
+                    #{item_id}
+                </foreach>
             </if>
             <if test="params.categoryId != null ">
-                AND i.category_id IN <foreach item="id" collection="params.categoryId" separator="," open="(" close=")" index="i">#{id}</foreach>
+                AND i.category_id IN
+                <foreach item="id" collection="params.categoryId" separator="," open="(" close=")" index="i">#{id}
+                </foreach>
             </if>
             <if test="params.productName != null and params.productName !=''">
                 AND i.product_name like concat('%', #{params.productName}, '%')
@@ -175,10 +185,14 @@
             </if>
             <if test="params.itemId != null">
                 AND i.item_id in
-                <foreach collection="params.itemId" item="item_id" index="index" open="(" close=")" separator=",">#{item_id}</foreach>
+                <foreach collection="params.itemId" item="item_id" index="index" open="(" close=")" separator=",">
+                    #{item_id}
+                </foreach>
             </if>
             <if test="params.categoryId != null ">
-                AND i.category_id IN <foreach item="id" collection="params.categoryId" separator="," open="(" close=")" index="i">#{id}</foreach>
+                AND i.category_id IN
+                <foreach item="id" collection="params.categoryId" separator="," open="(" close=")" index="i">#{id}
+                </foreach>
             </if>
             <if test="params.productName != null and params.productName !=''">
                 AND i.product_name like concat('%', #{params.productName}, '%')
@@ -224,10 +238,14 @@
             </if>
             <if test="params.itemId != null">
                 AND i.item_id in
-                <foreach collection="params.itemId" item="item_id" index="index" open="(" close=")" separator=",">#{item_id}</foreach>
+                <foreach collection="params.itemId" item="item_id" index="index" open="(" close=")" separator=",">
+                    #{item_id}
+                </foreach>
             </if>
             <if test="params.categoryId != null ">
-                AND i.category_id IN <foreach item="id" collection="params.categoryId" separator="," open="(" close=")" index="i">#{id}</foreach>
+                AND i.category_id IN
+                <foreach item="id" collection="params.categoryId" separator="," open="(" close=")" index="i">#{id}
+                </foreach>
             </if>
             <if test="params.productName != null and params.productName !=''">
                 AND i.product_name like concat('%', #{params.productName}, '%')

mall-shop/src/main/resources/mapper/base/AccountBaseConfigMapper.xml

@@ -4,7 +4,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        config_key, config_value, config_type, config_enable, config_comment, config_datatype, config_name, config_formater, config_category
+        config_key
+        , config_value, config_type, config_enable, config_comment, config_datatype, config_name, config_formater, config_category
     </sql>
 
 </mapper>

mall-shop/src/main/resources/mapper/base/ShopBaseActivityTypeMapper.xml

@@ -4,7 +4,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        activity_type_id, activity_type_name, activity_type_title, activity_type_icon, activity_type_category, cd_num_id, channel_id, cmd_id, activity_type_tpl, activity_type_order, activity_type_introduce, activity_type_prize, activity_type_enable
+        activity_type_id
+        , activity_type_name, activity_type_title, activity_type_icon, activity_type_category, cd_num_id, channel_id, cmd_id, activity_type_tpl, activity_type_order, activity_type_introduce, activity_type_prize, activity_type_enable
     </sql>
 
 </mapper>