broker 卡车公司端

liujie

2023-05-15 6225c37d2f53adf26daf6b4859af5fb5c6fad088

broker 卡车公司端

 guns-company.iml

New file
@@ -0,0 +1,268 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
  <component name="FacetManager">
    <facet type="web" name="Web">
      <configuration>
        <webroots />
        <sourceRoots>
          <root url="file://$MODULE_DIR$/src/main/java" />
          <root url="file://$MODULE_DIR$/src/main/resources" />
        </sourceRoots>
      </configuration>
    </facet>
    <facet type="Spring" name="Spring">
      <configuration />
    </facet>
  </component>
  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
    <output url="file://$MODULE_DIR$/target/classes" />
    <output-test url="file://$MODULE_DIR$/target/test-classes" />
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
      <excludeFolder url="file://$MODULE_DIR$/target" />
    </content>
    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="guns-core-1.0.0" level="project" />
    <orderEntry type="module" module-name="guns-core" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatisplus-spring-boot-starter:1.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:2.3" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-support:2.3" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:2.3" level="project" />
    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.1" level="project" />
    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.11" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.protobuf:protobuf-java:2.6.0" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.7.9" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.10" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
    <orderEntry type="module" module-name="guns-generator" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generate:2.3" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.10.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.10.0" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.5" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.5" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.5" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.32" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.32" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.11.Final" level="project" />
    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
    <orderEntry type="library" name="Maven: org.openjfx:javafx.base:11.0.0-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: org.openjfx:javafx.base:linux:11.0.0-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: org.openjfx:javafx.base:mac:11.0.0-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: org.openjfx:javafx.base:win:11.0.0-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.32" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.9.1" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.15.0" level="project" />
    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.7.11" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.7.11" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.5.1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-devtools:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.4.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.4.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.4.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.4.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.4.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.4.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.4.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.4.0" level="project" />
    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.4.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.4.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.4.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.4.0" level="project" />
    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
    <orderEntry type="library" name="Maven: org.ehcache:ehcache:3.3.1" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.1.1" level="project" />
    <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
    <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.1" level="project" />
    <orderEntry type="library" name="Maven: com.ibeetl:beetl:2.8.5" level="project" />
    <orderEntry type="library" name="Maven: org.antlr:antlr4-runtime:4.2" level="project" />
    <orderEntry type="library" name="Maven: org.abego.treelayout:org.abego.treelayout.core:1.0.1" level="project" />
    <orderEntry type="library" name="Maven: org.antlr:antlr4-annotations:4.2" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.20" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
    <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.0" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.5" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.5" level="project" />
    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.16.22" level="project" />
    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.9" level="project" />
    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.10" level="project" />
    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
    <orderEntry type="library" name="Maven: com.google.maps:google-maps-services:2.0.0" level="project" />
    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
    <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.30.0" level="project" />
    <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.27.2" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk:1.9.2" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-logs:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-core:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: software.amazon.ion:ion-java:1.0.2" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.5" level="project" />
    <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.9" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:jmespath-java:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-elasticache:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-elastictranscoder:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-route53:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-datapipeline:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-cloudwatchmetrics:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-cloudwatch:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-dynamodb:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-rds:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-storagegateway:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-swf-libraries:1.11.22" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-simpleworkflow:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-directconnect:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-iam:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-ec2:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-cloudformation:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-ses:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-elasticloadbalancing:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-cognitosync:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-cloudtrail:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-elasticbeanstalk:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-simpledb:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-opsworks:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-autoscaling:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-sts:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-cloudfront:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-importexport:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-emr:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-cloudsearch:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-glacier:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-sqs:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-sns:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-s3:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-kms:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-kinesis:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-redshift:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-support:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-cognitoidentity:1.11.336" level="project" />
    <orderEntry type="library" name="Maven: org.jodd:jodd-all:5.0.0" level="project" />
    <orderEntry type="library" name="Maven: javax.mail:mail:1.4.5" level="project" />
    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
    <orderEntry type="library" name="Maven: redis.clients:jedis:3.1.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.5.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:5.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-lite:5.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:4.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.20" level="project" />
    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.68" level="project" />
    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.68" level="project" />
    <orderEntry type="library" name="Maven: org.apache.santuario:xmlsec:2.2.1" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.woodstox:woodstox-core:5.2.1" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.woodstox:stax2-api:4.2" level="project" />
    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.2" level="project" />
    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-all:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-anim:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-shared-resources:1.13" level="project" />
    <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-awt-util:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:xmlgraphics-commons:2.4" level="project" />
    <orderEntry type="library" name="Maven: commons-io:commons-io:1.3.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-bridge:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-codec:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-constants:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-dom:1.13" level="project" />
    <orderEntry type="library" name="Maven: xalan:xalan:2.7.2" level="project" />
    <orderEntry type="library" name="Maven: xalan:serializer:2.7.2" level="project" />
    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-extension:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gui-util:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gvt:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-i18n:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-parser:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-rasterizer-ext:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-rasterizer:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-script:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-slideshow:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-squiggle-ext:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-squiggle:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svg-dom:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svgbrowser:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svggen:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svgpp:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svgrasterizer:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-swing:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-transcoder:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ttf2svg:1.13" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-xml:1.13" level="project" />
    <orderEntry type="library" name="Maven: de.rototor.pdfbox:graphics2d:0.30" level="project" />
    <orderEntry type="library" name="Maven: org.apache.pdfbox:pdfbox:2.0.22" level="project" />
    <orderEntry type="library" name="Maven: org.apache.pdfbox:fontbox:2.0.22" level="project" />
  </component>
</module>

 src/main/java/com/stylefeng/guns/core/common/constant/JwtConstants.java

@@ -18,6 +18,7 @@
    String COMPANY_LOGIN_PATH = "/gunsApi/companyLogin";

    String FORGET_PATH = "/gunsApi/forget";
    String SEND_CODE = "/gunsApi/sendCode";




 src/main/java/com/stylefeng/guns/core/intercept/RestApiInteceptor.java

@@ -31,7 +31,7 @@
    }

    private boolean check(HttpServletRequest request, HttpServletResponse response, HandlerMethod handlerMethod) {
        if (request.getServletPath().equals(JwtConstants.AUTH_PATH)|| request.getServletPath().equals(JwtConstants.FORGET_PATH)|| request.getServletPath().equals(JwtConstants.COMPANY_LOGIN_PATH) ) {
        if (request.getServletPath().equals(JwtConstants.AUTH_PATH)|| request.getServletPath().equals(JwtConstants.FORGET_PATH)|| request.getServletPath().equals(JwtConstants.COMPANY_LOGIN_PATH)|| request.getServletPath().equals(JwtConstants.SEND_CODE) ) {
            return true;
        }
        final String requestHeader = request.getHeader(JwtConstants.AUTH_HEADER);

 src/main/java/com/stylefeng/guns/modular/api/ApiController.java

@@ -8,11 +8,14 @@
import com.stylefeng.guns.core.util.Convert;
import com.stylefeng.guns.core.util.JwtTokenUtil;
import com.stylefeng.guns.core.util.MD5Util;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.TCompanyMapper;
import com.stylefeng.guns.modular.system.dao.UserMapper;
import com.stylefeng.guns.modular.system.model.TCompany;
import com.stylefeng.guns.modular.system.model.User;
import com.stylefeng.guns.modular.system.model.UserInfo;
import com.stylefeng.guns.modular.system.utils.EmailUtil;
import com.stylefeng.guns.modular.system.utils.RedisUtil;
import com.stylefeng.guns.modular.system.utils.tips.SuccessTip;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -26,6 +29,7 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Random;

/**
 * 接口控制器提供
@@ -43,6 +47,10 @@

    @Resource
    private TCompanyMapper companyMapper;

    @Autowired
    private RedisUtil redisUtil;

    /**
     * api登录接口，通过账号密码获取token
     */
@@ -60,7 +68,7 @@
        //获取数据库中的账号密码，准备比对
        List<TCompany> user = companyMapper.selectList(new EntityWrapper<TCompany>().eq("account",username));
        if (user.size()==0) {
            return new ErrorTip(500, "账号密码错误！");
            return new ErrorTip(500, "Account password error！");
        }
        UserInfo userInfo = new UserInfo();
        BeanUtils.copyProperties(user, userInfo);
@@ -77,14 +85,16 @@
//        boolean passwordTrueFlag = md5CredentialsMatcher.doCredentialsMatch(
//                usernamePasswordToken, simpleAuthenticationInfo);
        String encrypt = MD5Util.encrypt(password);
        if(user.get(0).getStatus()==3){
            return new ErrorTip(500, "Your account has been frozen, please contact the platform！");
        }
        if (!encrypt.equals(user.get(0).getPassword())) {
            return new ErrorTip(500, "账号密码错误！");
            return new ErrorTip(500, "Account password error！");
        } else {
            TCompany company = user.get(0);
            HashMap<String, Object> result = new HashMap<>();
            result.put("token", JwtTokenUtil.generateToken(String.valueOf(company.getId())));
            result.put("company", company);
            super.getSession().setAttribute("companyId",String.valueOf(company.getId()));
            return result;
        }
    }
@@ -128,12 +138,18 @@
    @ApiImplicitParams({
            @ApiImplicitParam(name = "username", value = "用户账号", required = true, dataType = "String"),
            @ApiImplicitParam(name = "password", value = "用户密码", required = true, dataType = "String"),
            @ApiImplicitParam(name = "code", value = "验证码", required = true, dataType = "String"),
    })
    public Object forget(@RequestParam("username") String username,
                         @RequestParam("password") String password) {
                         @RequestParam("password") String password,
                         @RequestParam("code") String code) {
        List<TCompany> user = companyMapper.selectList(new EntityWrapper<TCompany>().eq("account",username));
        String value = redisUtil.getValue(username);
        if(!code.equals(value)){
            return new ErrorTip(5001, "Verification code error！");
        }
        if (user.size()==0){
            return new ErrorTip(500, "账号不存在！");
            return new ErrorTip(500, "Account does not exist！");
        }
        user.get(0).setPassword(MD5Util.encrypt(password));
        companyMapper.updateById(user.get(0));
@@ -141,4 +157,35 @@
    }


    @PostMapping("/sendCode")
    @ApiOperation(value = "发送验证码", notes = "发送验证码")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "email", value = "用户邮箱", required = true, dataType = "String"),
    })
    public Object sendCode(@RequestParam("email") String email) {
        String randomNumber = getRandomString(6);
        redisUtil.setStrValue(email,randomNumber,300);
        try {
            EmailUtil.sendMailGMail(email, randomNumber);
            return new com.stylefeng.guns.core.base.tips.SuccessTip();
        }catch (Exception e){
            e.printStackTrace();
            return new ErrorTip(500,"ERROR");
        }
    }


    private  String getRandomString(int length) {
        String base = "0123456789";
        Random random = new Random();
        StringBuffer sb = new StringBuffer();

        for(int i = 0; i < length; ++i) {
            int number = random.nextInt(base.length());
            sb.append(base.charAt(number));
        }

        return sb.toString();
    }

}

 src/main/java/com/stylefeng/guns/modular/system/controller/DemandController.java

@@ -14,7 +14,6 @@
import com.stylefeng.guns.modular.system.utils.GoogleMap.DistancematrixVo;
import com.stylefeng.guns.modular.system.utils.GoogleMap.GeocodeVo;
import com.stylefeng.guns.modular.system.utils.GoogleMap.GoogleMapUtil;
import com.stylefeng.guns.modular.system.utils.UserInfoUtil;
import com.stylefeng.guns.modular.system.utils.tips.ErrorTip;
import com.stylefeng.guns.modular.system.utils.tips.SuccessTip;
import io.swagger.annotations.Api;
@@ -24,7 +23,6 @@
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
@@ -110,7 +108,7 @@
    @PostMapping(value = "/addDemand")
    @ResponseBody
    public Object addDemand(@RequestBody DemandDto demandDto) throws Exception {
        Integer id = UserInfoUtil.getId();
        Integer id = demandDto.getId();
        String s1 = System.currentTimeMillis() + ToolUtil.getRandomString(5);
        String s2 = System.currentTimeMillis() + ToolUtil.getRandomString(5);
        // 生成需求
@@ -124,87 +122,72 @@
        tQuote.setCreateId(id);
        quoteService.insert(tQuote);

        List<TUserFeeSetting> tUserFeeSettings=null;
        //获取当前用户的sale
        Integer userId = demandDto.getUserId();
        TUser tUser = userService.selectById(userId);
        if(tUser.getGroupId()!=null){
            TGroup tGroup = groupService.selectById(tUser.getGroupId());
             tUserFeeSettings = userFeeSettingService.selectList(new EntityWrapper<TUserFeeSetting>().eq("user_id",tGroup.getSalesId()));

        }


        String accessorialStr = demandDto.getAccessorialStr();
        String[] split = accessorialStr.split(",");
        Map<String,String> map = new HashMap<>(split.length);
        for (String s :split){
            map.put(s,s);
        }

        List<TCompanyService> companyServiceList = new ArrayList<>();
//        Map<String,String> map = new HashMap<>(split.length);
//        for (String s :split){
//            map.put(s,s);
//        }
        //
        for (Map.Entry<String, String> entry : map.entrySet()) {
                companyServiceList.addAll(tCompanyServiceService.selectList(new EntityWrapper<TCompanyService>()
                    .eq("service_name", entry.getKey()).ne("service_value", 0)));
        }

        // TODO size 是否包含   收费  收费站、收费基础

        // 根据公司id去重
        List<TCompanyService> companyServices = companyServiceList.stream().collect(Collectors.
                collectingAndThen(Collectors.toCollection(()->new TreeSet<>(Comparator.comparing(TCompanyService::getCompanyId))),ArrayList::new));
        // 拿出符合规则的公司id
        List<Integer> companyIds = companyServices.stream().map(TCompanyService::getCompanyId).collect(Collectors.toList());

        List<TCompany> tCompanyList = new ArrayList<>();
        for (Integer companyId : companyIds) {
            List<TCompanyService> collect = companyServiceList.stream().filter(company -> company.getCompanyId().equals(companyId)).collect(Collectors.toList());
            if(map.size() == collect.size()){
                // 找出符合规则的公司
                TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("status", 1)
                        .eq("id",companyId));
                if(Objects.nonNull(company)){
                    tCompanyList.add(company);
                }
            }
        }

        // 符合规则的公司id集合
        List<Integer> companyIdList = tCompanyList.stream().map(TCompany::getId).collect(Collectors.toList());

        HashSet<Integer> set = new HashSet<>();

        // 找出目前公司是否符合添加的码头
        // 看当前码头是否为特殊码头
        // 找出当前码头所在的cityid
//        List<TCompanyService> companyServiceList = new ArrayList<>();
//        //
//        for (Map.Entry<String, String> entry : map.entrySet()) {
//                companyServiceList.addAll(tCompanyServiceService.selectList(new EntityWrapper<TCompanyService>()
//                    .eq("service_name", entry.getKey()).ne("service_value", 0)));
//        }
//
//        // TODO size 是否包含   收费  收费站、收费基础
//
//        // 根据公司id去重
//        List<TCompanyService> companyServices = companyServiceList.stream().collect(Collectors.
//                collectingAndThen(Collectors.toCollection(()->new TreeSet<>(Comparator.comparing(TCompanyService::getCompanyId))),ArrayList::new));
//        // 拿出符合规则的公司id
//        List<Integer> companyIds = companyServices.stream().map(TCompanyService::getCompanyId).collect(Collectors.toList());
//
//        List<TCompany> tCompanyList = new ArrayList<>();
//        for (Integer companyId : companyIds) {
//            List<TCompanyService> collect = companyServiceList.stream().filter(company -> company.getCompanyId().equals(companyId)).collect(Collectors.toList());
//            if(map.size() == collect.size()){
//                // 找出符合规则的公司
//                TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("status", 1)
//                        .eq("id",companyId));
//                if(Objects.nonNull(company)){
//                    tCompanyList.add(company);
//                }
//            }
//        }
//
//        // 符合规则的公司id集合
//        List<Integer> companyIdList = tCompanyList.stream().map(TCompany::getId).collect(Collectors.toList());
//
//        HashSet<Integer> set = new HashSet<>();
//
//        // 找出目前公司是否符合添加的码头
//        // 看当前码头是否为特殊码头
//        // 找出当前码头所在的cityid
        TPort tPort1 = portService.selectById(demandDto.getPortId());
        TCountry tCountry = countryService.selectById(tPort1.getCity());
        List<Integer> integers = Arrays.asList(demandDto.getPortId(), tCountry.getId());
        List<TRates> tRates = ratesService.selectList(new EntityWrapper<TRates>().in("metro_id", integers));
        // 满足码头的公司
        companyIdList.stream().forEach(t->{
            for (TRates tRate : tRates) {
                if(tRate.getCompanyId().equals(t)){
                    set.add(t);
                }
            }
        });
//        List<Integer> integers = Arrays.asList(demandDto.getPortId(), tCountry.getId());
//        List<TRates> tRates = ratesService.selectList(new EntityWrapper<TRates>().in("metro_id", integers));
//        // 满足码头的公司
//        companyIdList.stream().forEach(t->{
//            for (TRates tRate : tRates) {
//                if(tRate.getCompanyId().equals(t)){
//                    set.add(t);
//                }
//            }
//        });

        Integer portId = demandDto.getPortId();
        TPort tPort = itPortService.selectById(portId);
        String address = tPort.getAddress();
//        GeocodeVo geocode = googleMapUtil.getGeocode(address);

        List<TCompanyCalculationResp> tCompanyCalculationRespList = new ArrayList<>(tCompanyList.size());
        List<TCompanyCalculationResp> tCompanyCalculationRespList = new ArrayList<>();
