增加打票机测试

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

@@ -342,7 +342,6 @@ public class AnalyticsOrderServiceImpl implements AnalyticsOrderService {
         Integer userId = user.getUserId();
 
 
-
         DashboardTopRes topRes = new DashboardTopRes();
 
         // 获取当日订单量

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

@@ -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/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/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) {
                 //
             }
         }
@@ -49,8 +52,7 @@ public class IpLocation {
 
     public static void main(String[] args) {
 
-        for (int i = 0; i < 100; i++)
+        for (int i = 0; i < 100; i++) {
-        {
             new Thread() {
                 public void run() {
                     System.out.println(java.util.Arrays.toString(ip.find("118.28.8.8")));
@@ -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/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,6 +81,7 @@ public class OssUtils {
 
     /**
      * 网络图片转输入流
+     *
      * @param fileUrl
      * @return
      */

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) {
@@ -53,7 +52,6 @@ public class RabbitMqConfig {
 
     /**
      * 反序列化
-     *
      */
     @Bean
     public SimpleRabbitListenerContainerFactory rabbitListenerContainerFactory(ConnectionFactory connectionFactory) {
@@ -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,6 +26,7 @@ public class RedissionConfig {
 
     /**
      * 所有对Redisson的使用都是通过RedissonClient
+     *
      * @return
      * @throws IOException
      */

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

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

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

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

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

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

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

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

mall-shop/src/main/resources/mapper/base/ShopBaseConfigMapper.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/ShopBaseContractTypeMapper.xml

@@ -4,7 +4,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        contract_type_id, contract_type_name, contract_type_desc, contract_type_text, contract_type_deposit, contract_type_icon, contract_type_url, contract_type_order, contract_type_enable
+        contract_type_id
+        , contract_type_name, contract_type_desc, contract_type_text, contract_type_deposit, contract_type_icon, contract_type_url, contract_type_order, contract_type_enable
     </sql>
 
 </mapper>

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

@@ -4,7 +4,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        crontab_id, crontab_name, crontab_file, crontab_last_exe_time, crontab_next_exe_time, crontab_minute, crontab_hour, crontab_day, crontab_month, crontab_week, crontab_enable, crontab_buildin, crontab_remark
+        crontab_id
+        , crontab_name, crontab_file, crontab_last_exe_time, crontab_next_exe_time, crontab_minute, crontab_hour, crontab_day, crontab_month, crontab_week, crontab_enable, crontab_buildin, crontab_remark
     </sql>
 
 </mapper>

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

@@ -4,7 +4,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        currency_id, currency_title, currency_symbol_left, currency_symbol_right, currency_decimal_place, currency_exchange_rate, currency_status, currency_time, currency_is_default
+        currency_id
+        , currency_title, currency_symbol_left, currency_symbol_right, currency_decimal_place, currency_exchange_rate, currency_status, currency_time, currency_is_default
     </sql>
 
 </mapper>

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

@@ -4,7 +4,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        meta_id, data_id, meta_key, meta_ori, meta_value, meta_datatype, meta_time, meta_buildin, table_name, primary_key, column_name, store_id
+        meta_id
+        , data_id, meta_key, meta_ori, meta_value, meta_datatype, meta_time, meta_buildin, table_name, primary_key, column_name, store_id
     </sql>
 
 </mapper>

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

@@ -4,7 +4,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        zh_CN, zh_TW, en_GB, th_TH, es_MX, ar_SA, vi_VN, tr_TR, ja_JP, id_ID, de_DE, fr_FR, pt_PT, it_IT, ru_RU, ro_RO, az_AZ, el_GR, fi_FI, lv_LV, nl_NL, da_DK, sr_RS, pl_PL, uk_UA, kk_KZ, my_MM, ko_KR, time, is_imp, is_used, frontend, backend
+        zh_CN
+        , zh_TW, en_GB, th_TH, es_MX, ar_SA, vi_VN, tr_TR, ja_JP, id_ID, de_DE, fr_FR, pt_PT, it_IT, ru_RU, ro_RO, az_AZ, el_GR, fi_FI, lv_LV, nl_NL, da_DK, sr_RS, pl_PL, uk_UA, kk_KZ, my_MM, ko_KR, time, is_imp, is_used, frontend, backend
     </sql>
 
 </mapper>

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

@@ -4,7 +4,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        market_category_id, category_parent_id, category_name, category_image, category_order, category_level, category_is_leaf, category_is_enable, market_latitude, market_longitude
+        market_category_id, category_parent_id, category_name, category_image, category_order, category_level,
+        category_is_leaf, category_is_enable, market_latitude, market_longitude
     </sql>
 
 </mapper>

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

@@ -4,7 +4,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        brand_id, brand_name, brand_name_pinyin, brand_initial, brand_desc, category_id, brand_show_type, brand_image, brand_recommend, brand_enable, store_id, brand_apply
+        brand_id
+        , brand_name, brand_name_pinyin, brand_initial, brand_desc, category_id, brand_show_type, brand_image, brand_recommend, brand_enable, store_id, brand_apply
     </sql>
 
 </mapper>

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

@@ -22,7 +22,8 @@
     </select>
 
     <select id="selectCategoryList" resultType="com.suisung.mall.common.modules.base.ShopBaseProductCategory">
-        SELECT c.category_id, c.category_parent_id, c.category_name, c.category_image, c.type_id, c.category_virtual_enable,
+        SELECT c.category_id, c.category_parent_id, c.category_name, c.category_image, c.type_id,
+        c.category_virtual_enable,
         c.category_show_type, c.category_commission_rate, c.category_order, c.category_level, c.category_is_leaf,
         c.category_is_enable, c.page_id, c.page_id_pc,
         c.category_id AS `id`,

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

@@ -4,7 +4,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        category_id, category_name, category_alias, category_image, category_ids_recommend, item_ids_recommend, brand_ids_recommend, category_nav_adv, temp_type, category_order
+        category_id, category_name, category_alias, category_image, category_ids_recommend, item_ids_recommend,
+        brand_ids_recommend, category_nav_adv, temp_type, category_order
     </sql>
 
 </mapper>

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

@@ -4,7 +4,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        spec_id, spec_name, spec_remark, spec_format, spec_order, spec_category_id, spec_buildin
+        spec_id
+        , spec_name, spec_remark, spec_format, spec_order, spec_category_id, spec_buildin
     </sql>
 
 </mapper>

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

@@ -4,7 +4,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        product_tag_id, product_tag_name
+        product_tag_id
+        , product_tag_name
     </sql>
 
 </mapper>

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

@@ -4,7 +4,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        type_id, type_name, type_remark, type_is_assist, type_is_param, type_is_brand, type_is_entity, type_category_id, type_is_draft, type_spec_ids, type_brand_ids, type_assist_ids, type_buildin
+        type_id
+        , type_name, type_remark, type_is_assist, type_is_param, type_is_brand, type_is_entity, type_category_id, type_is_draft, type_spec_ids, type_brand_ids, type_assist_ids, type_buildin
     </sql>
 
 </mapper>

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

@@ -4,7 +4,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        unit_id, parent_unit_id, unit_name, unit_remark, unit_rate, unit_guid, unit_is_base, unit_type_id, unit_is_buildin
+        unit_id
+        , parent_unit_id, unit_name, unit_remark, unit_rate, unit_guid, unit_is_base, unit_type_id, unit_is_buildin
     </sql>
 
 </mapper>

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

@@ -4,7 +4,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        nav_id, nav_type, nav_item_id, nav_title, nav_url, nav_position, nav_target_blank, nav_image, nav_dropdown_menu, nav_order, nav_enable, nav_buildin
+        nav_id
+        , nav_type, nav_item_id, nav_title, nav_url, nav_position, nav_target_blank, nav_image, nav_dropdown_menu, nav_order, nav_enable, nav_buildin
     </sql>
 
 </mapper>

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

@@ -4,7 +4,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        state_code_id, state_code_name, state_code_text_1, state_code_text_2, state_code_text_3, state_code_code, state_code_remark, state_category
+        state_code_id
+        , state_code_name, state_code_text_1, state_code_text_2, state_code_text_3, state_code_code, state_code_remark, state_category
     </sql>
 
 </mapper>

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

@@ -4,7 +4,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        store_category_id, store_category_name, store_category_deposit, store_category_parent_id, store_category_order, category_image, category_level, category_is_leaf, category_is_enable, category_ids
+        store_category_id
+        , store_category_name, store_category_deposit, store_category_parent_id, store_category_order, category_image, category_level, category_is_leaf, category_is_enable, category_ids
     </sql>
 
 </mapper>

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

@@ -4,7 +4,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        store_grade_id, store_grade_name, store_grade_fee, store_grade_desc, store_grade_product_limit, store_grade_album_limit, store_grade_template, store_grade_function_id, store_grade_sort
+        store_grade_id
+        , store_grade_name, store_grade_fee, store_grade_desc, store_grade_product_limit, store_grade_album_limit, store_grade_template, store_grade_function_id, store_grade_sort
     </sql>
 
 </mapper>

mall-shop/src/main/resources/mapper/chain/ShopChainBaseMapper.xml

@@ -5,7 +5,9 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         chain_id
-        , store_id, chain_name, chain_mobile, chain_telephone, chain_contacter, chain_lng, chain_lat, chain_district_info, chain_district_id, chain_address, chain_opening_hours, chain_close_hours, chain_traffic_line, chain_img, chain_time
+        , store_id, chain_name, chain_mobile, chain_telephone, chain_contacter, chain_lng, chain_lat,
+        chain_district_info, chain_district_id, chain_address, chain_opening_hours, chain_close_hours,
+        chain_traffic_line, chain_img, chain_time
     </sql>
     <select id="getAll" resultType="java.util.Map">
         SELECT *,

mall-shop/src/main/resources/mapper/city/CityMarketOrderBaseMapper.xml

@@ -4,7 +4,12 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        mo_id, mo_time, mo_order_type, mo_source_type, mo_amount, mo_receive_date, mo_receive_rang, mo_receive_stime, mo_receive_etime, mo_receive_istimer, mo_receive_province_id, mo_receive_city_id, mo_receive_county_id, mo_receive_address, mo_receive_area, mo_receive_latitude, mo_receive_longitude, mo_receive_remark, mo_receive_greeting_card, mo_receive_name, mo_receive_tel, user_id, user_mobile, item_id, mo_item_desc, mo_item_quantity, mo_item_images, mo_remark, mo_invoice, store_id, order_id, old_store_id, mo_status, mo_order_item_file, mo_confirm_status, mo_pay_status, mo_user_id, mo_diff_amount
+        mo_id, mo_time, mo_order_type, mo_source_type, mo_amount, mo_receive_date, mo_receive_rang, mo_receive_stime,
+        mo_receive_etime, mo_receive_istimer, mo_receive_province_id, mo_receive_city_id, mo_receive_county_id,
+        mo_receive_address, mo_receive_area, mo_receive_latitude, mo_receive_longitude, mo_receive_remark,
+        mo_receive_greeting_card, mo_receive_name, mo_receive_tel, user_id, user_mobile, item_id, mo_item_desc,
+        mo_item_quantity, mo_item_images, mo_remark, mo_invoice, store_id, order_id, old_store_id, mo_status,
+        mo_order_item_file, mo_confirm_status, mo_pay_status, mo_user_id, mo_diff_amount
     </sql>
 
 </mapper>

mall-shop/src/main/resources/mapper/city/CityPaotuiOrderBaseMapper.xml

@@ -4,7 +4,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        po_id, pt_id, po_type, po_state_id, po_endtime, po_distance, po_time, po_freight, store_longitude, store_latitude, po_receive_longitude, po_receive_latitude, paotuier_id, po_expectedtime, mo_id, order_payment_amount, order_time
+        po_id, pt_id, po_type, po_state_id, po_endtime, po_distance, po_time, po_freight, store_longitude,
+        store_latitude, po_receive_longitude, po_receive_latitude, paotuier_id, po_expectedtime, mo_id,
+        order_payment_amount, order_time
     </sql>
 
 </mapper>

mall-shop/src/main/resources/mapper/city/CityPaotuiOrderInfoMapper.xml

@@ -4,7 +4,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        po_id, po_user_id, po_user_name, po_receive_name, po_receive_tel, po_receive_address, po_receive_latitude, po_receive_longitude, po_receive_time, store_id, store_name, store_logo, store_address, store_tel, po_signin_image, po_remark, po_freight_text, po_signin_time, store_remark, po_pickup_image
+        po_id, po_user_id, po_user_name, po_receive_name, po_receive_tel, po_receive_address, po_receive_latitude,
+        po_receive_longitude, po_receive_time, store_id, store_name, store_logo, store_address, store_tel,
+        po_signin_image, po_remark, po_freight_text, po_signin_time, store_remark, po_pickup_image
     </sql>
 
 </mapper>

mall-shop/src/main/resources/mapper/distribution/ShopDistributionPlantformUserMapper.xml

@@ -4,7 +4,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        user_id, user_parent_id, user_partner_id, user_time, user_team_count, user_level_id, user_province_team_id, user_city_team_id, user_county_team_id, role_level_id
+        user_id, user_parent_id, user_partner_id, user_time, user_team_count, user_level_id, user_province_team_id,
+        user_city_team_id, user_county_team_id, role_level_id
     </sql>
 
 </mapper>

mall-shop/src/main/resources/mapper/distribution/ShopDistributionStoreDirectsellerProductMapper.xml

@@ -4,7 +4,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        store_directseller_product_code, directseller_id, store_id, product_id, directseller_images_image, directseller_time, item_price, item_id
+        store_directseller_product_code, directseller_id, store_id, product_id, directseller_images_image,
+        directseller_time, item_price, item_id
     </sql>
 
 </mapper>

mall-shop/src/main/resources/mapper/distribution/ShopDistributionUserCommissionMapper.xml

@@ -5,7 +5,17 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         user_id
-        , commission_amount, commission_directseller_amount_0, commission_directseller_amount_1, commission_directseller_amount_2, commission_buy_amount_0, commission_buy_amount_1, commission_buy_amount_2, commission_click_amount_0, commission_click_amount_1, commission_click_amount_2, commission_reg_amount_0, commission_reg_amount_1, commission_reg_amount_2, commission_settled, commission_directseller_settled, commission_buy_settled, commission_buy_da, commission_buy_ca, commission_directseller_da, commission_directseller_ca, commission_buy_trade_0, commission_buy_trade_1, commission_buy_trade_2, commission_buy_da_trade, commission_buy_ca_trade, commission_directseller_trade_0, commission_directseller_trade_1, commission_directseller_trade_2, commission_directseller_da_trade, commission_directseller_ca_trade, commission_partner_buy_trade, commission_partner_directseller_trade, commission_partner_deposit_trade, commission_distributor_amount, commission_salesperson_amount, commission_refund_amount
+        , commission_amount, commission_directseller_amount_0, commission_directseller_amount_1,
+        commission_directseller_amount_2, commission_buy_amount_0, commission_buy_amount_1, commission_buy_amount_2,
+        commission_click_amount_0, commission_click_amount_1, commission_click_amount_2, commission_reg_amount_0,
+        commission_reg_amount_1, commission_reg_amount_2, commission_settled, commission_directseller_settled,
+        commission_buy_settled, commission_buy_da, commission_buy_ca, commission_directseller_da,
+        commission_directseller_ca, commission_buy_trade_0, commission_buy_trade_1, commission_buy_trade_2,
+        commission_buy_da_trade, commission_buy_ca_trade, commission_directseller_trade_0,
+        commission_directseller_trade_1, commission_directseller_trade_2, commission_directseller_da_trade,
+        commission_directseller_ca_trade, commission_partner_buy_trade, commission_partner_directseller_trade,
+        commission_partner_deposit_trade, commission_distributor_amount, commission_salesperson_amount,
+        commission_refund_amount
     </sql>
     <select id="getDistributionUserCommissionSum" resultType="java.util.Map">
         select

mall-shop/src/main/resources/mapper/distribution/ShopDistributionUserMapper.xml

@@ -4,7 +4,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        user_id, user_fans_num, user_is_sp, user_is_da, user_is_ca, user_is_pa, user_is_pt, user_active, user_time, role_level_id
+        user_id, user_fans_num, user_is_sp, user_is_da, user_is_ca, user_is_pa, user_is_pt, user_active, user_time,
+        role_level_id
     </sql>
 
     <select id="listPtDeposit" resultType="java.util.Map">