//        List<Integer> collect1 = set.stream().filter(e -> e.equals(demandDto.getId())).collect(Collectors.toList());


        // 没有满足公司
        if(CollectionUtils.isEmpty(set)){
            quoteService.deleteById(tQuote.getId());
            return  new ErrorTip(5001,"No truck company was matched to meet the demand");
        }else {
            for (TCompany company : tCompanyList) {
            TCompany company = companyService.selectById(demandDto.getId());
                TCompanyCalculationResp tCompanyCalculationResp = new TCompanyCalculationResp();
                ArrayList<TOrder> tOrders = new ArrayList<>();
                // 超重 价格
@@ -218,10 +201,12 @@
                }else {
                    ratesId=tCountry.getId();
                }

                for (GoodsListDto goodsListDto : list1) {
                    ArrayList<TPrice> tPrices = new ArrayList<>();
                    // 生成订单


                    List<TGoods> list = goodsListDto.getList();
                    for (TGoods e : list) {
                    TOrder tOrder = new TOrder();
                    tOrder.setUserId(demandDto.getUserId());
                    tOrder.setAccessorial(demandDto.getAccessorial());
@@ -241,99 +226,129 @@
                    tOrder.setInvoiceNumber(s2);
                    tOrder.setCompanyId(company.getId());
                    tOrder.setCreateTime(new Date());
                        tOrder.seteAddress(demandDto.getEAddress());
                        tOrder.setOrderType(1);
                    orderService.insert(tOrder);
                    tOrders.add(tOrder);

                    List<GoodsDto> list = goodsListDto.getList();
                    ArrayList<TGoods> tGoods1 = new ArrayList<>();
                    for (GoodsDto goodsDto : list) {
                        TGoods tGoods = new TGoods();
                        tGoods.setShippingLine(goodsListDto.getShippingLine());
                        tGoods.setDanger(goodsListDto.getDanger());
                        tGoods.setKg(goodsDto.getKg());
                        tGoods.setOrderId(tOrder.getId());
                        tGoods.setSize(goodsDto.getSize());
                        tGoods.setType(goodsDto.getType());
                        tGoods.setWeight(goodsListDto.getWeight());
                        tGoods.setTypeClass(goodsDto.getTypeClass());
                        tGoods1.add(tGoods);
                    }
                    goodsService.insertBatch(tGoods1);

                        e.setOrderId(tOrder.getId());
                    TCompanyResp tCompanyResp = new TCompanyResp();
                    // 是否超重
                    Integer weight = goodsListDto.getWeight();
                        // 相差天数
                    long between = DateUtil.between(demandDto.getShipmentDate(), demandDto.getDeliveryDate(), DateUnit.DAY);
                    if(between==0){
                        between=1;
                    }
                    if(weight==1){
                        TCompanyFeeSetting feeSetting = companyFeeSettingService.selectOne(new EntityWrapper<TCompanyFeeSetting>().eq("company_id", company.getId()).eq("set_name", UserFeeSettingEnum.OVERWEIGHT.getDesc()));
                            TCompanyFeeSetting feeSetting = companyFeeSettingService.selectOne(new EntityWrapper<TCompanyFeeSetting>().eq("company_id", company.getId()).eq("rates_id",ratesId).eq("set_name", UserFeeSettingEnum.OVERWEIGHT.getDesc()));

                        tCompanyResp.setName(UserFeeSettingEnum.OVERWEIGHT.getDesc());
                            if(feeSetting==null){
                                tCompanyResp.setPrice(new BigDecimal(0));
                            }else {
                        tCompanyResp.setPrice(feeSetting.getSetValue());
                            }
                        objects.add(tCompanyResp);
                        TCompanyFeeSetting feeSetting1 = companyFeeSettingService.selectOne(new EntityWrapper<TCompanyFeeSetting>().eq("company_id", company.getId()).eq("set_name", "trl-axle chassis"));
                            TCompanyFeeSetting feeSetting1 = companyFeeSettingService.selectOne(new EntityWrapper<TCompanyFeeSetting>().eq("company_id", company.getId()).eq("rates_id",ratesId).eq("set_name", "trl-axle chassis"));
                        tCompanyResp=new TCompanyResp();
                        tCompanyResp.setName(UserFeeSettingEnum.CHASSIS_FEE.getDesc());
                            if(feeSetting1==null){
                                tCompanyResp.setPrice(new BigDecimal(0));
                            }else {
                        tCompanyResp.setPrice(feeSetting1.getSetValue().multiply(new BigDecimal(between)));
                            }

                        objects.add(tCompanyResp);
                    }else {
                        tCompanyResp=new TCompanyResp();
                        tCompanyResp.setName(UserFeeSettingEnum.CHASSIS_FEE.getDesc());
                        TCompanyFeeSetting feeSetting = companyFeeSettingService.selectOne(new EntityWrapper<TCompanyFeeSetting>().eq("company_id", company.getId()).eq("set_name", "Pool chassis"));

                            TCompanyFeeSetting feeSetting = companyFeeSettingService.selectOne(new EntityWrapper<TCompanyFeeSetting>().eq("company_id", company.getId()).eq("rates_id",ratesId).eq("set_name", "Pool chassis"));
                            if(feeSetting==null){
                                tCompanyResp.setPrice(new BigDecimal(0));
                            }else {
                        tCompanyResp.setPrice(feeSetting.getSetValue().multiply(new BigDecimal(between)));
                            }

                        objects.add(tCompanyResp);
                    }
                    // type
                    if ("Live Unload".equals(demandDto.getType())) {
                        // 计算当前公司的价格
                        tCompanyResp=new TCompanyResp();
                        BigDecimal setValue = companyFeeSettingService.selectOne(new EntityWrapper<TCompanyFeeSetting>().eq("company_id", company.getId()).eq("set_name", UserFeeSettingEnum.PREPULL.getDesc())).getSetValue();
                            TCompanyFeeSetting feeSetting = companyFeeSettingService.selectOne(new EntityWrapper<TCompanyFeeSetting>().eq("company_id", company.getId()).eq("rates_id", ratesId).eq("set_name", UserFeeSettingEnum.PREPULL.getDesc()));
                        tCompanyResp.setName(UserFeeSettingEnum.PREPULL.getDesc());
                        tCompanyResp.setPrice(setValue);
                            if(feeSetting==null){
                                tCompanyResp.setPrice(new BigDecimal(0));
                            }else {
                                tCompanyResp.setPrice(feeSetting.getSetValue());
                            }

                        objects.add(tCompanyResp);
                    }
                    // 滞留费
                    tCompanyResp=new TCompanyResp();
                    BigDecimal setValue = companyFeeSettingService.selectOne(new EntityWrapper<TCompanyFeeSetting>().eq("company_id", company.getId()).eq("set_name", UserFeeSettingEnum.DETENTION_CONGESTION.getDesc())).getSetValue();
                        TCompanyFeeSetting feeSetting = companyFeeSettingService.selectOne(new EntityWrapper<TCompanyFeeSetting>().eq("company_id", company.getId()).eq("rates_id", ratesId).eq("set_name", UserFeeSettingEnum.DETENTION_CONGESTION.getDesc()));

                    tCompanyResp.setName(UserFeeSettingEnum.DETENTION_CONGESTION.getDesc());
                    tCompanyResp.setPrice(setValue);
                        if(feeSetting==null){
                            tCompanyResp.setPrice(new BigDecimal(0));
                        }else {
                            tCompanyResp.setPrice(feeSetting.getSetValue());
                        }

                    objects.add(tCompanyResp);

                    if(goodsListDto.getDanger()==1){
                        tCompanyResp=new TCompanyResp();
                        BigDecimal setValue1 = companyFeeSettingService.selectOne(new EntityWrapper<TCompanyFeeSetting>().eq("company_id", company.getId()).eq("set_name", UserFeeSettingEnum.HAZMAT.getDesc())).getSetValue();
                            TCompanyFeeSetting feeSetting1 = companyFeeSettingService.selectOne(new EntityWrapper<TCompanyFeeSetting>().eq("company_id", company.getId()).eq("rates_id", ratesId).eq("set_name", UserFeeSettingEnum.HAZMAT.getDesc()));
                        tCompanyResp.setName(UserFeeSettingEnum.HAZMAT.getDesc());
                        tCompanyResp.setPrice(setValue1);
                            if(feeSetting1==null){
                                tCompanyResp.setPrice(new BigDecimal(0));
                            }else {
                                tCompanyResp.setPrice(feeSetting1.getSetValue());
                            }

                        objects.add(tCompanyResp);
                    }
                    if(demandDto.getUrgent()==1){
                        tCompanyResp=new TCompanyResp();
                        BigDecimal setValue1 = companyFeeSettingService.selectOne(new EntityWrapper<TCompanyFeeSetting>().eq("company_id", company.getId()).eq("set_name", UserFeeSettingEnum.URGENT_SEE.getDesc())).getSetValue();
                            TCompanyFeeSetting feeSetting1 = companyFeeSettingService.selectOne(new EntityWrapper<TCompanyFeeSetting>().eq("company_id", company.getId()).eq("rates_id", ratesId).eq("set_name", UserFeeSettingEnum.URGENT_SEE.getDesc()));

                        tCompanyResp.setName(UserFeeSettingEnum.URGENT_SEE.getDesc());
                        tCompanyResp.setPrice(setValue1);
                            if(feeSetting1==null){
                                tCompanyResp.setPrice(new BigDecimal(0));
                            }else {
                                tCompanyResp.setPrice(feeSetting1.getSetValue());
                            }
                        objects.add(tCompanyResp);
                    }
                    if(demandDto.getPiperpass()==1){
                        tCompanyResp=new TCompanyResp();
                        BigDecimal setValue1 = companyFeeSettingService.selectOne(new EntityWrapper<TCompanyFeeSetting>().eq("company_id", company.getId()).eq("set_name", UserFeeSettingEnum.PIERPASS.getDesc())).getSetValue();
                            TCompanyFeeSetting feeSetting1 = companyFeeSettingService.selectOne(new EntityWrapper<TCompanyFeeSetting>().eq("company_id", company.getId()).eq("rates_id", ratesId).eq("set_name", UserFeeSettingEnum.PIERPASS.getDesc()));
                        tCompanyResp.setName(UserFeeSettingEnum.PIERPASS.getDesc());
                        tCompanyResp.setPrice(setValue1);
                            if(feeSetting1==null){
                                tCompanyResp.setPrice(new BigDecimal(0));
                            }else {
                                tCompanyResp.setPrice(feeSetting1.getSetValue());
                            }
                        objects.add(tCompanyResp);
                    }
                    if(demandDto.getCTF()==1){
                        tCompanyResp=new TCompanyResp();
                        BigDecimal setValue1 = companyFeeSettingService.selectOne(new EntityWrapper<TCompanyFeeSetting>().eq("company_id", company.getId()).eq("set_name", UserFeeSettingEnum.CTF.getDesc())).getSetValue();
                            TCompanyFeeSetting feeSetting1 = companyFeeSettingService.selectOne(new EntityWrapper<TCompanyFeeSetting>().eq("company_id", company.getId()).eq("rates_id", ratesId).eq("set_name", UserFeeSettingEnum.CTF.getDesc()));
                        tCompanyResp.setName(UserFeeSettingEnum.CTF.getDesc());
                        tCompanyResp.setPrice(setValue1);
                            if(feeSetting1==null){
                                tCompanyResp.setPrice(new BigDecimal(0));
                            }else {
                                tCompanyResp.setPrice(feeSetting1.getSetValue());
                            }
                        objects.add(tCompanyResp);
                    }


                    if("0".equals(demandDto.getWarehouse())){
                        tCompanyResp=new TCompanyResp();
                        BigDecimal setValue1 = companyFeeSettingService.selectOne(new EntityWrapper<TCompanyFeeSetting>().eq("company_id", company.getId()).eq("set_name", demandDto.getDelivery())).getSetValue();
                            BigDecimal setValue1 = companyFeeSettingService.selectOne(new EntityWrapper<TCompanyFeeSetting>().eq("company_id", company.getId()).eq("rates_id",ratesId).eq("set_name", demandDto.getDelivery())).getSetValue();
                        tCompanyResp.setName(demandDto.getDelivery());
                        tCompanyResp.setPrice(setValue1);
                        objects.add(tCompanyResp);
@@ -358,6 +373,7 @@
                                tCompanyResp=new TCompanyResp();
                                // 1条数据  不需要zipcode
                                TCompanyBasic type1 = companyBasicService.selectOne(new EntityWrapper<TCompanyBasic>().eq("type", 3).eq("port_id",ratesId));
                                    if(type1!=null) {
                                DistancematrixVo distancematrix = googleMapUtil.getDistancematrix(address, type1.getAddress());
                                double distance = distancematrix.getDistance().doubleValue();
                                BigDecimal bigDecimal = new BigDecimal(distance * 0.0006214);
@@ -365,6 +381,11 @@
                                tCompanyResp.setPrice(multiply);
                                tCompanyResp.setName("LH+FSC");
                                objects.add(tCompanyResp);
                                    }else {
                                        tCompanyResp.setPrice(new BigDecimal(0));
                                        tCompanyResp.setName("LH+FSC");
                                        objects.add(tCompanyResp);
                                    }
                            }
                        }

@@ -379,10 +400,10 @@
                        }
                        objects.add(tCompanyResp);
                    }
                    BigDecimal bigDecimal = objects.stream().map(e -> e.getPrice()).reduce(BigDecimal::add).get();
                        BigDecimal bigDecimal = objects.stream().map(e1 -> e1.getPrice()).reduce(BigDecimal::add).get();
                    tOrder.setAllTotal(bigDecimal);
                    orderService.updateById(tOrder);
                    objects.stream().forEach(e->e.setOrderId(tOrder.getId()));
                        objects.stream().forEach(e2->e2.setOrderId(tOrder.getId()));

                    for (TCompanyResp object : objects) {
                        TPrice tPrice = new TPrice();
@@ -395,39 +416,12 @@
                    }
                    priceService.insertBatch(tPrices);
                }
                    goodsService.insertBatch(list);


                }

                tCompanyCalculationResp.setOrderList(tOrders);


//                if(CollectionUtil.isNotEmpty(tUserFeeSettings)){
//                    for (TCompanyResp object : objects) {
//                        TPrice tPrice = new TPrice();
//                        tPrice.setCreateTime(new Date());
//                        tPrice.setOrderId(object.getOrderId());
//                        tPrice.setState("1");
//                        tPrice.setPrice(object.getPrice());
//                        tPrice.setType(object.getName());
//                        tPrices.add(tPrice);
//                        for (TUserFeeSetting tUserFeeSetting : tUserFeeSettings) {
//                            if(object.getName().equals(tUserFeeSetting.getName())){
//                                double i = (double)tUserFeeSetting.getFee() / 100;
//                                BigDecimal multiply = object.getPrice().multiply(new BigDecimal(i));
//                            }
//                        }
//                    }
//                }else {
//                    for (TCompanyResp object : objects) {
//                        TPrice tPrice = new TPrice();
//                        tPrice.setCreateTime(new Date());
//                        tPrice.setOrderId(object.getOrderId());
//                        tPrice.setState("1");
//                        tPrice.setPrice(object.getPrice());
//                        tPrice.setType(object.getName());
//                        tPrices.add(tPrice);
//
//                    }
//                }
//                priceService.insertBatch(tPrices);
                tCompanyCalculationResp.setList(objects);
                tCompanyCalculationResp.setCarGoNumber(String.valueOf(company.getMcNumber()));
                tCompanyCalculationResp.setCompanyId(company.getId());
@@ -457,11 +451,9 @@
                }


            }

        }
        for (TCompanyCalculationResp tCompanyCalculationResp : tCompanyCalculationRespList) {
            tCompanyCalculationResp.setQuoteId(tQuote.getId());
        for (TCompanyCalculationResp tCompanyCalculationResp1 : tCompanyCalculationRespList) {
            tCompanyCalculationResp1.setQuoteId(tQuote.getId());
        }
        return new SuccessTip(tCompanyCalculationRespList);
    }
@@ -523,11 +515,6 @@
            }
            tOrder.setPayMoney(bigDecimal);
            orderService.updateById(tOrder);






        }
        return new SuccessTip();
@@ -705,7 +692,7 @@
        Page<TWarehouse> tWarehousePage = new Page<>(pageNumber, pageSize);

        EntityWrapper<TWarehouse> tWarehouseEntityWrapper = new EntityWrapper<>();
        tWarehouseEntityWrapper.eq("company_id",1);
        tWarehouseEntityWrapper.eq("company_id",0);
        if(Objects.nonNull(address)){
            tWarehouseEntityWrapper.like("address",address);
        }
@@ -752,4 +739,17 @@
    }


    @ApiOperation(value = "根据亚马逊code获取地址",notes="根据亚马逊code获取地址")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "code", value = "code", required = true, dataType = "String"),
    })
    @GetMapping(value = "/getWarehouseFromCode")
    @ResponseBody
    public Object getWarehouseFromCode(String code) {
        TWarehouse tWarehouse = warehouseService.selectList(new EntityWrapper<TWarehouse>().eq("code", code).eq("company_id", 0)).get(0);
        return new SuccessTip(tWarehouse.getAddress() );
    }


}

 src/main/java/com/stylefeng/guns/modular/system/controller/DriverController.java

@@ -10,7 +10,6 @@
import com.stylefeng.guns.modular.system.model.TDriver;
import com.stylefeng.guns.modular.system.model.TDriverListVo;
import com.stylefeng.guns.modular.system.service.ITDriverService;
import com.stylefeng.guns.modular.system.utils.UserInfoUtil;
import com.stylefeng.guns.modular.system.utils.WoUtil;
import com.stylefeng.guns.modular.system.utils.tips.ErrorTip;
import com.stylefeng.guns.modular.system.utils.tips.SuccessTip;
@@ -54,17 +53,20 @@
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "time", value = "2000-01-01 - 2000-11-11", required = false, dataType = "String"),
            @ApiImplicitParam(name = "name", value = "name", required = false, dataType = "String"),
            @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "int"),
            @ApiImplicitParam(name = "pageNumber", value = "pageNumber", required = true, dataType = "int"),
            @ApiImplicitParam(name = "pageSize", value = "pageSize", required = true, dataType = "int"),
    })
    @GetMapping(value = "/driverList")
    @ResponseBody
    public Object driverList(String time, String name, int pageNumber, int pageSize) {
    public Object driverList(String time, String name,int id, int pageNumber, int pageSize) {
        String sTime = null;
        String eTime = null;
        EntityWrapper<TDriver> wrapper = new EntityWrapper<>();
        Page<TDriver> tDriverPage = new Page<>(pageNumber, pageSize);
        wrapper.eq("remove", 0);
        wrapper.eq("is_carriers",1);
        wrapper.eq("company_id",id);
        if (ToolUtil.isNotEmpty(name)) {
            wrapper.like("driver_name", name).or().like("account", name);
        }
@@ -96,7 +98,6 @@
    @ResponseBody
    public Object driverAdd(@RequestBody TDriver driver) {
        try {
            driver.setCompanyId(UserInfoUtil.getId());
            driver.setCreateTime(new Date());
            driverService.insert(driver);
            return new SuccessTip();
@@ -197,36 +198,42 @@
                Cell cell2 = row.getCell(2);
                String two = null;//Driver Number
                if (ToolUtil.isNotEmpty(cell2)) {
                    cell2.setCellType(Cell.CELL_TYPE_STRING);
                    two = String.valueOf(cell2.getStringCellValue()).trim();
                }

                Cell cell3 = row.getCell(3);
                String three = null;//Date of Birth
                if (ToolUtil.isNotEmpty(cell3)) {
                    cell3.setCellType(Cell.CELL_TYPE_STRING);
                    three = String.valueOf(cell3.getStringCellValue()).trim();
                }

                Cell cell4 = row.getCell(4);
                String four = null;//Address
                if (ToolUtil.isNotEmpty(cell4)) {
                    cell4.setCellType(Cell.CELL_TYPE_STRING);
                    four = String.valueOf(cell4.getStringCellValue()).trim();
                }

                Cell cell5 = row.getCell(5);
                String five = null;//Driver Type
                if (ToolUtil.isNotEmpty(cell5)) {
                    cell5.setCellType(Cell.CELL_TYPE_STRING);
                    five = String.valueOf(cell5.getStringCellValue()).trim();
                }

                Cell cell6 = row.getCell(6);
                String six = null;//Status
                if (ToolUtil.isNotEmpty(cell6)) {
                    cell6.setCellType(Cell.CELL_TYPE_STRING);
                    six = String.valueOf(cell6.getStringCellValue()).trim();
                }

                Cell cell7 = row.getCell(7);
                String seven = null;//StatusRemark
                if (ToolUtil.isNotEmpty(cell7)) {
                    cell7.setCellType(Cell.CELL_TYPE_STRING);
                    seven = String.valueOf(cell7.getStringCellValue()).trim();
                }


 src/main/java/com/stylefeng/guns/modular/system/controller/FinanceController.java

@@ -44,12 +44,13 @@
            @ApiImplicitParam(name = "pageSize", value = "pageSize", required = true, dataType = "int",paramType = "query"),
            @ApiImplicitParam(name = "time", value = "时间 （时间 - 时间）", required = false, dataType = "String"),
            @ApiImplicitParam(name = "name", value = "名称", required = false, dataType = "String"),
            @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "int"),
    })
    @PostMapping(value = "/list")
    @ResponseBody
    public Object list(int pageNumber,int pageSize,String time,String name) {
    public Object list(int pageNumber,int pageSize,String time,String name,int id) {
        Page<ReceivableVo> receivableVoPage = new Page<>(pageNumber, pageSize);
        return new SuccessTip(orderService.getReceivable(receivableVoPage,time,name));
        return new SuccessTip(orderService.getReceivable(receivableVoPage,time,name,id));
    }


@@ -60,13 +61,14 @@
            @ApiImplicitParam(name = "pageSize", value = "pageSize", required = true, dataType = "int",paramType = "query"),
            @ApiImplicitParam(name = "time", value = "时间 （时间 - 时间）", required = false, dataType = "String"),
            @ApiImplicitParam(name = "name", value = "名称", required = false, dataType = "String"),
            @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "int"),
    })
    @PostMapping(value = "/payList")
    @ResponseBody
    public Object payList(int pageNumber,int pageSize,String time,String name) {
    public Object payList(int pageNumber,int pageSize,String time,String name,int id) {
        Page<ShouldPayVo> receivableVoPage = new Page<>(pageNumber, pageSize);

        return new SuccessTip(orderService.getPayList(receivableVoPage,time,name));
        return new SuccessTip(orderService.getPayList(receivableVoPage,time,name,id));
    }

    @ApiOperation(value = "应收款票据列表",notes="应收款票据列表")
@@ -79,12 +81,13 @@
            @ApiImplicitParam(name = "invoicesId", value = "invoicesId", required = false, dataType = "Integer"),
            @ApiImplicitParam(name = "orderId", value = "orderId", required = false, dataType = "Integer"),
            @ApiImplicitParam(name = "state", value = "1未支付完 2已支付", required = false, dataType = "Integer"),
            @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Integer"),
    })
    @PostMapping(value = "/listOfReceivables")
    @ResponseBody
    public Object listOfReceivables(int pageNumber,int pageSize,String time,String name,Integer invoicesId,Integer orderId,Integer state) {
    public Object listOfReceivables(int pageNumber,int pageSize,String time,String name,Integer invoicesId,Integer orderId,Integer state,Integer id) {
        Page<ReceivablesList> receivableVoPage = new Page<>(pageNumber, pageSize);
        List<ReceivablesList> receivablesLists = orderService.listOfReceivables(receivableVoPage, time, name, invoicesId, orderId, state);
        List<ReceivablesList> receivablesLists = orderService.listOfReceivables(receivableVoPage, time, name, invoicesId, orderId, state,id);
        receivableVoPage.setRecords(receivablesLists);
        return new SuccessTip(receivableVoPage);
    }
@@ -144,29 +147,15 @@
    @ApiOperation(value = "应收款票据详情--编辑价格",notes="应收款票据详情--编辑价格")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "id", value = "价格id", required = true, dataType = "int"),
            @ApiImplicitParam(name = "type", value = "价格类型名称", required = false, dataType = "String"),
            @ApiImplicitParam(name = "price", value = "价格", required = false, dataType = "Double"),
    })
    @GetMapping(value = "/updatePrice")
    @PostMapping(value = "/updatePrice")
    @ResponseBody
    public Object updatePrice(int id,String type,Double price) {
        TPrice tPrice = priceService.selectById(id);
        if(ToolUtil.isNotEmpty(type)){
            tPrice.setType(type);
        }
        if(ToolUtil.isNotEmpty(price)){
            BigDecimal bigDecimal = new BigDecimal(price);
            tPrice.setPrice(bigDecimal);
            tPrice.setCarPrice(bigDecimal);
        }
        try {
            priceService.updateById(tPrice);
    public Object updatePrice(@RequestBody List<TPrice> prices,String note) {
        priceService.insertBatch(prices);
        Long orderId = prices.get(0).getOrderId();
        TOrder tOrder = orderService.selectById(orderId);
        tOrder.setNote(note);
            return new SuccessTip();
        }catch (Exception e){
            e.printStackTrace();
        }
        return new ErrorTip(500,"ERROR");
    }

    @ApiOperation(value = "应收款票据详情--删除价格",notes="应收款票据详情--删除价格")
@@ -196,12 +185,13 @@
            @ApiImplicitParam(name = "billId", value = "billId", required = false, dataType = "Integer"),
            @ApiImplicitParam(name = "orderId", value = "orderId", required = false, dataType = "Integer"),
            @ApiImplicitParam(name = "state", value = "1未支付完 2已支付", required = false, dataType = "Integer"),
            @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Integer"),
    })
    @GetMapping(value = "/listOfPay")
    @ResponseBody
    public Object listOfPay(int pageNumber,int pageSize,String time,String name,Integer billId,Integer orderId,Integer state) {
    public Object listOfPay(int pageNumber,int pageSize,String time,String name,Integer billId,Integer orderId,Integer state,Integer id) {
        Page<PayList> receivableVoPage = new Page<>(pageNumber, pageSize);
        List<PayList> payLists = orderService.listOfPay(receivableVoPage, time, name, billId, orderId, state);
        List<PayList> payLists = orderService.listOfPay(receivableVoPage, time, name, billId, orderId, state,id);
        receivableVoPage.setRecords(payLists);
        return new SuccessTip(receivableVoPage);
    }

 src/main/java/com/stylefeng/guns/modular/system/controller/IndexController.java

@@ -36,11 +36,12 @@
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "time", value = "2000-01-01 - 2000-11-11", required = false, dataType = "String"),
            @ApiImplicitParam(name = "id", value = "卡车公司id", required = true, dataType = "String"),
    })
    @GetMapping(value = "/index")
    @ResponseBody
    public Object list(String time) {
        IndexInfo vo =  orderService.indexList(time);
    public Object list(String time,int id) {
        IndexInfo vo =  orderService.indexList(time,id);
        return new SuccessTip(vo);
    }


 src/main/java/com/stylefeng/guns/modular/system/controller/OrderController.java

@@ -1,5 +1,6 @@
package com.stylefeng.guns.modular.system.controller;

import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.modular.system.model.*;
@@ -141,8 +142,13 @@
        return new SuccessTip(orderInfo);
    }

    @Resource
    private TTransportationService tTransportationService;

    @ApiOperation(value = "获取运输安排",notes="获取运输安排")
    @Resource
    private TPowerUnitsService powerUnitsService;

    @ApiOperation(value = "卡车公司-获取运输安排",notes="卡车公司-获取运输安排")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "orderId", value = "orderId", required = true, dataType = "Long"),
@@ -172,26 +178,41 @@
        if(driverIdOne!=null){
            driverIds.add(driverIdOne);
        }
        List<TDriver> tDrivers = driverService.selectList(new EntityWrapper<TDriver>().in("id", driverIds));
        for (TDriver tDriver : tDrivers) {
        List<TTransportation> tTransportations = tTransportationService.selectList(new EntityWrapper<TTransportation>().eq("order_id", orderId).in("driver_id", driverIds));
        for (TTransportation tDriver : tTransportations) {
            OrderDriverInfo orderDriverInfo = new OrderDriverInfo();
            orderDriverInfo.setId(tDriver.getId());
            orderDriverInfo.setTime(tOrder.getShipmentDate());
            // TODO 创建司机没有email  phone
            orderDriverInfo.setContactEmail(null);
            orderDriverInfo.setContactName(tDriver.getDriverName());
            orderDriverInfo.setContactPhone(null);
            if(tDriver.getId().equals(sDriverIdOne)&&tDriver.getType()==2){
                orderDriverInfo.setPickUp(tDriver.getPickDate());
            }
            if(tDriver.getId().equals(driverid) &&tDriver.getType()==3){
                orderDriverInfo.setEmptyDate(tDriver.getEmptyDate());
            }
            if(tDriver.getId().equals(driverIdOne) &&tDriver.getType()==4){
                orderDriverInfo.setReturnDate(tDriver.getReturnDate());
            }
            orderDriverInfo.setContactEmail(tDriver.getEmail());
            orderDriverInfo.setContactName(tDriver.getName());
            orderDriverInfo.setContactPhone(tDriver.getPhone());
            orderDriverInfo.setTPowerUnits(powerUnitsService.selectById(tDriver.getPowerUnit()));
            orderDriverInfo.setChassiess(powerUnitsService.selectById(tDriver.getChassises()));

            // TODO 第三方  目前不知道对接那个
            orderDriverInfo.setAppointmentNumber(null);

            orderDriverInfos.add(orderDriverInfo);

        }
        transportInfo.setTruckCompany(tOrder.getTruckCompany());
        transportInfo.setPickupTime(tOrder.getPickupTimeTruck());
        transportInfo.setStreetTurn(tOrder.getStreetTurn());
        transportInfo.setList(orderDriverInfos);
        Integer examSite = tOrder.getExamSite();
        if(Objects.nonNull(examSite)){
            TExamSite tExamSite = examSiteService.selectById(examSite);
            transportInfo.setAddress(tExamSite.getAddress());
            transportInfo.setContactEmail(tExamSite.getContactEmail());
            transportInfo.setContactName(tExamSite.getContactName());
            transportInfo.setContactName(tExamSite.getContactPhone());
            transportInfo.setExamSiteName(tExamSite.getExamSiteName());
            transportInfo.setZipCode(tExamSite.getZipCode());
        }
@@ -277,6 +298,213 @@
        return new SuccessTip(page);
    }



    @ApiOperation(value = "卡车公司--安排司机",notes="卡车公司--安排司机")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType     = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
    })
    @PostMapping(value = "/selectDriver")
    @ResponseBody
    public Object selectDriver(@RequestBody CompanySelectDriverDto companySelectDriverDto){
        try {

            Long orderId = companySelectDriverDto.getOrderId();
            // 找出这个订单
            TOrder tOrder = orderService.selectById(orderId);
            List<TTransportation> list = companySelectDriverDto.getList();
            tOrder.setsDriverid(list.get(0).getDriverId());
            tOrder.setsDriverIdOne(list.get(1).getDriverId());
            tOrder.seteDriverid(list.get(2).getDriverId());
            tOrder.seteDriverIdOne(list.get(3).getDriverId());
            tOrder.setTruckCompany(companySelectDriverDto.getTruckCompany());
            tOrder.setPickupTimeTruck(companySelectDriverDto.getPickupTime());
            tOrder.setStreetTurn(companySelectDriverDto.getStreetTurn());
            // 添加司机信息
            tTransportationService.insertBatch(companySelectDriverDto.getList());
            // 更改订单信息
            orderService.updateById(tOrder);
            return new SuccessTip();
        }catch (Exception e){
            e.printStackTrace();
        }
        return new ErrorTip(500,"ERROR");
    }


    @ApiOperation(value = "卡车公司--修改安排司机（多个）",notes="卡车公司--修改安排司机（多个）")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType     = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
    })
    @PostMapping(value = "/updateDriver")
    @ResponseBody
    public Object updateDriver(@RequestBody CompanySelectDriverDto companySelectDriverDto){
        try {

            Long orderId = companySelectDriverDto.getOrderId();
            // 找出这个订单
            TOrder tOrder = orderService.selectById(orderId);
            List<TTransportation> list = companySelectDriverDto.getList();
            tOrder.setsDriverid(list.get(0).getDriverId());
            tOrder.setsDriverIdOne(list.get(1).getDriverId());
            tOrder.seteDriverid(list.get(2).getDriverId());
            tOrder.seteDriverIdOne(list.get(3).getDriverId());
            tOrder.setTruckCompany(companySelectDriverDto.getTruckCompany());
            tOrder.setPickupTimeTruck(companySelectDriverDto.getPickupTime());
            tOrder.setStreetTurn(companySelectDriverDto.getStreetTurn());
            // 删除原来的司机信息
            tTransportationService.delete(new EntityWrapper<TTransportation>().eq("order_id",orderId));
            // 添加新司机信息
            tTransportationService.insertBatch(companySelectDriverDto.getList());
            // 更改订单信息
            orderService.updateById(tOrder);
            return new SuccessTip();
        }catch (Exception e){
            e.printStackTrace();
        }
        return new ErrorTip(500,"ERROR");
    }


    @ApiOperation(value = "卡车公司--修改安排司机（单个）",notes="卡车公司--修改安排司机（单个）")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType     = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
    })
    @PostMapping(value = "/updateDriverSingle")
    @ResponseBody
    public Object updateDriverSingle(@RequestBody CompanySelectDriverSingleDto companySelectDriverSingleDto){
        try {

            Long orderId = companySelectDriverSingleDto.getOrderId();
            // 找出这个订单
            TOrder tOrder = orderService.selectById(orderId);
            TTransportation list = companySelectDriverSingleDto.getList();
            Integer type = companySelectDriverSingleDto.getType();
            if(type==1){
                tTransportationService.delete(new EntityWrapper<TTransportation>().eq("order_id",orderId).eq("driver_id",tOrder.getsDriverid()));
                tOrder.setsDriverid(list.getDriverId());
            }else if(type==2){
                tTransportationService.delete(new EntityWrapper<TTransportation>().eq("order_id",orderId).eq("driver_id",tOrder.getsDriverIdOne()));
                tOrder.setsDriverIdOne(list.getDriverId());
            }else if(type==3){
                tTransportationService.delete(new EntityWrapper<TTransportation>().eq("order_id",orderId).eq("driver_id",tOrder.geteDriverid()));
                tOrder.seteDriverid(list.getDriverId());
            }else {
                tTransportationService.delete(new EntityWrapper<TTransportation>().eq("order_id",orderId).eq("driver_id",tOrder.geteDriverIdOne()));
                tOrder.seteDriverIdOne(list.getDriverId());
            }
            tTransportationService.insert(list);
            // 删除原来的司机信息
            // 更改订单信息
            orderService.updateById(tOrder);
            return new SuccessTip();
        }catch (Exception e){
            e.printStackTrace();
        }
        return new ErrorTip(500,"ERROR");
    }


    @Resource
    private TYardService yardService;


    @ApiOperation(value = "卡车公司--点击定位（场地/码头）",notes="卡车公司--点击定位（场地/码头）")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType     = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
    })
    @PostMapping(value = "/getLocation")
    @ResponseBody
    public Object getLocation(@RequestBody CompanyLocationDto companyLocationDto){
        try {

            Long orderId = companyLocationDto.getOrderId();
            // 找出这个订单
            TOrder tOrder = orderService.selectById(orderId);
            Integer type = companyLocationDto.getType();
            if(type==1){
                TTransportation tTransportation = tTransportationService.selectOne(new EntityWrapper<TTransportation>().eq("order_id", orderId).eq("driver_id", tOrder.getsDriverIdOne()));
                if(tTransportation!=null){
                    Integer yardId = tTransportation.getYardId();
                    TYard tYard = yardService.selectById(yardId);
                    return new SuccessTip(tYard);
                }
            }else if(type==2){
                TTransportation tTransportation = tTransportationService.selectOne(new EntityWrapper<TTransportation>().eq("order_id", orderId).eq("driver_id", tOrder.geteDriverid()));
                if(tTransportation!=null) {
                    Integer yardId = tTransportation.getYardId();
                    TYard tYard = yardService.selectById(yardId);
                    return new SuccessTip(tYard);
                }
            }else if(type==3){
                TTransportation tTransportation = tTransportationService.selectOne(new EntityWrapper<TTransportation>().eq("order_id", orderId).eq("driver_id", tOrder.geteDriverIdOne()));
                if(tTransportation!=null) {
                    Integer portId = tTransportation.getPortId();
                    TPort tPort = portService.selectById(portId);
                    return new SuccessTip(tPort);
                }
            }
            return new ErrorTip(5001,"not found");
        }catch (Exception e){
            e.printStackTrace();
        }
        return new ErrorTip(500,"ERROR");
    }



    @ApiOperation(value = "运输安排---选择公司司机",notes="运输安排---选择公司司机")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType     = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "pageNumber", value = "pageNumber", required = true, dataType = "int"),
            @ApiImplicitParam(name = "pageSize", value = "pageSize", required = true, dataType = "int"),
            @ApiImplicitParam(name = "id", value = "当前公司id", required = true, dataType = "int"),
    })
    @GetMapping(value = "/getDriverSelect")
    @ResponseBody
    public Object getDriverSelect(int pageNumber,int pageSize,int id){
        Page<TDriver> tDriverPage = new Page<>(pageNumber, pageSize);
        Page<TDriver> tDriverPage1 = driverService.selectPage(tDriverPage, new EntityWrapper<TDriver>().eq("is_carriers", 1).eq("company_id", id).eq("remove", 0));
        ArrayList<TDriverSelectVo> tDriverSelectVos = new ArrayList<>();
        List<TDriver> records = tDriverPage1.getRecords();
        records.forEach(e->{
            TDriverSelectVo tDriverSelectVo = new TDriverSelectVo();
            BeanUtil.copyProperties(e,tDriverSelectVo);
            tDriverSelectVos.add(tDriverSelectVo);
        });
        Page<TDriverSelectVo> page = new Page<>();
        BeanUtil.copyProperties(tDriverPage1,page);
        page.setRecords(tDriverSelectVos);
        return new SuccessTip(page);
    }



    @ApiOperation(value = "运输安排---承运商选择司机",notes="运输安排---承运商选择司机")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType     = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "pageNumber", value = "pageNumber", required = true, dataType = "int"),
            @ApiImplicitParam(name = "pageSize", value = "pageSize", required = true, dataType = "int"),
            @ApiImplicitParam(name = "id", value = "承运商ud", required = true, dataType = "int"),
    })
    @GetMapping(value = "/getDriverSelectFromCarriers")
    @ResponseBody
    public Object getDriverSelectFromCarriers(int pageNumber,int pageSize,int id){
        Page<TDriver> tDriverPage = new Page<>(pageNumber, pageSize);
        Page<TDriver> tDriverPage1 = driverService.selectPage(tDriverPage, new EntityWrapper<TDriver>().eq("is_carriers", 2).eq("carriers_id", id).eq("remove", 0));
        ArrayList<TDriverSelectVo> tDriverSelectVos = new ArrayList<>();
        List<TDriver> records = tDriverPage1.getRecords();
        records.forEach(e->{
            TDriverSelectVo tDriverSelectVo = new TDriverSelectVo();
            BeanUtil.copyProperties(e,tDriverSelectVo);
            tDriverSelectVos.add(tDriverSelectVo);
        });
        Page<TDriverSelectVo> page = new Page<>();
        BeanUtil.copyProperties(tDriverPage1,page);
        page.setRecords(tDriverSelectVos);
        return new SuccessTip(page);
    }

    @ApiOperation(value = "获取订单文件",notes="获取订单文件")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType     = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),

 src/main/java/com/stylefeng/guns/modular/system/controller/RatesController.java

@@ -2,36 +2,25 @@


import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.modular.system.dao.TCompanyFeeSettingMapper;
import com.stylefeng.guns.modular.system.dao.TPortMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.utils.UserInfoUtil;
import com.stylefeng.guns.modular.system.utils.tips.SuccessTip;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.stream.Collectors;

@Controller
@Api(tags = "费用设置")
@@ -55,12 +44,12 @@
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "pageNumber", value = "pageNumber", required = true, dataType = "int",paramType = "query"),
            @ApiImplicitParam(name = "pageSize", value = "pageSize", required = true, dataType = "int",paramType = "query"),
            @ApiImplicitParam(name = "id", value = "当前公司id", required = true, dataType = "int",paramType = "query"),
    })
    @GetMapping(value = "/metroList")
    @ResponseBody
    public Object metroList(int pageNumber,int pageSize) {
    public Object metroList(int pageNumber,int pageSize,int id) {
        Page<TRates> tRatesPage = new Page<>(pageNumber, pageSize);
        Integer id = UserInfoUtil.getId();
        Page<TRates> tRates = ratesService.selectPage(tRatesPage,new EntityWrapper<TRates>().eq("company_id", id).eq("type", 1));
        Page<TRatesVo> tRatesVoPage = new Page<>();
        BeanUtil.copyProperties(tRates,tRatesVoPage);
@@ -91,12 +80,12 @@
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "pageNumber", value = "pageNumber", required = true, dataType = "int",paramType = "query"),
            @ApiImplicitParam(name = "pageSize", value = "pageSize", required = true, dataType = "int",paramType = "query"),
            @ApiImplicitParam(name = "id", value = "当前公司id", required = true, dataType = "int",paramType = "query"),
    })
    @GetMapping(value = "/specialPortList")
    @ResponseBody
    public Object specialPortList(int pageNumber,int pageSize) {
    public Object specialPortList(int pageNumber,int pageSize,int id) {
        Page<TRates> tRatesPage = new Page<>(pageNumber, pageSize);
        Integer id = UserInfoUtil.getId();
        Page<TRates> tRates = ratesService.selectPage(tRatesPage,new EntityWrapper<TRates>().eq("company_id", id).eq("type", 2));
        Page<TRatesVoOne> tRatesVoPage = new Page<>();
        BeanUtil.copyProperties(tRates,tRatesVoPage);
@@ -109,6 +98,7 @@
            TPort tPort = tPortMapper.selectById(record.getMetroId());
            tRatesVo.setAddress(tPort.getAddress());
            tRatesVo.setZipCode(tPort.getZipCode());
            tRatesVo.setPortName(tPort.getName());
            TCountry tCountry = countryService.selectById(tPort.getCity());
            tRatesVo.setMetro(tCountry.getName());
            // state
@@ -171,13 +161,13 @@
        ratesService.insert(tRates);
        List<TWarehouse> tWarehouses = warehouseService.selectList(new EntityWrapper<TWarehouse>().eq("company_id", 0));
        tWarehouses.stream().forEach(e->{
            e.setCompanyId(UserInfoUtil.getId());
            e.setPortId(tRates.getId());
        });
        ExecutorService executorService = Executors.newCachedThreadPool();
        executorService.submit(new Runnable() {
            @Override
            public void run() {
                tWarehouses.forEach(e->e.setCompanyId(tRates.getCompanyId()));
                warehouseService.insertBatch(tWarehouses);
            }
        });
@@ -334,12 +324,12 @@
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "int",paramType = "query"),
            @ApiImplicitParam(name = "companyId", value = "当前公司id", required = true, dataType = "int",paramType = "query"),
    })
    @GetMapping(value = "/getFee")
    @ResponseBody
    public Object getFee( int id) {
        Integer id1 = UserInfoUtil.getId();
        List<TCompanyFeeSetting> feeSettings = tCompanyFeeSettingMapper.selectList(new EntityWrapper<TCompanyFeeSetting>().eq("rates_id", id).eq("company_id", id1));
    public Object getFee( int id,int companyId) {
        List<TCompanyFeeSetting> feeSettings = tCompanyFeeSettingMapper.selectList(new EntityWrapper<TCompanyFeeSetting>().eq("rates_id", id).eq("company_id", companyId));
        return new SuccessTip(feeSettings);
    }

@@ -350,8 +340,6 @@
    @PostMapping(value = "/addFee")
    @ResponseBody
    public Object addFee(@RequestBody List<TCompanyFeeSetting> feeSettings) {
        Integer id1 = UserInfoUtil.getId();
        feeSettings.forEach(e->e.setCompanyId(id1));
        tCompanyFeeSettingMapper.insertBatch(feeSettings);
        return new SuccessTip();
    }

 src/main/java/com/stylefeng/guns/modular/system/controller/TCarriersController.java

@@ -1,7 +1,5 @@
package com.stylefeng.guns.modular.system.controller;

import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateTime;
import cn.hutool.crypto.SecureUtil;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
@@ -10,7 +8,6 @@
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.TCarriers;
import com.stylefeng.guns.modular.system.service.TCarriersService;
import com.stylefeng.guns.modular.system.utils.UserInfoUtil;
import com.stylefeng.guns.modular.system.utils.WoUtil;
import com.stylefeng.guns.modular.system.utils.tips.ErrorTip;
import com.stylefeng.guns.modular.system.utils.tips.SuccessTip;
@@ -88,10 +85,24 @@
    @PostMapping(value = "/addCarriers")
    @ResponseBody
    public Object addCarriers(@RequestBody TCarriers tCarriers) {
        tCarriers.setCompanyId(UserInfoUtil.getId());
        tCarriers.setCreateTime(new Date());
        carriersService.insert(tCarriers);
        return new SuccessTip();
    }


    @ApiOperation(value = "卡车公司-承运商详情",notes="卡车公司-承运商详情")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "int",paramType = "query"),
    })
    @PostMapping(value = "/carriersInfo")
    @ResponseBody
    public Object carriersInfo( int id) {
        TCarriers tCarriers = carriersService.selectById(id);
        return new SuccessTip(tCarriers);
    }


    @ApiOperation(value = "卡车公司-编辑承运商",notes="卡车公司-编辑承运商")
    @ApiImplicitParams({
@@ -131,7 +142,7 @@
    })
    @RequestMapping(value = "/exportCarriers", method = RequestMethod.POST)
    @ResponseBody
    public Object exportCarriers(HttpServletRequest request, MultipartFile file) {
    public Object exportCarriers(HttpServletRequest request, MultipartFile file,int id) {
        try {
            Workbook book = WoUtil.ImportFile(file);
            Sheet sh = book.getSheetAt(0);   //获取到第一个表
@@ -299,7 +310,7 @@
                    continue;
                }
                TCarriers tCarriers = new TCarriers();
                tCarriers.setCompanyId(UserInfoUtil.getId());
                tCarriers.setCompanyId(id);
                tCarriers.setRemove(0);
                tCarriers.setCompanyName(zero);
                tCarriers.setScacCode(one);
@@ -323,7 +334,10 @@
                tCarriers.setPassword(SecureUtil.md5(seventeen));
                list.add(tCarriers);
            }
                if(list.size()>0){

            carriersService.insertBatch(list);
            }
            return new SuccessTip();
        } catch (Exception e) {
            e.printStackTrace();

 src/main/java/com/stylefeng/guns/modular/system/controller/TClaimController.java

@@ -47,12 +47,13 @@
            @ApiImplicitParam(name = "time", value = "时间 （时间 - 时间）", required = false, dataType = "String"),
            @ApiImplicitParam(name = "state", value = "处理状态 1 未处理  2已处理", required = false, dataType = "int"),
            @ApiImplicitParam(name = "name", value = "名称", required = false, dataType = "String"),
            @ApiImplicitParam(name = "id", value = "卡车公司id", required = true, dataType = "int"),
    })
    @GetMapping(value = "/list")
    @ResponseBody
    public Object list(String time,Integer state,String name,int pageNumber,int pageSize) {
    public Object list(String time,Integer state,String name,int pageNumber,int pageSize,int id) {
        Page<TClaimList> tClaimListPage = new Page<>(pageNumber, pageSize);
        tClaimListPage.setRecords(tClaimService.getList(tClaimListPage,time,state,name));
        tClaimListPage.setRecords(tClaimService.getList(tClaimListPage,time,state,name,id));
        return new SuccessTip(tClaimListPage);
    }


 src/main/java/com/stylefeng/guns/modular/system/controller/TCompanyController.java

@@ -47,141 +47,140 @@



    /**
     * 获取列表
     */
    @ApiOperation(value = "卡车公司列表",notes="卡车公司列表")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "pageNumber", value = "pageNumber", required = true, dataType = "int",paramType = "query"),
            @ApiImplicitParam(name = "pageSize", value = "pageSize", required = true, dataType = "int",paramType = "query"),
            @ApiImplicitParam(name = "name", value = "名称/id", required = false, dataType = "String"),
            @ApiImplicitParam(name = "account", value = "account", required = false, dataType = "String"),
    })
    @GetMapping(value = "/list")
    @ResponseBody
    public Object list(int pageNumber,int pageSize,String name,String account) {

        Page<TCompanyVo> tCompanyVoPage = new Page<>(pageNumber, pageSize);
        List<TCompanyVo> tCompanyVos = tCompanyService.selectList1(tCompanyVoPage, name, account);
        tCompanyVoPage.setRecords(tCompanyVos);
        return new SuccessTip(tCompanyVoPage);
    }

    @ApiOperation(value = "卡车公司审核列表",notes="卡车公司审核列表")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "pageNumber", value = "pageNumber", required = true, dataType = "int",paramType = "query"),
            @ApiImplicitParam(name = "pageSize", value = "pageSize", required = true, dataType = "int",paramType = "query"),
            @ApiImplicitParam(name = "name", value = "名称/id", required = false, dataType = "String"),
            @ApiImplicitParam(name = "account", value = "account", required = false, dataType = "String"),
            @ApiImplicitParam(name = "state", value = "state", required = false, dataType = "int"),
    })
    @GetMapping(value = "/listCheck")
    @ResponseBody
    public Object listCheck(int pageNumber,int pageSize,String name,String account,Integer state) {

        Page<TCompanyVo> tCompanyVoPage = new Page<>(pageNumber, pageSize);
        tCompanyVoPage.setRecords(tCompanyService.selectList2(tCompanyVoPage,name,account,state));
        return new SuccessTip(tCompanyVoPage);
    }

    /**
     * 新增
     */
    @ApiOperation(value = "新增卡车公司",notes="新增卡车公司")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
    })
    @PostMapping(value = "/add")
    @ResponseBody
    public Object add(@RequestBody TCompanyDto tCompany)  {
        try {
            List<TCompany> companies = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("account", tCompany.getAccount()));
            if(companies.size()>0){
                return new ErrorTip(5002,"Account already exists");
            }
            TCompany company = new TCompany();
            BeanUtil.copyProperties(tCompany,company);
            tCompanyService.insert(company);
            List<TCompanyService> list = tCompany.getList();
            list.forEach(e->e.setCompanyId(company.getId()));
            itCompanyServiceService.insertBatch(tCompany.getList());
            return SUCCESS_TIP;
        }catch (Exception e){
            e.printStackTrace();
            return ERROR;
        }
    }

    /**
     * 删除
     */
    @ApiOperation(value = "删除卡车公司",notes="删除卡车公司")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "tCompanyId", value = "卡车公司id", required = true, dataType = "int"),
    })
    @DeleteMapping(value = "/delete")
    @ResponseBody
    public Object delete(@RequestParam Integer tCompanyId) {
        TCompany tCompany = tCompanyService.selectById(tCompanyId);
        tCompany.setRemove(1);
        tCompanyService.updateById(tCompany);
        return SUCCESS_TIP;
    }

    @ApiOperation(value = "冻结卡车公司",notes="冻结卡车公司")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "tCompanyId", value = "卡车公司id", required = true, dataType = "int"),
            @ApiImplicitParam(name = "type", value = "1解冻 2冻结", required = true, dataType = "int"),
    })
    @DeleteMapping(value = "/freeze")
    @ResponseBody
    public Object freeze(@RequestParam Integer tCompanyId,Integer type) {
        TCompany tCompany = tCompanyService.selectById(tCompanyId);
        if(type==1){
            tCompany.setStatus(1);
        }else if(type==2){
            tCompany.setStatus(3);
        }
        tCompanyService.updateById(tCompany);
        return SUCCESS_TIP;
    }
//    /**
//     * 获取列表
//     */
//    @ApiOperation(value = "卡车公司列表",notes="卡车公司列表")
//    @ApiImplicitParams({
//            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
//            @ApiImplicitParam(name = "pageNumber", value = "pageNumber", required = true, dataType = "int",paramType = "query"),
//            @ApiImplicitParam(name = "pageSize", value = "pageSize", required = true, dataType = "int",paramType = "query"),
//            @ApiImplicitParam(name = "name", value = "名称/id", required = false, dataType = "String"),
//            @ApiImplicitParam(name = "account", value = "account", required = false, dataType = "String"),
//    })
//    @GetMapping(value = "/list")
//    @ResponseBody
//    public Object list(int pageNumber,int pageSize,String name,String account) {
//
//        Page<TCompanyVo> tCompanyVoPage = new Page<>(pageNumber, pageSize);
//        List<TCompanyVo> tCompanyVos = tCompanyService.selectList1(tCompanyVoPage, name, account);
//        tCompanyVoPage.setRecords(tCompanyVos);
//        return new SuccessTip(tCompanyVoPage);
//    }
//
//    @ApiOperation(value = "卡车公司审核列表",notes="卡车公司审核列表")
//    @ApiImplicitParams({
//            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
//            @ApiImplicitParam(name = "pageNumber", value = "pageNumber", required = true, dataType = "int",paramType = "query"),
//            @ApiImplicitParam(name = "pageSize", value = "pageSize", required = true, dataType = "int",paramType = "query"),
//            @ApiImplicitParam(name = "name", value = "名称/id", required = false, dataType = "String"),
//            @ApiImplicitParam(name = "account", value = "account", required = false, dataType = "String"),
//            @ApiImplicitParam(name = "state", value = "state", required = false, dataType = "int"),
//    })
//    @GetMapping(value = "/listCheck")
//    @ResponseBody
//    public Object listCheck(int pageNumber,int pageSize,String name,String account,Integer state) {
//
//        Page<TCompanyVo> tCompanyVoPage = new Page<>(pageNumber, pageSize);
//        tCompanyVoPage.setRecords(tCompanyService.selectList2(tCompanyVoPage,name,account,state));
//        return new SuccessTip(tCompanyVoPage);
//    }
//
//    /**
//     * 新增
//     */
//    @ApiOperation(value = "新增卡车公司",notes="新增卡车公司")
//    @ApiImplicitParams({
//            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
//    })
//    @PostMapping(value = "/add")
//    @ResponseBody
//    public Object add(@RequestBody TCompanyDto tCompany)  {
//        try {
//            List<TCompany> companies = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("account", tCompany.getAccount()));
//            if(companies.size()>0){
//                return new ErrorTip(5002,"Account already exists");
//            }
//            TCompany company = new TCompany();
//            BeanUtil.copyProperties(tCompany,company);
//            tCompanyService.insert(company);
//            List<TCompanyService> list = tCompany.getList();
//            list.forEach(e->e.setCompanyId(company.getId()));
//            itCompanyServiceService.insertBatch(tCompany.getList());
//            return SUCCESS_TIP;
//        }catch (Exception e){
//            e.printStackTrace();
//            return ERROR;
//        }
//    }
//
//    /**
//     * 删除
//     */
//    @ApiOperation(value = "删除卡车公司",notes="删除卡车公司")
//    @ApiImplicitParams({
//            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
//            @ApiImplicitParam(name = "tCompanyId", value = "卡车公司id", required = true, dataType = "int"),
//    })
//    @DeleteMapping(value = "/delete")
//    @ResponseBody
//    public Object delete(@RequestParam Integer tCompanyId) {
//        TCompany tCompany = tCompanyService.selectById(tCompanyId);
//        tCompany.setRemove(1);
//        tCompanyService.updateById(tCompany);
//        return SUCCESS_TIP;
//    }
//
//    @ApiOperation(value = "冻结卡车公司",notes="冻结卡车公司")
//    @ApiImplicitParams({
//            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
//            @ApiImplicitParam(name = "tCompanyId", value = "卡车公司id", required = true, dataType = "int"),
//            @ApiImplicitParam(name = "type", value = "1解冻 2冻结", required = true, dataType = "int"),
//    })
//    @DeleteMapping(value = "/freeze")
//    @ResponseBody
//    public Object freeze(@RequestParam Integer tCompanyId,Integer type) {
//        TCompany tCompany = tCompanyService.selectById(tCompanyId);
//        if(type==1){
//            tCompany.setStatus(1);
//        }else if(type==2){
//            tCompany.setStatus(3);
//        }
//        tCompanyService.updateById(tCompany);
//        return SUCCESS_TIP;
//    }


    @ApiOperation(value = "审核卡车公司",notes="审核卡车公司")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "tCompanyId", value = "卡车公司id", required = true, dataType = "int"),
            @ApiImplicitParam(name = "type", value = "1通过 2拒绝", required = true, dataType = "int"),
            @ApiImplicitParam(name = "remark", value = "拒绝原因/通过填时间（2023-01-31 17:49:08）", required = true, dataType = "String"),
    })
    @DeleteMapping(value = "/audit")
    @ResponseBody
    public Object audit(@RequestParam Integer tCompanyId,Integer type,String remark) {
        TCompany tCompany = tCompanyService.selectById(tCompanyId);
        if(type==1){
            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            try {
                Date parse = simpleDateFormat.parse(remark);
                tCompany.setExpirationTime(parse);


            } catch (ParseException e) {
                e.printStackTrace();
                return new ErrorTip(5010, "时间格式错误！");
            }
            tCompany.setStatus(1);
        }else if(type==2){
            tCompany.setStatus(2);
            tCompany.setRemark(remark);
        }
        tCompanyService.updateById(tCompany);
        return SUCCESS_TIP;
    }

//    @ApiOperation(value = "审核卡车公司",notes="审核卡车公司")
//    @ApiImplicitParams({
//            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
//            @ApiImplicitParam(name = "tCompanyId", value = "卡车公司id", required = true, dataType = "int"),
//            @ApiImplicitParam(name = "type", value = "1通过 2拒绝", required = true, dataType = "int"),
//            @ApiImplicitParam(name = "remark", value = "拒绝原因/通过填时间（2023-01-31 17:49:08）", required = true, dataType = "String"),
//    })
//    @DeleteMapping(value = "/audit")
//    @ResponseBody
//    public Object audit(@RequestParam Integer tCompanyId,Integer type,String remark) {
//        TCompany tCompany = tCompanyService.selectById(tCompanyId);
//        if(type==1){
//            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//            try {
//                Date parse = simpleDateFormat.parse(remark);
//                tCompany.setExpirationTime(parse);
//
//
//            } catch (ParseException e) {
//                e.printStackTrace();
//                return new ErrorTip(5010, "时间格式错误！");
//            }
//            tCompany.setStatus(1);
//        }else if(type==2){
//            tCompany.setStatus(2);
//            tCompany.setRemark(remark);
//        }
//        tCompanyService.updateById(tCompany);
//        return SUCCESS_TIP;
//    }

    /**
     * 修改
@@ -248,79 +247,79 @@
        return new SuccessTip(objects);
    }

    @ApiOperation(value = "根据卡车公司id获取卡车公司费用设置",notes="根据卡车公司id获取卡车公司费用设置")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "tCompanyId", value = "卡车公司id", required = true, dataType = "int"),
    })
    @GetMapping(value = "/getCompanySetting/{tCompanyId}")
    @ResponseBody
    public Object getCompanySetting(@PathVariable("tCompanyId") Integer tCompanyId) {
        List<TCompanyFeeSetting> feeSettings = itCompanyFeeSettingService.selectList(new EntityWrapper<TCompanyFeeSetting>().eq("company_id", tCompanyId));
        ArrayList<TCompanyFeeSettingVo> vos = new ArrayList<>();
        feeSettings.stream().forEach(e->{
            TCompanyFeeSettingVo tCompanyFeeSettingVo = new TCompanyFeeSettingVo();
            BeanUtil.copyProperties(e,tCompanyFeeSettingVo);
            vos.add(tCompanyFeeSettingVo);
        });
        vos.forEach(e->{
            if(("Pool chassis").equals(e.getSetName()) ||"wccp chassis".equals(e.getSetName()) || "trl-axle chassis".equals(e.getSetName())){
                e.setCost("Chassis fee");
            }
        });
        return new SuccessTip(vos);
    }
//    @ApiOperation(value = "根据卡车公司id获取卡车公司费用设置",notes="根据卡车公司id获取卡车公司费用设置")
//    @ApiImplicitParams({
//            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
//            @ApiImplicitParam(name = "tCompanyId", value = "卡车公司id", required = true, dataType = "int"),
//    })
//    @GetMapping(value = "/getCompanySetting/{tCompanyId}")
//    @ResponseBody
//    public Object getCompanySetting(@PathVariable("tCompanyId") Integer tCompanyId) {
//        List<TCompanyFeeSetting> feeSettings = itCompanyFeeSettingService.selectList(new EntityWrapper<TCompanyFeeSetting>().eq("company_id", tCompanyId));
//        ArrayList<TCompanyFeeSettingVo> vos = new ArrayList<>();
//        feeSettings.stream().forEach(e->{
//            TCompanyFeeSettingVo tCompanyFeeSettingVo = new TCompanyFeeSettingVo();
//            BeanUtil.copyProperties(e,tCompanyFeeSettingVo);
//            vos.add(tCompanyFeeSettingVo);
//        });
//        vos.forEach(e->{
//            if(("Pool chassis").equals(e.getSetName()) ||"wccp chassis".equals(e.getSetName()) || "trl-axle chassis".equals(e.getSetName())){
//                e.setCost("Chassis fee");
//            }
//        });
//        return new SuccessTip(vos);
//    }


    @ApiOperation(value = "卡车公司服务修改设置",notes="卡车公司服务修改设置")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
    })
    @GetMapping(value = "/updateSetting")
    @ResponseBody
    public Object updateSetting(TCompanySettingDto dto) {
        TCompany tCompany = tCompanyService.selectById(dto.getId());
        tCompany.setClass9(dto.getClass9());
        tCompany.setClass8(dto.getClass8());
        tCompany.setClass7(dto.getClass7());
        tCompany.setClass6(dto.getClass6());
        tCompany.setClass5(dto.getClass5());
        tCompany.setClass4(dto.getClass4());
        tCompany.setClass3(dto.getClass3());
        tCompany.setClass2(dto.getClass2());
        tCompany.setClass1(dto.getClass1());
        tCompany.setDg(dto.getDg());
        tCompany.setFr(dto.getFr());
        tCompany.setTk(dto.getTk());
        tCompany.setOt(dto.getOt());
        tCompany.setRh(dto.getRh());
        tCompany.setRf(dto.getRf());
        tCompany.setHc(dto.getHc());
        tCompany.setHq(dto.getHq());
        tCompany.setGp(dto.getGp());
        tCompany.setLanguage(dto.getLanguage());
        tCompany.setEld(dto.getEld());
        tCompany.setTwic(dto.getTwic());
        tCompany.setPrivateChassis(dto.getPrivateChassis());
        tCompany.setIsoTankDrayage(dto.getIsoTankDrayage());
        tCompany.setTankEndorsedDrayage(dto.getTankEndorsedDrayage());
        tCompany.setOpenTopDrayage(dto.getOpenTopDrayage());
        tCompany.setReeferDrayage(dto.getReeferDrayage());
        tCompany.setDryContainerDrayage(dto.getDryContainerDrayage());
        tCompany.setRailRampDrayage(dto.getRailRampDrayage());
        tCompany.setOceanPortDrayage(dto.getOceanPortDrayage());
        tCompany.setContainerSizes(dto.getContainerSizes());
        tCompany.setChains(dto.getChains());
        tCompany.setTransloadService(dto.getTransloadService());
        tCompany.setAmazon(dto.getAmazon());
        tCompany.setTsa(dto.getTsa());
        tCompany.setResidentialDelivery(dto.getResidentialDelivery());
        tCompany.setHouseholdGoods(dto.getHouseholdGoods());
        tCompany.setLiquor(dto.getLiquor());
        tCompany.setOverweightPermit(dto.getOverweightPermit());
        tCompany.setHAZMAT(dto.getHAZMAT());
        return tCompanyService.updateById(tCompany);
    }
//    @ApiOperation(value = "卡车公司服务修改设置",notes="卡车公司服务修改设置")
//    @ApiImplicitParams({
//            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
//    })
//    @GetMapping(value = "/updateSetting")
//    @ResponseBody
//    public Object updateSetting(TCompanySettingDto dto) {
//        TCompany tCompany = tCompanyService.selectById(dto.getId());
//        tCompany.setClass9(dto.getClass9());
//        tCompany.setClass8(dto.getClass8());
//        tCompany.setClass7(dto.getClass7());
//        tCompany.setClass6(dto.getClass6());
//        tCompany.setClass5(dto.getClass5());
//        tCompany.setClass4(dto.getClass4());
//        tCompany.setClass3(dto.getClass3());
//        tCompany.setClass2(dto.getClass2());
//        tCompany.setClass1(dto.getClass1());
//        tCompany.setDg(dto.getDg());
//        tCompany.setFr(dto.getFr());
//        tCompany.setTk(dto.getTk());
//        tCompany.setOt(dto.getOt());
//        tCompany.setRh(dto.getRh());
//        tCompany.setRf(dto.getRf());
//        tCompany.setHc(dto.getHc());
//        tCompany.setHq(dto.getHq());
//        tCompany.setGp(dto.getGp());
//        tCompany.setLanguage(dto.getLanguage());
//        tCompany.setEld(dto.getEld());
//        tCompany.setTwic(dto.getTwic());
//        tCompany.setPrivateChassis(dto.getPrivateChassis());
//        tCompany.setIsoTankDrayage(dto.getIsoTankDrayage());
//        tCompany.setTankEndorsedDrayage(dto.getTankEndorsedDrayage());
//        tCompany.setOpenTopDrayage(dto.getOpenTopDrayage());
//        tCompany.setReeferDrayage(dto.getReeferDrayage());
//        tCompany.setDryContainerDrayage(dto.getDryContainerDrayage());
//        tCompany.setRailRampDrayage(dto.getRailRampDrayage());
//        tCompany.setOceanPortDrayage(dto.getOceanPortDrayage());
//        tCompany.setContainerSizes(dto.getContainerSizes());
//        tCompany.setChains(dto.getChains());
//        tCompany.setTransloadService(dto.getTransloadService());
//        tCompany.setAmazon(dto.getAmazon());
//        tCompany.setTsa(dto.getTsa());
//        tCompany.setResidentialDelivery(dto.getResidentialDelivery());
//        tCompany.setHouseholdGoods(dto.getHouseholdGoods());
//        tCompany.setLiquor(dto.getLiquor());
//        tCompany.setOverweightPermit(dto.getOverweightPermit());
//        tCompany.setHAZMAT(dto.getHAZMAT());
//        return tCompanyService.updateById(tCompany);
//    }


}

 src/main/java/com/stylefeng/guns/modular/system/controller/TExamSiteController.java

@@ -52,52 +52,8 @@
        return new SuccessTip(tExamSitePage);
    }

    /**
     * 新增
     */
    @ApiOperation(value = "新增检查站",notes="新增检查站")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
    })
    @PostMapping(value = "/add")
    @ResponseBody
    public Object add(TExamSite tExamSite) {
        tExamSite.setCreateTime(new Date());
        tExamSiteService.insert(tExamSite);
        return SUCCESS_TIP;
    }

    /**
     * 删除
     */
    @ApiOperation(value = "删除检查站",notes="删除检查站")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "tExamSiteId", value = "检查站Id", required = true, dataType = "int"),
    })
    @DeleteMapping(value = "/delete")
    @ResponseBody
    public Object delete(@RequestParam Integer tExamSiteId) {
        TExamSite tExamSite = tExamSiteService.selectById(tExamSiteId);
        tExamSite.setRemove(1);
        tExamSiteService.updateById(tExamSite);
        return SUCCESS_TIP;
    }

    /**
     * 修改
     */
    @ApiOperation(value = "修改检查站",notes="修改检查站")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
    })
    @PostMapping(value = "/update")
    @ResponseBody
    public Object update(TExamSite tExamSite) {
        tExamSite.setUpdateTime(new Date());
        tExamSiteService.updateById(tExamSite);
        return SUCCESS_TIP;
    }

    /**
     * 详情

 src/main/java/com/stylefeng/guns/modular/system/controller/TPowerUnitController.java

@@ -11,7 +11,6 @@
import com.stylefeng.guns.modular.system.model.TPowerUnits;
import com.stylefeng.guns.modular.system.model.TPowerUnitsVo;
import com.stylefeng.guns.modular.system.service.TPowerUnitsService;
import com.stylefeng.guns.modular.system.utils.UserInfoUtil;
import com.stylefeng.guns.modular.system.utils.tips.SuccessTip;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -138,12 +137,25 @@
    @PostMapping(value = "/addPowerUnitOrChassiss")
    @ResponseBody
    public Object addPowerUnitOrChassiss(@RequestBody TPowerUnits tPowerUnits) {
        tPowerUnits.setCompanyId(UserInfoUtil.getId());
        tPowerUnits.setCreateTime(new Date());
        powerUnitsService.insert(tPowerUnits);
        return new SuccessTip();
    }


    @ApiOperation(value = "卡车公司-详情车架或者车头",notes="卡车公司-详情车架或者车头")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "int",paramType = "query"),
    })
    @GetMapping(value = "/infoPowerUnitOrChassiss")
    @ResponseBody
    public Object infoPowerUnitOrChassiss( int id) {
        TPowerUnits tPowerUnits = powerUnitsService.selectById(id);

        return new SuccessTip(tPowerUnits);
    }

    @ApiOperation(value = "卡车公司-编辑车架或者车头",notes="卡车公司-编辑车架或者车头")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),

 src/main/java/com/stylefeng/guns/modular/system/controller/TUserController.java

@@ -57,12 +57,13 @@
            @ApiImplicitParam(name = "id", value = "客户id", required = false, dataType = "int",paramType = "query"),
            @ApiImplicitParam(name = "pageNumber", value = "pageNumber", required = true, dataType = "int",paramType = "query"),
            @ApiImplicitParam(name = "pageSize", value = "pageSize", required = true, dataType = "int",paramType = "query"),
            @ApiImplicitParam(name = "companyId", value = "卡车公司id", required = true, dataType = "int",paramType = "query"),
    })
    @GetMapping(value = "/list")
    @ResponseBody
    public Object list(String name,Integer id,int pageNumber,int pageSize) {
    public Object list(String name,Integer id,int pageNumber,int pageSize,int companyId) {
        Page<TUserVo> tUserVoPage = new Page<>(pageNumber, pageSize);
        return new SuccessTip(tUserVoPage.setRecords(tUserService.getList(tUserVoPage,name,id)));
        return new SuccessTip(tUserVoPage.setRecords(tUserService.getList(tUserVoPage,name,id,companyId)));
    }

    /**
@@ -74,7 +75,7 @@
    })
    @PostMapping(value = "/add")
    @ResponseBody
    public Object add(TUserDto tUser) {
    public Object add(@RequestBody TUserDto tUser) {
        try {
            List<TUser> account = tUserService.selectList(new EntityWrapper<TUser>().eq("account", tUser.getAccount()));
            if(account.size()>0){
@@ -83,6 +84,7 @@
            String encrypt = MD5Util.encrypt(tUser.getPassword());
            tUser.setPassword(encrypt);
            TUser tUser1 = new TUser();
            tUser1.setEmail(tUser.getAccount());
            BeanUtils.copyProperties(tUser,tUser1);
            tUser1.setParentId(0);
            tUser1.setHome(0);
@@ -119,9 +121,9 @@
    @ResponseBody
    public Object delete(@RequestParam Integer tUserId) {
        TUser tUser = tUserService.selectById(tUserId);
        if(tUser.getStatus()!=3){
            return new ErrorTip(502, "删除只能删除冻结的用户！");
        }
//        if(tUser.getStatus()!=3){
//            return new ErrorTip(502, "删除只能删除冻结的用户！");
//        }
        tUser.setRemove(1);
        tUserService.updateById(tUser);
        return SUCCESS_TIP;
@@ -141,7 +143,7 @@
        if(account.size()>0){
            return new ErrorTip(501, "该账号已经存在！");
        }
        if(tUser.getPassword()!=null || tUser.getPassword()!=""){
        if(tUser.getPassword()!=null && tUser.getPassword()!=""){
            tUser.setPassword(MD5Util.encrypt(tUser.getPassword()));
        }
        TUser user1 = new TUser();
@@ -176,15 +178,5 @@
    }


    @ApiOperation(value = "发送邮箱",notes="=发送邮箱")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
    })
    @GetMapping(value = "/ddasd")
    @ResponseBody
    public Object asd() {
        EmailUtil.sendMailGMail("1793218484@qq.com","a");
        return SUCCESS_TIP;
    }

}

 src/main/java/com/stylefeng/guns/modular/system/controller/TWebsiteController.java

File was deleted

 src/main/java/com/stylefeng/guns/modular/system/controller/TYardController.java

@@ -8,7 +8,6 @@
import com.stylefeng.guns.modular.system.model.TYard;
import com.stylefeng.guns.modular.system.model.TYardVo;
import com.stylefeng.guns.modular.system.service.TYardService;
import com.stylefeng.guns.modular.system.utils.UserInfoUtil;
import com.stylefeng.guns.modular.system.utils.tips.SuccessTip;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -64,7 +63,6 @@
    @PostMapping(value = "/addYard")
    @ResponseBody
    public Object addYard(@RequestBody TYard tYard) {
        tYard.setCompanyId(UserInfoUtil.getId());
        tYard.setCreateTime(new Date());
        yardService.insert(tYard);
        return new SuccessTip();
@@ -93,6 +91,18 @@
        return new SuccessTip();
    }

    @ApiOperation(value = "卡车公司-场地详情", notes = "卡车公司-场地详情")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "int", paramType = "query"),
    })
    @GetMapping(value = "/yardInfo")
    @ResponseBody
    public Object yardInfo(int id) {
        TYard tYard = yardService.selectById(id);
        return new SuccessTip(tYard);
    }


    public static void main(String[] args) {


 src/main/java/com/stylefeng/guns/modular/system/dao/TOrderMapper.java

@@ -19,7 +19,7 @@
 */
public interface TOrderMapper extends BaseMapper<TOrder> {

    List<ReceivableVo> getReceivable(@Param("receivableVoPage") Page<ReceivableVo> receivableVoPage, @Param("name") String name);
    List<ReceivableVo> getReceivable(@Param("receivableVoPage") Page<ReceivableVo> receivableVoPage, @Param("name") String name, @Param("id") int id);


    Double getTwentyDay(@Param("userId") Integer userId, @Param("time") String time, @Param("time1") String time1);
@@ -27,18 +27,18 @@

    Double getNineDay(@Param("userId") Integer userId, @Param("time3") String time3);

    List<ShouldPayVo> getPayList(@Param("receivableVoPage") Page<ShouldPayVo> receivableVoPage, @Param("name") String name);
    List<ShouldPayVo> getPayList(@Param("receivableVoPage") Page<ShouldPayVo> receivableVoPage, @Param("name") String name, @Param("id") int id);

    Double getTwentyDayPay(@Param("userId") Integer userId, @Param("time") String time, @Param("time1") String time1);

    Double getNineDayPay(@Param("userId") Integer userId, @Param("time3") String time3);


    List<ReceivablesList> listOfReceivables(@Param("receivableVoPage") Page<ReceivablesList> receivableVoPage, @Param("sTime") String sTime, @Param("eTime") String eTime, @Param("name") String name, @Param("invoicesId") Integer invoicesId, @Param("orderId") Integer orderId, @Param("state") Integer state);
    List<ReceivablesList> listOfReceivables(@Param("receivableVoPage") Page<ReceivablesList> receivableVoPage, @Param("sTime") String sTime, @Param("eTime") String eTime, @Param("name") String name, @Param("invoicesId") Integer invoicesId, @Param("orderId") Integer orderId, @Param("state") Integer state, @Param("id") Integer id);

    Integer getPayStatus(@Param("orderId") Long orderId);

    List<PayList> listOfPay(@Param("receivableVoPage") Page<PayList> receivableVoPage, @Param("sTime") String sTime, @Param("eTime") String eTime, @Param("name") String name, @Param("billId") Integer billId, @Param("orderId") Integer orderId, @Param("state") Integer state);
    List<PayList> listOfPay(@Param("receivableVoPage") Page<PayList> receivableVoPage, @Param("sTime") String sTime, @Param("eTime") String eTime, @Param("name") String name, @Param("billId") Integer billId, @Param("orderId") Integer orderId, @Param("state") Integer state,@Param("id") Integer id);

    Boolean agreePay(@Param("number") Long number);


 src/main/java/com/stylefeng/guns/modular/system/dao/TTransportationMapper.java

New file
@@ -0,0 +1,17 @@
package com.stylefeng.guns.modular.system.dao;


import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.stylefeng.guns.modular.system.model.TTransportation;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author administrator
 * @since 2023-04-12
 */
public interface TTransportationMapper extends BaseMapper<TTransportation> {

}

 src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml

@@ -83,7 +83,7 @@

    <select id="getReceivable" resultType="com.stylefeng.guns.modular.system.model.ReceivableVo">
        select t1.id,t1.create_time invoiceDate,t1.company_id userId,sum(t1.pay_money) as total,t2.name userName from t_order t1 left join t_company t2 on t1.company_id=t2.id
        where t1.status !=0
        where t1.status !=0 and t1.company_id =#{id}
        <if test="name !=null and name !=''">
            and  t2.name like concat("%",#{name},"%")
        </if>
@@ -101,7 +101,7 @@
    <select id="getPayList" resultType="com.stylefeng.guns.modular.system.model.ShouldPayVo">
        select t1.id,t1.success_time billDate,t1.carriers_id userId,sum(t1.pay_money) as total,
        t2.company_name userName from t_order t1 left join t_carriers t2 on t1.carriers_id=t2.id
        where t1.status !=0
        where t1.status !=0 and t1.company_id =#{id}
        <if test="name !=null and name !=''">
            and  t2.company_name like concat("%",#{name},"%")
        </if>
@@ -116,7 +116,7 @@
    <select id="listOfReceivables" resultType="com.stylefeng.guns.modular.system.model.ReceivablesList">
        select t1.invoice_number invoiceNumber,t1.id orderId,t1.user_id userId,t1.pay_money total,t1.pay_time invoicesTime,t2.company_name userName
         from t_order t1 LEFT JOIN t_user t2 on t1.user_id=t2.id
        where t1.status = 1
        where t1.status = 1 and t1.company_id=#{id}
        <if test="sTime !=null ">
            and t1.pay_time between #{sTime} and #{eTime}
        </if>
@@ -138,11 +138,11 @@

    </select>
    <select id="getPayStatus" resultType="java.lang.Integer">
        select id from t_order where pay_status =1
        select id from t_order where pay_status =1 and id =#{orderId}
    </select>
    <select id="listOfPay" resultType="com.stylefeng.guns.modular.system.model.PayList">
        select t1.id orderId,t1.carriers_id companyId,t2.company_name companyName,t1.pay_carriers_time billTime,t1.pay_time dueDate,t1.carriers_pay_status paystatus,t1.pay_audit payAudit,(t1.pay_money*(t2.commission/100) ) as total  FROM t_order  t1 LEFT JOIN t_carriers t2 on t1.carriers_id =t2.id
        where t1.status = 1
        where t1.status = 1 and t1.company_id=#{id}
        <if test="sTime !=null">
            and t1.pay_carriers_time between #{sTime} and #{eTime}
        </if>
@@ -174,7 +174,8 @@
    t1.shipment_date pickupDate,
    t1.delivery_date deliveryDate,
    t1.status status,
    t1.e_address destination
    t1.e_address destination,
    t2.kg kg
FROM
    t_order t1
    LEFT JOIN t_goods t2 ON t1.id = t2.order_id

 src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TTransportationMapper.xml

New file
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.stylefeng.guns.modular.system.dao.TTransportationMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TTransportation">
        <id column="id" property="id" />
        <result column="order_id" property="orderId" />
        <result column="driver_id" property="driverId" />
        <result column="name" property="name" />
        <result column="phone" property="phone" />
        <result column="email" property="email" />
        <result column="power_unit" property="powerUnit" />
        <result column="chassises" property="chassises" />
        <result column="empty_date" property="emptyDate" />
        <result column="return_date" property="returnDate" />
        <result column="pick_date" property="pickDate" />
    </resultMap>

</mapper>

 src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml

@@ -102,22 +102,20 @@
    t1.invoice_number invoiceNumber,
    t1.company_id companyId,
    t2.NAME companyName,
    t2.headImg logo,
    t1.pay_time invoiceDate,
    tu.company_name sCompanyName,
    t1.shipment_date pickupDate,
    t4.NAME portName,
    t1.s_name sContactName,
    t1.s_phone sContactPhone,
    t1.accessorial_str chassisService,
    t1.delivery_date deliveryDate,
    t1.e_company_name eCompanyName,
    t1.e_name eContactName,
    t1.e_phone eContactPhone
    t5.address userAddress,
    t1.type type,
    t1.delivery_date dueBy
FROM
    t_order t1
    LEFT JOIN t_company t2 ON t1.company_id = t2.id
    LEFT JOIN t_user tu ON t1.user_id = tu.id
    LEFT JOIN t_port t4 ON t1.PORT = t4.id
    left join t_user_address t5 on (t5.user_id=tu.id and t5.is_default =1)
    where t1.id =#{number}
    </select>
    <select id="getOrderInfoOne" resultType="com.stylefeng.guns.modular.system.model.InvoicesVoOne">

 src/main/java/com/stylefeng/guns/modular/system/model/AddOrderFile.java

@@ -1,11 +1,16 @@
package com.stylefeng.guns.modular.system.model;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;

import java.util.List;

@Data
public class AddOrderFile {
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long orderId;

    private List<TOrderFileDto> file;

 src/main/java/com/stylefeng/guns/modular/system/model/CompanyLocationDto.java

New file
@@ -0,0 +1,15 @@
package com.stylefeng.guns.modular.system.model;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;
import java.util.List;

@Data
public class CompanyLocationDto {

    private Long orderId;
    @ApiModelProperty("1---3")
    private Integer type;
}

 src/main/java/com/stylefeng/guns/modular/system/model/CompanySelectDriverDto.java

New file
@@ -0,0 +1,19 @@
package com.stylefeng.guns.modular.system.model;

import lombok.Data;

import java.util.Date;
import java.util.List;

@Data
public class CompanySelectDriverDto {
    private Long orderId;

    private List<TTransportation> list;

    private String truckCompany;

    private Date pickupTime;

    private Integer streetTurn;
}

 src/main/java/com/stylefeng/guns/modular/system/model/CompanySelectDriverSingleDto.java

New file
@@ -0,0 +1,18 @@
package com.stylefeng.guns.modular.system.model;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;
import java.util.List;

@Data
public class CompanySelectDriverSingleDto {
    private Long orderId;

    private TTransportation list;

    @ApiModelProperty("1--4  顺序司机")
    private Integer type;

}

 src/main/java/com/stylefeng/guns/modular/system/model/DemandDto.java

@@ -43,8 +43,21 @@

    private String delivery;
    @ApiModelProperty("总重量")


    private String contactName;

    private String contactEmail;
    private String contactPhone;
    private String eCompanyName;
    private String eContactName;
    private String eContactEmail;
    private String eContactPhone;
    private String eAddress;
    private String total;
    private List<GoodsListDto> list;
    @ApiModelProperty("当前登录id")
    private Integer id;


}

 src/main/java/com/stylefeng/guns/modular/system/model/DemandListVo.java

@@ -1,11 +1,16 @@
package com.stylefeng.guns.modular.system.model;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;

import java.util.Date;

@Data
public class DemandListVo {
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long id;

    private Integer userId;

 src/main/java/com/stylefeng/guns/modular/system/model/DriverNote.java

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;

import java.util.Date;
@@ -12,9 +14,13 @@
    @TableField("driver_id")
    private Integer driverId;
    @TableField("order_id")
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long orderId;
    private String describe;
    private Integer type;
    @TableField("create_time")
    private Date createTime;
    private String category;
}

 src/main/java/com/stylefeng/guns/modular/system/model/DriverNoteVo.java

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;

import java.util.Date;
@@ -12,6 +14,9 @@
    @TableField("driver_id")
    private Integer driverId;
    @TableField("order_id")
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long orderId;
    private String describe;
    private Integer type;

 src/main/java/com/stylefeng/guns/modular/system/model/GoodsInfo.java

@@ -1,9 +1,14 @@
package com.stylefeng.guns.modular.system.model;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;

@Data
public class GoodsInfo {
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long orderId;

    private String awbNo;

 src/main/java/com/stylefeng/guns/modular/system/model/GoodsListDto.java

@@ -13,5 +13,5 @@
    private Integer danger;
    @ApiModelProperty("是否超重 0否 1是")
    private Integer weight;
    private List<GoodsDto> list;
    private List<TGoods> list;
}

 src/main/java/com/stylefeng/guns/modular/system/model/InvoicesCarVo.java

@@ -1,6 +1,8 @@
package com.stylefeng.guns.modular.system.model;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -9,6 +11,9 @@

@Data
public class InvoicesCarVo {
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long id;
    @ApiModelProperty("总金额")
    private Double amount;

 src/main/java/com/stylefeng/guns/modular/system/model/InvoicesInfo.java

@@ -1,5 +1,7 @@
package com.stylefeng.guns.modular.system.model;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -8,6 +10,9 @@
@Data
public class InvoicesInfo {
    @ApiModelProperty("订单id")
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long id;
    @ApiModelProperty("总金额")
    private Double total;

 src/main/java/com/stylefeng/guns/modular/system/model/InvoicesVo.java

@@ -1,6 +1,8 @@
package com.stylefeng.guns.modular.system.model;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -9,6 +11,9 @@

@Data
public class InvoicesVo {
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long id;
    @ApiModelProperty("总金额")
    private Double amount;
@@ -21,6 +26,8 @@
    @ApiModelProperty("卡车公司名称")
    private String companyName;

    private String logo;

    @ApiModelProperty("invoice Date")
    private Date invoiceDate;

@@ -30,6 +37,9 @@
    @ApiModelProperty("客户公司")
    private String sCompanyName;

    @ApiModelProperty("客户地址")
    private String userAddress;


    @ApiModelProperty("发货时间")
    @JsonFormat(pattern = "dd/MM/yyyy")
@@ -38,28 +48,15 @@
    @ApiModelProperty("取货码头")
    private String portName;

    @ApiModelProperty("发货联系人姓名")
    private String sContactName;
    @ApiModelProperty("1 live unload  2drop hook")
    private String type;

    @ApiModelProperty("发货联系人电话")
    private String sContactPhone;

    @ApiModelProperty("附加服务  逗号拼接")
    private String chassisService;

    @ApiModelProperty("收货时间")
    @JsonFormat(pattern = "dd/MM/yyyy")
    private Date deliveryDate;

    @ApiModelProperty("客户目的地公司")
    private String eCompanyName;

    @ApiModelProperty("收货联系人姓名")
    private String eContactName;
    @ApiModelProperty("收货联系人电话")
    private String eContactPhone;
    @ApiModelProperty("送柜地址")
    private String eAddress;


    @ApiModelProperty("还柜码头")
    private String ePortName;

    private List<TGoodsVo> goodsVos;


 src/main/java/com/stylefeng/guns/modular/system/model/InvoicesVoOne.java

@@ -1,6 +1,8 @@
package com.stylefeng.guns.modular.system.model;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -9,6 +11,9 @@

@Data
public class InvoicesVoOne {
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long id;
    @ApiModelProperty("总金额")
    private Double amount;

 src/main/java/com/stylefeng/guns/modular/system/model/InvoicesVoTwo.java

@@ -1,6 +1,8 @@
package com.stylefeng.guns.modular.system.model;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -9,6 +11,9 @@

@Data
public class InvoicesVoTwo {
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long id;
    @ApiModelProperty("票据number")
    private String invoiceNumber;

 src/main/java/com/stylefeng/guns/modular/system/model/Menu.java

@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import org.hibernate.validator.constraints.NotBlank;

import java.io.Serializable;
@@ -27,6 +29,9 @@
     * 主键id
     */
    @TableId(value = "id", type = IdType.AUTO)
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long id;
    /**
     * 菜单编号

 src/main/java/com/stylefeng/guns/modular/system/model/OrderDriverInfo.java

@@ -15,7 +15,16 @@

    private String contactEmail;

    private Date time;
    private Date pickUp;

    private String appointmentNumber;

    private Date emptyDate;

    private Date returnDate;

    private TPowerUnits tPowerUnits;

    private TPowerUnits chassiess;

}

 src/main/java/com/stylefeng/guns/modular/system/model/OrderInfo.java

@@ -1,5 +1,7 @@
package com.stylefeng.guns.modular.system.model;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -23,7 +25,9 @@
    private List<LonLat> lonLats;

    private String type;

    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long quoteId;

    private String customer;
@@ -59,7 +63,9 @@
    private Date deliveryDate;

    private String deliverStr;

    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long carrierQuoteNumber;

    private String bl;

 src/main/java/com/stylefeng/guns/modular/system/model/OrderListDto.java

@@ -1,5 +1,7 @@
package com.stylefeng.guns.modular.system.model;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -9,7 +11,9 @@
    private String dateRange;

    private String customerName;

    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long id;

    @ApiModelProperty("SALES GROUP")
@@ -26,4 +30,6 @@
    private Integer pageSize;
    @ApiModelProperty("0 分配订单 1 公司创建订单")
    private Integer type;
    @ApiModelProperty("卡车公司id 必传")
    private Integer companyId;
}

 src/main/java/com/stylefeng/guns/modular/system/model/OrderListVo.java

@@ -1,11 +1,16 @@
package com.stylefeng.guns.modular.system.model;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class OrderListVo {
    @ApiModelProperty("订单id")
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long orderId;

    @ApiModelProperty("客户信息")
@@ -26,11 +31,13 @@
    @ApiModelProperty("送柜地点")
    private String destination;

    @ApiModelProperty("订单状态 0未开始 1已完成  2待取货-未出发 3待取货-已出发  4已到港口码头  5车场运输中  6在车场  7运输中 8待卸货 9已卸货 10运回车场中 11空柜订单在车场 12送检查站 13检查中 14检查站待取货 15在仓库  16取消订单  17已选择")
    @ApiModelProperty("订单状态 0未开始 1已完成  2待取货-未出发 3待取货-已出发  4已到港口码头  5车场运输中  6在车场  7运输中 8待卸货 9已卸货 10运回车场中 11空柜订单在车场 12送检查站 13检查中 14检查站待取货 15在仓库  16取消订单  17已选择 18运回码头")
    private Integer status;

    @ApiModelProperty("是否可以提货 1是2否")
    private Integer state;

    private String kg;


}

 src/main/java/com/stylefeng/guns/modular/system/model/PayList.java

@@ -1,5 +1,7 @@
package com.stylefeng.guns.modular.system.model;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -8,6 +10,9 @@
@Data
public class PayList {
    @ApiModelProperty("订单id")
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long orderId;
    @ApiModelProperty("承运商id")
    private Integer carriesId;

 src/main/java/com/stylefeng/guns/modular/system/model/QuotaVo.java

@@ -1,5 +1,7 @@
package com.stylefeng.guns.modular.system.model;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;

import java.util.Date;
@@ -7,6 +9,9 @@

@Data
public class QuotaVo {
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long quoteId;

    private Integer userId;

 src/main/java/com/stylefeng/guns/modular/system/model/ReceivableVo.java

@@ -1,5 +1,7 @@
package com.stylefeng.guns.modular.system.model;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -11,6 +13,9 @@
@Data
public class ReceivableVo {
    @ApiModelProperty("订单id")
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long id;
    private Integer userId;
    private String userName;

 src/main/java/com/stylefeng/guns/modular/system/model/ReceivablesList.java

@@ -1,5 +1,7 @@
package com.stylefeng.guns.modular.system.model;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -8,6 +10,9 @@
@Data
public class ReceivablesList {
    @ApiModelProperty("订单id")
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long orderId;
    @ApiModelProperty("客户id")
    private Integer userId;

 src/main/java/com/stylefeng/guns/modular/system/model/ShouldPayVo.java

@@ -1,5 +1,7 @@
package com.stylefeng.guns.modular.system.model;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -11,6 +13,9 @@
@Data
public class ShouldPayVo {
    @ApiModelProperty("订单id")
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long id;
    private Integer userId;
    private String userName;

 src/main/java/com/stylefeng/guns/modular/system/model/TClaim.java

@@ -7,6 +7,9 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

import java.io.Serializable;

/**
@@ -43,6 +46,9 @@
     * 订单id
     */
    @TableField("order_id")
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long orderId;
    /**
     * 描述

 src/main/java/com/stylefeng/guns/modular/system/model/TClaimList.java

@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -37,6 +39,9 @@
    @ApiModelProperty("用户名称")
    private String userName;

    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long orderId;
    /**
     * 描述

 src/main/java/com/stylefeng/guns/modular/system/model/TClaimVo.java

@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -60,6 +62,9 @@
    private Double price;

    private List<TOrderFile> files;
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long orderId;



 src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java

@@ -282,6 +282,16 @@

    private Integer remove;

    public Integer getWork() {
        return work;
    }

    public void setWork(Integer work) {
        this.work = work;
    }

    private Integer work;


    public Integer getId() {
        return id;

 src/main/java/com/stylefeng/guns/modular/system/model/TCompanyBasic.java

@@ -1,12 +1,14 @@
package com.stylefeng.guns.modular.system.model;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

@Data
@TableName("t_company_basic")
public class TCompanyBasic {
    private Integer id;
    @TableField("type")

 src/main/java/com/stylefeng/guns/modular/system/model/TCompanyCalculationResp.java

@@ -1,5 +1,7 @@
package com.stylefeng.guns.modular.system.model;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -8,6 +10,9 @@

@Data
public class TCompanyCalculationResp {
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long quoteId;
    private String startLon;


 src/main/java/com/stylefeng/guns/modular/system/model/TCompanyDto.java

@@ -68,5 +68,6 @@
     */
    private Integer status;

    private Integer work;
    private List<TCompanyService> list;
}

 src/main/java/com/stylefeng/guns/modular/system/model/TCompanyResp.java

@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.stylefeng.guns.modular.system.utils.GoogleMap.GeocodeVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
@@ -25,7 +27,9 @@
 */
@Data
public class TCompanyResp {

    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long orderId;
    @ApiModelProperty("服务名称")
    private String name;

 src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java

@@ -115,6 +115,12 @@
    private Integer remove;
    @TableField("create_time")
    private Date createTime;
    @TableField("is_carriers")
    private Integer isCarriers;
    @TableField("carriers_id")
    private Integer carriersId;


}



 src/main/java/com/stylefeng/guns/modular/system/model/TDriverSelectVo.java

New file
@@ -0,0 +1,31 @@
package com.stylefeng.guns.modular.system.model;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import lombok.Data;

import java.util.Date;

@TableName("t_driver")
@Data
public class TDriverSelectVo {
    private Integer id;

    @TableField("driver_name")
    private String driverName;


    @TableField("driver_type")
    private Integer driverType;


    @TableField("account")
    private String account;

    @TableField("create_time")
    private Date createTime;


}



 src/main/java/com/stylefeng/guns/modular/system/model/TExamSite.java

@@ -75,7 +75,16 @@
     * 0正常  1删除
     */
    private Integer remove;
    @TableField("contact_phone")
    private String contactPhone;

    public String getContactPhone() {
        return contactPhone;
    }

    public void setContactPhone(String contactPhone) {
        this.contactPhone = contactPhone;
    }

    @TableField(exist = false)
    @ApiModelProperty("country名称")

 src/main/java/com/stylefeng/guns/modular/system/model/TGoods.java

@@ -5,6 +5,9 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

import java.io.Serializable;

/**
@@ -23,6 +26,9 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    @TableField("order_id")
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long orderId;
    @TableField("shipping_line")
    private String shippingLine;
@@ -60,9 +66,19 @@
    private String sb;
    private String entry;
    private String po;

    public String getLineStr() {
        return lineStr;
    }

    public void setLineStr(String lineStr) {
        this.lineStr = lineStr;
    }

    @TableField("cust_ref")
    private String custRef;

    private String lineStr;

    public Integer getId() {
        return id;

 src/main/java/com/stylefeng/guns/modular/system/model/TGoodsVo.java

@@ -30,14 +30,14 @@
    private String kg;

    private String size;

    @ApiModelProperty("长")
    private String length;

    @ApiModelProperty("宽")
    private String width;
    @ApiModelProperty("高")
    private String height;
    //    @ApiModelProperty("长")
//    private String length;
//
//    @ApiModelProperty("宽")
//    private String width;
//    @ApiModelProperty("高")
//    private String height;
    private String type;

    private String name;


 src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java

@@ -8,6 +8,9 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

import java.io.Serializable;

/**
@@ -24,6 +27,9 @@
    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.ID_WORKER)
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long id;
    /**
     * 用户id
@@ -226,6 +232,16 @@
    @TableField("pay_carriers_time")
    private Date payCarriersTime;

    public String getNote() {
        return note;
    }

    public void setNote(String note) {
        this.note = note;
    }

    private String note;

    public Date getOrderOkTime() {
        return orderOkTime;
    }
@@ -327,8 +343,38 @@
    private Integer payInfoState;
    @TableField("pay_audit")
    private Integer payAudit;
    @TableField("truck_company")
    private String truckCompany;

    public String getTruckCompany() {
        return truckCompany;
    }

    public void setTruckCompany(String truckCompany) {
        this.truckCompany = truckCompany;
    }

    public Date getPickupTimeTruck() {
        return pickupTimeTruck;
    }

    public void setPickupTimeTruck(Date pickupTimeTruck) {
        this.pickupTimeTruck = pickupTimeTruck;
    }

    @TableField("pickup_time_truck")
    private Date pickupTimeTruck;

    public Integer getStreetTurn() {
        return streetTurn;
    }

    public void setStreetTurn(Integer streetTurn) {
        this.streetTurn = streetTurn;
    }

    @TableField("street_turn")
    private Integer streetTurn;

    public Long getId() {
        return id;

 src/main/java/com/stylefeng/guns/modular/system/model/TOrderFile.java

@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;

import java.io.Serializable;
@@ -28,11 +30,15 @@

    private String name;
    @TableField("order_id")
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long orderId;

    private String file;
    @TableField("create_time")
    private Date createTime;
    private Integer category;
    @TableField(exist = false)
    private String type;
}

 src/main/java/com/stylefeng/guns/modular/system/model/TOrderLog.java

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;

import java.util.Date;
@@ -14,6 +16,9 @@
public class TOrderLog {
    private Integer id;
    @TableField("order_id")
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long orderId;
    private String describe;
    @TableField("create_time")

 src/main/java/com/stylefeng/guns/modular/system/model/TPowerUnits.java

@@ -6,6 +6,7 @@
import java.io.Serializable;
import java.util.Date;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
@@ -30,91 +31,92 @@

    private static final long serialVersionUID=1L;

    @TableId(value = "id", type = IdType.UUID)
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @TableField("company_id")
    private Integer companyId;

    @TableField("make_model")
    private String makeModel;

    @TableField("engine_type")
    private String engineType;

    @TableField("fuel_type")
    private String fuelType;

    @TableField("license_plate")
    private String licensePlate;

    @TableField("vehicle_id_number")
    private String vehicleIdNumber;

    @TableField("insurance_information")
    private String insuranceInformation;

    private Double length;

    private Double height;

    @TableField("gross_vehicle_weight")
    private Double grossVehicleWeight;

    private String notes;

    @TableField("power_unit_number")
    private Integer powerUnitNumber;

    @TableField("transmission_type")
    private String transmissionType;

    private String horsepower;

    @TableField("model_year")
    private String modelYear;

    private String status;

    @TableField("registered_states")
    private String registeredStates;

    private Double width;

    @TableField("number_of_axles")
    private String numberOfAxles;

    private String ownership;

    @TableField("purchased_or_leased")
    private String purchasedOrLeased;

    @TableField("purchased_from")
    private String purchasedFrom;

    @TableField("sold_to")
    private String soldTo;

    @TableField("purchase_amount")
    private String purchaseAmount;

    @TableField("purchase_dae")
    private String purchaseDae;

    @TableField("sola_date")
    private Date solaDate;

    @TableField("factory_price")
    private BigDecimal factoryPrice;

    @TableField("sold_amount")
    private String soldAmount;

    @TableField("current_value")
    private String currentValue;

    @TableField("license_plate_expiration")
    private Date licensePlateExpiration;

    @TableField("dot_expiration")
    private Date dotExpiration;

    @TableField("insurance_expiration")
    private Date insuranceExpiration;

    @TableField("last_oil_change_date")
    private Date lastOilChangeDate;

    @TableField("last_tuneup_date")
    private Date lastTuneupDate;

    @TableField("last_service_date")
    private Date lastServiceDate;

    @TableField("inspection_expriation")
    private Date inspectionExpriation;

    @TableField("regustration_expiration")
    private Date regustrationExpiration;

    @TableField("odometer_reading")
    private String odometerReading;

    @TableField("last_oil_change_mileage")
    private String lastOilChangeMileage;

    @TableField("last_tuneup_mileage")
    private String lastTuneupMileage;

    @TableField("last_service_mileage")
    private String lastServiceMileage;

    @TableField("create_time")
    private Date createTime;

    /**
@@ -122,6 +124,12 @@
     */
     @ApiModelProperty("1是车头 2是车架")
    private Integer type;
    @TableField("chassises_type")
     private String chassisesType;
    @TableField("chassises_number")
     private String chassisesNumber;
    @TableField("size")
     private String size;


    @Override

 src/main/java/com/stylefeng/guns/modular/system/model/TPowerUnitsVo.java

@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.system.model;

import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
@@ -52,10 +53,12 @@

    private Date dotExpiration;

    private Date insuranceExpiration;
    private Date inspectionExpriation;

    private Date createTime;

    private String chassisesType;
    private String chassisesNumber;


}

 src/main/java/com/stylefeng/guns/modular/system/model/TPrice.java

@@ -7,6 +7,9 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

import java.io.Serializable;

/**
@@ -28,6 +31,9 @@
     * 订单id
     */
    @TableField("order_id")
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long orderId;
    /**
     * 订单类型
@@ -55,6 +61,25 @@
    @TableField("car_price")
    private BigDecimal carPrice;

    public Integer getStatus() {
        return status;
    }

    public void setStatus(Integer status) {
        this.status = status;
    }

    public String getNumber() {
        return number;
    }

    public void setNumber(String number) {
        this.number = number;
    }

    private Integer status;

    private String number;

    public Integer getId() {
        return id;

 src/main/java/com/stylefeng/guns/modular/system/model/TQuote.java

@@ -8,6 +8,9 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

import java.io.Serializable;

/**
@@ -24,6 +27,9 @@
    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.ID_WORKER)
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long id;
    /**
     * 订单id

 src/main/java/com/stylefeng/guns/modular/system/model/TTransportation.java

New file
@@ -0,0 +1,71 @@
package com.stylefeng.guns.modular.system.model;

import java.time.LocalDateTime;
import java.io.Serializable;
import java.util.Date;

import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

/**
 * <p>
 * 
 * </p>
 *
 * @author administrator
 * @since 2023-04-12
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_transportation")
public class TTransportation extends Model<TTransportation> {

    private static final long serialVersionUID=1L;

    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    @TableField("order_id")
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long orderId;
    @TableField("driver_id")
    private Integer driverId;

    private String name;

    private String phone;

    private String email;
    @TableField("power_unit")
    private Integer powerUnit;

    private Integer chassises;
    @TableField("empty_date")
    private Date emptyDate;
    @TableField("return_date")
    private Date returnDate;
    @TableField("pick_date")
    private Date pickDate;
    @TableField("yard_id")
    private Integer yardId;
    @TableField("port_id")
    private Integer portId;
    private Integer type;


    @Override
    protected Serializable pkVal() {
        return this.id;
    }

}

 src/main/java/com/stylefeng/guns/modular/system/model/TUserAddress.java

@@ -65,7 +65,15 @@
    @ApiModelProperty("0正常 1删除")
    private Integer remove;

    private String type;

    public String getType() {
        return type;
    }

    public void setType(String type) {
        this.type = type;
    }
    public Integer getId() {
        return id;
    }

 src/main/java/com/stylefeng/guns/modular/system/model/TVariances.java

@@ -4,6 +4,9 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

import java.io.Serializable;

/**
@@ -29,6 +32,9 @@
     * 订单id
     */
    @TableField("order_id")
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long orderId;
    /**
     * 销售id

 src/main/java/com/stylefeng/guns/modular/system/model/TVariancesVo.java

@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;

import java.io.Serializable;
@@ -27,6 +29,9 @@
     * 订单id
     */
    @TableField("order_id")
    @JsonSerialize(
            using = ToStringSerializer.class
    )
    private Long orderId;

    @ApiModelProperty("分组名称")

 src/main/java/com/stylefeng/guns/modular/system/model/TWarehouse.java

@@ -55,6 +55,10 @@
    private BigDecimal warePrice;
    @TableField("port_id")
    private Integer portId;
    @TableField("zipcode")
    private String zipCode;
    private String city;
    private String state;

    @Override
    protected Serializable pkVal() {

 src/main/java/com/stylefeng/guns/modular/system/model/TransportInfo.java

@@ -2,6 +2,7 @@

import lombok.Data;

import java.util.Date;
import java.util.List;

@Data
@@ -17,4 +18,10 @@
    private String contactEmail;

    private List<OrderDriverInfo> list;

    private String truckCompany;

    private Date pickupTime;

    private Integer streetTurn;
}

 src/main/java/com/stylefeng/guns/modular/system/service/ITClaimService.java

@@ -18,7 +18,7 @@
 */
public interface ITClaimService extends IService<TClaim> {

    List<TClaimList> getList(Page<TClaimList> tClaimListPage,String time, Integer state, String name);
    List<TClaimList> getList(Page<TClaimList> tClaimListPage,String time, Integer state, String name,int id);

    TClaimVo getClaimInfo(Integer id);


 src/main/java/com/stylefeng/guns/modular/system/service/ITOrderService.java

@@ -16,17 +16,17 @@
 */
public interface ITOrderService extends IService<TOrder> {

    List<ReceivableVo> getReceivable(Page<ReceivableVo> receivableVoPage, String time, String name);
    List<ReceivableVo> getReceivable(Page<ReceivableVo> receivableVoPage, String time, String name,int id);

    List<ShouldPayVo> getPayList(Page<ShouldPayVo> receivableVoPage, String time, String name);
    List<ShouldPayVo> getPayList(Page<ShouldPayVo> receivableVoPage, String time, String name,int id);

    List<ReceivablesList> listOfReceivables(Page<ReceivablesList> receivableVoPage, String time, String name, Integer invoicesId, Integer orderId, Integer state);
    List<ReceivablesList> listOfReceivables(Page<ReceivablesList> receivableVoPage, String time, String name, Integer invoicesId, Integer orderId, Integer state,Integer id);

    InvoicesVoTwo listOfReceivablesInfo(Long orderId);

    InvoicesVoOne listOfReceivablesInfoOne(Long orderId);

    List<PayList> listOfPay(Page<PayList> receivableVoPage, String time, String name, Integer billId, Integer orderId, Integer state);
    List<PayList> listOfPay(Page<PayList> receivableVoPage, String time, String name, Integer billId, Integer orderId, Integer state,Integer id);

    InvoicesCarVo listOPayInfo(Long number);

@@ -34,7 +34,7 @@

    Boolean agreeOfPayment(Long number);

    IndexInfo indexList(String time);
    IndexInfo indexList(String time,int id);

    List<OrderListVo> getOrderList(Page<OrderListVo> orderListVoPage, OrderListDto dto);


 src/main/java/com/stylefeng/guns/modular/system/service/ITUserService.java

@@ -16,7 +16,7 @@
 */
public interface ITUserService extends IService<TUser> {

    List<TUserVo> getList(Page<TUserVo> tUserVoPage, String name, Integer id);
    List<TUserVo> getList(Page<TUserVo> tUserVoPage, String name, Integer id,int companyId);


    TUserBasicInfo getBasicInfo(Integer tUserId);

 src/main/java/com/stylefeng/guns/modular/system/service/TTransportationService.java

New file
@@ -0,0 +1,17 @@
package com.stylefeng.guns.modular.system.service;


import com.baomidou.mybatisplus.service.IService;
import com.stylefeng.guns.modular.system.model.TTransportation;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author administrator
 * @since 2023-04-12
 */
public interface TTransportationService extends IService<TTransportation> {

}

 src/main/java/com/stylefeng/guns/modular/system/service/impl/TClaimServiceImpl.java

@@ -2,13 +2,12 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.TClaimMapper;
import com.stylefeng.guns.modular.system.dao.TGoodsMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.dao.TClaimMapper;
import com.stylefeng.guns.modular.system.service.ITClaimService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.utils.UserInfoUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -16,10 +15,6 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadPoolExecutor;

/**
 * <p>
@@ -36,15 +31,14 @@


    @Override
    public List<TClaimList> getList(Page<TClaimList> tClaimListPage,String time, Integer state, String name) {
    public List<TClaimList> getList(Page<TClaimList> tClaimListPage,String time, Integer state, String name,int id) {
        String sTime =null;
        String eTime = null;
        if(ToolUtil.isNotEmpty(time)){
            sTime=time.split(" - ")[0]+" 00:00:01";
            eTime=time.split(" - ")[1]+" 23:59:59";
        }
        Integer companyId = UserInfoUtil.getId();
        return this.baseMapper.getListCompany(tClaimListPage,sTime,eTime,state,name,companyId);
        return this.baseMapper.getListCompany(tClaimListPage,sTime,eTime,state,name,id);
    }

    @Override

 src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java

@@ -146,7 +146,7 @@
                TCompanyResp tCompanyResp = new TCompanyResp();
                tCompanyResp.setOrderId(order.getId());
                tCompanyResp.setName(price.getType());
                tCompanyResp.setPrice(price.getPrice());
                tCompanyResp.setPrice(price.getCarPrice());
                tCompanyRespList.add(tCompanyResp);
            }
            BigDecimal bigDecimal = tCompanyRespList.stream().map(TCompanyResp::getPrice).reduce(BigDecimal::add).orElse(new BigDecimal(0.00));

 src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java

@@ -12,7 +12,6 @@
import com.stylefeng.guns.modular.system.service.ITDriverService;
import com.stylefeng.guns.modular.system.service.ITOrderService;
import com.stylefeng.guns.modular.system.utils.GoogleMap.GoogleMapUtil;
import com.stylefeng.guns.modular.system.utils.UserInfoUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -82,9 +81,9 @@
    private TCarriersMapper carriersMapper;

    @Override
    public List<ReceivableVo> getReceivable(Page<ReceivableVo> receivableVoPage, String time, String name) {
        public List<ReceivableVo> getReceivable(Page<ReceivableVo> receivableVoPage, String time, String name,int id) {
        //TODO 时间保留
        List<ReceivableVo> list = this.baseMapper.getReceivable(receivableVoPage,name);
            List<ReceivableVo> list = this.baseMapper.getReceivable(receivableVoPage,name,id);

        Calendar instance = Calendar.getInstance();
        instance.setTime(new Date());
@@ -114,8 +113,8 @@
    }

    @Override
    public List<ShouldPayVo> getPayList(Page<ShouldPayVo> receivableVoPage, String time, String name) {
        List<ShouldPayVo> list = this.baseMapper.getPayList(receivableVoPage,name);
        public List<ShouldPayVo> getPayList(Page<ShouldPayVo> receivableVoPage, String time, String name,int id) {
            List<ShouldPayVo> list = this.baseMapper.getPayList(receivableVoPage,name,id);

        Calendar instance = Calendar.getInstance();
        instance.setTime(new Date());
@@ -147,17 +146,17 @@
    }

    @Override
    public List<ReceivablesList> listOfReceivables(Page<ReceivablesList> receivableVoPage, String time, String name, Integer invoicesId, Integer orderId, Integer state) {
        public List<ReceivablesList> listOfReceivables(Page<ReceivablesList> receivableVoPage, String time, String name, Integer invoicesId, Integer orderId, Integer state,Integer id) {
        String sTime=null;
        String eTime =null;
        if(Objects.nonNull(time)){
            sTime = time.split(" - ")[0]+" 00:00:01";
            eTime = time.split(" - ")[1]+" 23:59:59";
        }
        List<ReceivablesList> receivablesLists = this.baseMapper.listOfReceivables(receivableVoPage, sTime, eTime, name, invoicesId, orderId, state);
            List<ReceivablesList> receivablesLists = this.baseMapper.listOfReceivables(receivableVoPage, sTime, eTime, name, invoicesId, orderId, state,id);
        for (ReceivablesList receivablesList : receivablesLists) {
           Integer id= this.baseMapper.getPayStatus(receivablesList.getOrderId());
            if(id==null){
               Integer ids= this.baseMapper.getPayStatus(receivablesList.getOrderId());
                if(ids==null){
               receivablesList.setPayStatus(1);
           }else {
               receivablesList.setPayStatus(2);
@@ -167,14 +166,14 @@
    }

    @Override
    public List<PayList> listOfPay(Page<PayList> receivableVoPage, String time, String name, Integer billId, Integer orderId, Integer state) {
        public List<PayList> listOfPay(Page<PayList> receivableVoPage, String time, String name, Integer billId, Integer orderId, Integer state, Integer id) {
        String sTime=null;
        String eTime =null;
        if(Objects.nonNull(time)){
            sTime = time.split(" - ")[0]+" 00:00:01";
            eTime = time.split(" - ")[1]+" 23:59:59";
        }
        List<PayList> list = this.baseMapper.listOfPay(receivableVoPage, sTime, eTime, name, billId, orderId, state);
            List<PayList> list = this.baseMapper.listOfPay(receivableVoPage, sTime, eTime, name, billId, orderId, state,id);
        return list;
    }

@@ -191,7 +190,6 @@
        List<TGoods> orders = tGoodsMapper.selectList(new EntityWrapper<TGoods>().eq("order_id", id));
        ArrayList<TGoodsVo> tGoodsVos = new ArrayList<>();
        TCompany tCompany = tCompanyMapper.selectById(info.getCompanyId());
        List<TBoxSize> tBoxSizes = sizeService.selectList(null);

        for (TGoods order : orders) {
            TGoodsVo tGoodsVo = new TGoodsVo();
@@ -199,13 +197,7 @@
            tGoodsVo.setSize(order.getSize());
            tGoodsVo.setKg(order.getKg());
            String size = order.getSize();
            for (TBoxSize tBoxSize : tBoxSizes) {
                if(size.equals(tBoxSize.getBoxName())){
                    tGoodsVo.setLength(tBoxSize.getBoxLength());
                    tGoodsVo.setWidth(tBoxSize.getBoxWidth());
                    tGoodsVo.setHeight(tBoxSize.getBoxHigh());
                }
            }
                tGoodsVo.setType(size);
            tGoodsVos.add(tGoodsVo);
        }
        // 付卡车公司钱
@@ -245,7 +237,7 @@
    private TPowerUnitsMapper powerUnitsMapper;

    @Override
    public IndexInfo indexList(String time) {
        public IndexInfo indexList(String time,int id) {
        IndexInfo indexInfo = new IndexInfo();
        // 卡车公司收入时间
        String sTime=null;
@@ -254,14 +246,13 @@
            sTime=time.split(" - ")[0]+" 00:00:01";
            eTime=time.split(" - ")[1]+" 23:59:59";
        }
        Integer companyId = UserInfoUtil.getId();
        // 获取卡车公司收入
        Double companyIncome = this.baseMapper.getCompanyIncome(companyId, sTime, eTime);
            Double companyIncome = this.baseMapper.getCompanyIncome(id, sTime, eTime);

        indexInfo.setAccountsReceivable(new BigDecimal(companyIncome));
        // 获取卡车公司支出-》 是否存在承运商  -》算价格
        EntityWrapper<TOrder> wrapper = new EntityWrapper<>();
        wrapper.eq("company_id",companyId);
            wrapper.eq("company_id",id);
        wrapper.eq("carriers_pay_status",1);
        if(sTime!=null){
            wrapper.between("success_time",sTime,eTime);
@@ -285,20 +276,20 @@
        indexInfo.setPlatformRevenue(indexInfo.getAccountsReceivable().subtract(indexInfo.getAccountsPayable()));
        // 所有的信息
        // 所有司机
        Integer integer = driverMapper.selectCount(new EntityWrapper<TDriver>().eq("company_id", companyId).eq("remove",0));
            Integer integer = driverMapper.selectCount(new EntityWrapper<TDriver>().eq("company_id", id).eq("remove",0));
        indexInfo.setDriver(integer);
        //车头
        Integer integer1 = powerUnitsMapper.selectCount(new EntityWrapper<TPowerUnits>().eq("company_id", companyId).eq("type", 1));
            Integer integer1 = powerUnitsMapper.selectCount(new EntityWrapper<TPowerUnits>().eq("company_id", id).eq("type", 1));
        indexInfo.setPowerUnits(integer1);
        // 车架
        indexInfo.setChassises(powerUnitsMapper.selectCount(new EntityWrapper<TPowerUnits>().eq("company_id", companyId).eq("type", 2)));
            indexInfo.setChassises(powerUnitsMapper.selectCount(new EntityWrapper<TPowerUnits>().eq("company_id", id).eq("type", 2)));
        // 总订单
        indexInfo.setOrdersTotal(this.baseMapper.selectCount(new EntityWrapper<TOrder>().eq("company_id",companyId)));
            indexInfo.setOrdersTotal(this.baseMapper.selectCount(new EntityWrapper<TOrder>().eq("company_id",id)));
        //
        indexInfo.setInTransit(this.baseMapper.selectCount(new EntityWrapper<TOrder>().eq("company_id",companyId).eq("status","7")));
        indexInfo.setDispatching(this.baseMapper.selectCount(new EntityWrapper<TOrder>().eq("company_id",companyId).eq("status","0")));
        indexInfo.setCanceled(this.baseMapper.selectCount(new EntityWrapper<TOrder>().eq("company_id",companyId).eq("status","16")));
        indexInfo.setCompleted(this.baseMapper.selectCount(new EntityWrapper<TOrder>().eq("company_id",companyId).eq("status","1")));
            indexInfo.setInTransit(this.baseMapper.selectCount(new EntityWrapper<TOrder>().eq("company_id",id).eq("status","7")));
            indexInfo.setDispatching(this.baseMapper.selectCount(new EntityWrapper<TOrder>().eq("company_id",id).eq("status","0")));
            indexInfo.setCanceled(this.baseMapper.selectCount(new EntityWrapper<TOrder>().eq("company_id",id).eq("status","16")));
            indexInfo.setCompleted(this.baseMapper.selectCount(new EntityWrapper<TOrder>().eq("company_id",id).eq("status","1")));
        //获取当前公司的订单数量  根据当前月推算前12个月
        ArrayList<IndexMonth> indexMonths = new ArrayList<>();
        //获取当前月份
@@ -310,7 +301,7 @@
                IndexMonth indexMonth = new IndexMonth();
                int month = DateUtil.thisMonth();
                indexMonth.setMonth(month);
                indexMonth.setOrderNumber(this.baseMapper.selectCount(new EntityWrapper<TOrder>().eq("company_id",companyId).between("pay_time",DateUtil.beginOfMonth(new Date()),DateUtil.endOfMonth(new Date()))));
                    indexMonth.setOrderNumber(this.baseMapper.selectCount(new EntityWrapper<TOrder>().eq("company_id",id).between("pay_time",DateUtil.beginOfMonth(new Date()),DateUtil.endOfMonth(new Date()))));
                indexMonths.add(indexMonth);
            }else {
                IndexMonth indexMonth = new IndexMonth();
@@ -318,7 +309,7 @@
                Date time1 = instance.getTime();
                int month = DateUtil.month(time1);
                indexMonth.setMonth(month);
                indexMonth.setOrderNumber(this.baseMapper.selectCount(new EntityWrapper<TOrder>().eq("company_id",companyId).between("pay_time",DateUtil.beginOfMonth(time1),DateUtil.endOfMonth(time1))));
                    indexMonth.setOrderNumber(this.baseMapper.selectCount(new EntityWrapper<TOrder>().eq("company_id",id).between("pay_time",DateUtil.beginOfMonth(time1),DateUtil.endOfMonth(time1))));
                indexMonths.add(indexMonth);
            }
        }
@@ -362,20 +353,13 @@
        List<TGoods> orders = tGoodsMapper.selectList(new EntityWrapper<TGoods>().eq("order_id", id));
        ArrayList<TGoodsVo> tGoodsVos = new ArrayList<>();
        TCompany tCompany = tCompanyMapper.selectById(info.getCompanyId());
        List<TBoxSize> tBoxSizes = sizeService.selectList(null);
        for (TGoods order : orders) {
            TGoodsVo tGoodsVo = new TGoodsVo();
            tGoodsVo.setName(tCompany.getName());
            tGoodsVo.setSize(order.getSize());
            tGoodsVo.setKg(order.getKg());
            String size = order.getSize();
            for (TBoxSize tBoxSize : tBoxSizes) {
                if(size.equals(tBoxSize.getBoxName())){
                    tGoodsVo.setLength(tBoxSize.getBoxLength());
                    tGoodsVo.setWidth(tBoxSize.getBoxWidth());
                    tGoodsVo.setHeight(tBoxSize.getBoxHigh());
                }
            }
                tGoodsVo.setSize(size);
            tGoodsVos.add(tGoodsVo);
        }

@@ -410,7 +394,7 @@
            sTime=split[0]+" 00:00:01";
            eTime=split[1]+" 23:59:59";
        }
        Integer id = UserInfoUtil.getId();
            Integer id = dto.getCompanyId();
        List<OrderListVo> list = this.baseMapper.getOrderListOne(orderListVoPage,sTime,eTime,dto.getCustomerName(),dto.getId(),dto.getGroupId(),dto.getSaleId(),dto.getState(),id,dto.getType());
            for (OrderListVo orderListVo : list) {
            // TODO 对接第三方 看是否能提柜

 src/main/java/com/stylefeng/guns/modular/system/service/impl/TTransportationServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.stylefeng.guns.modular.system.service.impl;

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.dao.TTransportationMapper;
import com.stylefeng.guns.modular.system.model.TTransportation;
import com.stylefeng.guns.modular.system.service.TTransportationService;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author administrator
 * @since 2023-04-12
 */
@Service
public class TTransportationServiceImpl extends ServiceImpl<TTransportationMapper, TTransportation> implements TTransportationService {

}

 src/main/java/com/stylefeng/guns/modular/system/service/impl/TUserServiceImpl.java

@@ -5,10 +5,7 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.dao.*;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.ITBoxSizeService;
import com.stylefeng.guns.modular.system.service.ITOrderService;
import com.stylefeng.guns.modular.system.service.ITUserService;
import com.stylefeng.guns.modular.system.utils.UserInfoUtil;
import com.stylefeng.guns.modular.system.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -47,8 +44,7 @@
    @Resource
    private TUserAddressMapper userAddressMapper;
    @Override
    public List<TUserVo> getList(Page<TUserVo> tUserVoPage, String name, Integer id) {
        Integer companyId = UserInfoUtil.getId();
    public List<TUserVo> getList(Page<TUserVo> tUserVoPage, String name, Integer id,int companyId) {
        List<TUserVo> list = this.baseMapper.getListCompany(tUserVoPage, name, id, companyId);
        for (TUserVo tUserVo : list) {
            List<TUserAddress> addresses = userAddressMapper.selectList(new EntityWrapper<TUserAddress>().eq("user_id", tUserVo.getId()).eq("is_default", 1));
@@ -84,6 +80,15 @@
        return this.baseMapper.getInvoices(invoicesInfoPage,userId);
    }

    @Resource
    private TTransportationService tTransportationService;

    @Resource
    private ITPortService portService;

    @Resource
    private IWarehouseService warehouseService;

    @Override
    public InvoicesVo getInvoicesFromNumber(Long number) {
        // 1先获取订单详情  发货收货信息
@@ -92,23 +97,31 @@
        // 根据订单id 获取货物信息
        Long id = info.getId();
        TOrder tOrder = orderService.selectById(id);
        if(info.getType().equals("Live Unload")){
            // 还柜码头
            TTransportation tTransportation = tTransportationService.selectOne(new EntityWrapper<TTransportation>().eq("order_id", id).eq("type", 4));
            Integer portId = tTransportation.getPortId();
            TPort tPort = portService.selectById(portId);
            info.setEPortName(tPort.getName());
        }
        if(!"0".equals(tOrder.getWarehouse())){
            TWarehouse code = warehouseService.selectList(new EntityWrapper<TWarehouse>().eq("code", tOrder.getWarehouse())).get(0);
            info.setEAddress(code.getAddress());
        }else {
            info.setEAddress(tOrder.geteAddress());
        }


        List<TGoods> orders = tGoodsMapper.selectList(new EntityWrapper<TGoods>().eq("order_id", id));
        ArrayList<TGoodsVo> tGoodsVos = new ArrayList<>();
        TCompany tCompany = tCompanyMapper.selectById(info.getCompanyId());
        List<TBoxSize> tBoxSizes = sizeService.selectList(null);
        for (TGoods order : orders) {
            TGoodsVo tGoodsVo = new TGoodsVo();
            tGoodsVo.setName(tCompany.getName());
            tGoodsVo.setSize(order.getSize());
            tGoodsVo.setKg(order.getKg());
            String size = order.getSize();
            for (TBoxSize tBoxSize : tBoxSizes) {
                if(size.equals(tBoxSize.getBoxName())){
                    tGoodsVo.setLength(tBoxSize.getBoxLength());
                    tGoodsVo.setWidth(tBoxSize.getBoxWidth());
                    tGoodsVo.setHeight(tBoxSize.getBoxHigh());
                }
            }
            String size = order.getType();
            tGoodsVo.setType(size);
            tGoodsVos.add(tGoodsVo);
        }