From 9c47fbfef3cc65bf67fb44917e33162177bf4f9c Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 12 六月 2023 08:58:44 +0800
Subject: [PATCH] broker 司机端
---
src/main/java/com/stylefeng/guns/modular/system/controller/IndexController.java | 31 +++
src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java | 12
guns-company.iml | 268 +++++++++++++++++++++++++++++++++
src/main/java/com/stylefeng/guns/modular/system/enums/UserFeeSettingEnum.java | 2
src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml | 128 ++++++++--------
src/main/java/com/stylefeng/guns/modular/system/service/ITOrderService.java | 2
6 files changed, 368 insertions(+), 75 deletions(-)
diff --git a/guns-company.iml b/guns-company.iml
new file mode 100644
index 0000000..c81c49d
--- /dev/null
+++ b/guns-company.iml
@@ -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>
\ No newline at end of file
diff --git a/src/main/java/com/stylefeng/guns/modular/system/controller/IndexController.java b/src/main/java/com/stylefeng/guns/modular/system/controller/IndexController.java
index 6f71887..9693dbf 100644
--- a/src/main/java/com/stylefeng/guns/modular/system/controller/IndexController.java
+++ b/src/main/java/com/stylefeng/guns/modular/system/controller/IndexController.java
@@ -49,6 +49,31 @@
/**
* 获取首页信息
*/
+// @ApiOperation(value = "司机端-订单列表--in progress",notes="司机端-订单列表--in progress")
+// @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 = "containerNo", value = "货柜号", required = false, dataType = "String"),
+// @ApiImplicitParam(name = "date", value = "时间 2000-01-01", required = false, dataType = "String"),
+// @ApiImplicitParam(name = "pageNumber", value = "pageNumber", required = true, dataType = "int"),
+// @ApiImplicitParam(name = "pageSize", value = "pageSize", required = true, dataType = "int"),
+// @ApiImplicitParam(name = "type", value = "1 in progree 2 wancheng", required = true, dataType = "int"),
+// })
+// @GetMapping(value = "/index")
+// @ResponseBody
+// public Object list(int id,String containerNo,String date,int pageNumber,int pageSize,int type) {
+// Page<OrderInfoVo> orderInfoVoPage = new Page<>(pageNumber, pageSize);
+// String sTime = null;
+// String eTime =null;
+// if(ToolUtil.isNotEmpty(date)){
+// sTime=date+" 00:00:01";
+// eTime=date+" 23:59:59";
+// }
+// List<OrderInfoVo> list = orderService.getOrderListIndex(orderInfoVoPage,id,containerNo,sTime,eTime,type);
+// return new SuccessTip(list);
+// }
+
+
@ApiOperation(value = "司机端-订单列表--in progress",notes="司机端-订单列表--in progress")
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@@ -80,12 +105,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 = "Long"),
- @ApiImplicitParam(name = "type", value = "传回来的type", required = true, dataType = "int"),
+ @ApiImplicitParam(name = "driverId", value = "司机id", required = true, dataType = "int"),
})
@GetMapping(value = "/orderInfo")
@ResponseBody
- public Object orderInfo(Long id,Integer type) {
- OrderDetailVo orderDetailVo = orderService.orderInfo(id,type);
+ public Object orderInfo(Long id,int driverId) {
+ OrderDetailVo orderDetailVo = orderService.orderInfo(id,driverId);
// 经纬度给上
return new SuccessTip(orderDetailVo);
}
diff --git a/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml b/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml
index 2f69af8..d27ab5e 100644
--- a/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml
+++ b/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml
@@ -219,7 +219,7 @@
left JOIN t_country t5 on t1.e_state = t5.id
LEFT JOIN t_goods t6 on t6.order_id = t1.id
left join t_user t7 on t1.user_id = t7.id
- where (t1.s_driverId = #{id})
+ where (t1.s_driverId = #{id} or t1.s_driverId_one=#{id} or t1.e_driverId_one = #{id} or t1.e_driverId = #{id} )
<if test="containerNo !=null and containerNo !=''">
and t6.container_number like concat("%",#{containerNo},"%")
</if>
@@ -232,69 +232,69 @@
<if test="type !=1">
and t1.status =1
</if>
- union all
- select t7.phone phone, CONCAT(t2.`name`,t3.`name`) start,2 type,t1.id orderId,t1.status,CONCAT(t1.e_address,t4.name,t5.name,t1.e_zip_code) end,t1.shipment_date pickUpTime,t6.container_number ccontainerNumber ,t1.type sendType from t_order t1
- left JOIN t_port t2 on t1.`port` = t2.id
- LEFT JOIN t_country t3 on t2.city =t3.id
- left JOIN t_country t4 on t1.e_city =t4.id
- left JOIN t_country t5 on t1.e_state = t5.id
- LEFT JOIN t_goods t6 on t6.order_id = t1.id
- left join t_user t7 on t1.user_id = t7.id
- where (t1.s_driverId_one = #{id} )
- <if test="containerNo !=null and containerNo !=''">
- and t6.container_number like concat("%",#{containerNo},"%")
- </if>
- <if test="sTime !=null">
- and t1.shipment_date between #{sTime} and #{eTime}
- </if>
- <if test="type ==1">
- and t1.status !=1
- </if>
- <if test="type !=1">
- and t1.status =1
- </if>
- union all
- select t7.phone phone, CONCAT(t2.`name`,t3.`name`) start,3 type,t1.id orderId,t1.status,CONCAT(t1.e_address,t4.name,t5.name,t1.e_zip_code) end,t1.shipment_date pickUpTime,t6.container_number ccontainerNumber,t1.type sendType from t_order t1
- left JOIN t_port t2 on t1.`port` = t2.id
- LEFT JOIN t_country t3 on t2.city =t3.id
- left JOIN t_country t4 on t1.e_city =t4.id
- left JOIN t_country t5 on t1.e_state = t5.id
- LEFT JOIN t_goods t6 on t6.order_id = t1.id
- left join t_user t7 on t1.user_id = t7.id
- where ( t1.e_driverId_one = #{id})
- <if test="containerNo !=null and containerNo !=''">
- and t6.container_number like concat("%",#{containerNo},"%")
- </if>
- <if test="sTime !=null">
- and t1.shipment_date between #{sTime} and #{eTime}
- </if>
- <if test="type ==1">
- and t1.status !=1
- </if>
- <if test="type !=1">
- and t1.status =1
- </if>
- union all
- select t7.phone phone, CONCAT(t2.`name`,t3.`name`) start,4 type,t1.id orderId,t1.status,CONCAT(t1.e_address,t4.name,t5.name,t1.e_zip_code) end,t1.shipment_date pickUpTime,t6.container_number ccontainerNumber ,t1.type sendType from t_order t1
- left JOIN t_port t2 on t1.`port` = t2.id
- LEFT JOIN t_country t3 on t2.city =t3.id
- left JOIN t_country t4 on t1.e_city =t4.id
- left JOIN t_country t5 on t1.e_state = t5.id
- LEFT JOIN t_goods t6 on t6.order_id = t1.id
- left join t_user t7 on t1.user_id = t7.id
- where ( t1.e_driverId = #{id} )
- <if test="containerNo !=null and containerNo !=''">
- and t6.container_number like concat("%",#{containerNo},"%")
- </if>
- <if test="sTime !=null">
- and t1.shipment_date between #{sTime} and #{eTime}
- </if>
- <if test="type ==1">
- and t1.status !=1
- </if>
- <if test="type !=1">
- and t1.status =1
- </if>
+<!-- union all-->
+<!-- select t7.phone phone, CONCAT(t2.`name`,t3.`name`) start,2 type,t1.id orderId,t1.status,CONCAT(t1.e_address,t4.name,t5.name,t1.e_zip_code) end,t1.shipment_date pickUpTime,t6.container_number ccontainerNumber ,t1.type sendType from t_order t1-->
+<!-- left JOIN t_port t2 on t1.`port` = t2.id-->
+<!-- LEFT JOIN t_country t3 on t2.city =t3.id-->
+<!-- left JOIN t_country t4 on t1.e_city =t4.id-->
+<!-- left JOIN t_country t5 on t1.e_state = t5.id-->
+<!-- LEFT JOIN t_goods t6 on t6.order_id = t1.id-->
+<!-- left join t_user t7 on t1.user_id = t7.id-->
+<!-- where (t1.s_driverId_one = #{id} )-->
+<!-- <if test="containerNo !=null and containerNo !=''">-->
+<!-- and t6.container_number like concat("%",#{containerNo},"%")-->
+<!-- </if>-->
+<!-- <if test="sTime !=null">-->
+<!-- and t1.shipment_date between #{sTime} and #{eTime}-->
+<!-- </if>-->
+<!-- <if test="type ==1">-->
+<!-- and t1.status !=1-->
+<!-- </if>-->
+<!-- <if test="type !=1">-->
+<!-- and t1.status =1-->
+<!-- </if>-->
+<!-- union all-->
+<!-- select t7.phone phone, CONCAT(t2.`name`,t3.`name`) start,3 type,t1.id orderId,t1.status,CONCAT(t1.e_address,t4.name,t5.name,t1.e_zip_code) end,t1.shipment_date pickUpTime,t6.container_number ccontainerNumber,t1.type sendType from t_order t1-->
+<!-- left JOIN t_port t2 on t1.`port` = t2.id-->
+<!-- LEFT JOIN t_country t3 on t2.city =t3.id-->
+<!-- left JOIN t_country t4 on t1.e_city =t4.id-->
+<!-- left JOIN t_country t5 on t1.e_state = t5.id-->
+<!-- LEFT JOIN t_goods t6 on t6.order_id = t1.id-->
+<!-- left join t_user t7 on t1.user_id = t7.id-->
+<!-- where ( t1.e_driverId_one = #{id})-->
+<!-- <if test="containerNo !=null and containerNo !=''">-->
+<!-- and t6.container_number like concat("%",#{containerNo},"%")-->
+<!-- </if>-->
+<!-- <if test="sTime !=null">-->
+<!-- and t1.shipment_date between #{sTime} and #{eTime}-->
+<!-- </if>-->
+<!-- <if test="type ==1">-->
+<!-- and t1.status !=1-->
+<!-- </if>-->
+<!-- <if test="type !=1">-->
+<!-- and t1.status =1-->
+<!-- </if>-->
+<!-- union all-->
+<!-- select t7.phone phone, CONCAT(t2.`name`,t3.`name`) start,4 type,t1.id orderId,t1.status,CONCAT(t1.e_address,t4.name,t5.name,t1.e_zip_code) end,t1.shipment_date pickUpTime,t6.container_number ccontainerNumber ,t1.type sendType from t_order t1-->
+<!-- left JOIN t_port t2 on t1.`port` = t2.id-->
+<!-- LEFT JOIN t_country t3 on t2.city =t3.id-->
+<!-- left JOIN t_country t4 on t1.e_city =t4.id-->
+<!-- left JOIN t_country t5 on t1.e_state = t5.id-->
+<!-- LEFT JOIN t_goods t6 on t6.order_id = t1.id-->
+<!-- left join t_user t7 on t1.user_id = t7.id-->
+<!-- where ( t1.e_driverId = #{id} )-->
+<!-- <if test="containerNo !=null and containerNo !=''">-->
+<!-- and t6.container_number like concat("%",#{containerNo},"%")-->
+<!-- </if>-->
+<!-- <if test="sTime !=null">-->
+<!-- and t1.shipment_date between #{sTime} and #{eTime}-->
+<!-- </if>-->
+<!-- <if test="type ==1">-->
+<!-- and t1.status !=1-->
+<!-- </if>-->
+<!-- <if test="type !=1">-->
+<!-- and t1.status =1-->
+<!-- </if>-->
</select>
</mapper>
diff --git a/src/main/java/com/stylefeng/guns/modular/system/enums/UserFeeSettingEnum.java b/src/main/java/com/stylefeng/guns/modular/system/enums/UserFeeSettingEnum.java
index 68754b8..d658d16 100644
--- a/src/main/java/com/stylefeng/guns/modular/system/enums/UserFeeSettingEnum.java
+++ b/src/main/java/com/stylefeng/guns/modular/system/enums/UserFeeSettingEnum.java
@@ -2,7 +2,7 @@
public enum UserFeeSettingEnum {
- LH_FSH(1, "LH-FSH"),
+ LH_FSH(1, "LH+FSH"),
CHASSIS_FEE(2, "Chassis fee"),
PREPULL(3, "Prepull"),
CHASSIS_SPLIT(4, "Chassis split"),
diff --git a/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderService.java b/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderService.java
index cc65d7e..381202e 100644
--- a/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderService.java
+++ b/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderService.java
@@ -49,6 +49,6 @@
List<OrderInfoVo> getOrderListIndex(Page<OrderInfoVo> orderInfoVoPage, int id, String containerNo, String sTime, String eTime,int type);
- OrderDetailVo orderInfo(Long id,int type);
+ OrderDetailVo orderInfo(Long id,int did);
}
diff --git a/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java b/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
index 5929ba5..c86b37c 100644
--- a/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
+++ b/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
@@ -576,7 +576,7 @@
@Resource
private TYardService yardService;
@Override
- public OrderDetailVo orderInfo(Long id,int typeStr) {
+ public OrderDetailVo orderInfo(Long id,int did) {
OrderDetailVo orderDetailVo = new OrderDetailVo();
List<Map<String, Object>> maps = new ArrayList<>();
@@ -745,7 +745,7 @@
orderInfo.put("7_danger",tGoods.getDanger());
orderInfo.put("8_weight",tGoods.getWeight());
Map<String, Object> map = sortMapByKey(orderInfo);
- if(typeStr==1){
+ if(tOrder.getsDriverid()==did){
maps.add(map);
}
if(tOrder.getExamSite()!=null){
@@ -753,7 +753,7 @@
TExamSite tExamSite = examSiteService.selectById(examSite);
// 第二个检查站
Map<String, Object> examInfo = getExamInfo(tExamSite);
- if(typeStr==1){
+ if(tOrder.getsDriverid()==did){
maps.add(examInfo);
}
}
@@ -764,7 +764,7 @@
Map<String, Object> yardOne = getYardOne(tTransportations1, tYard);
// 第四个 destination
Map<String, Object> destination = getDestination(tOrder);
- if(typeStr==2){
+ if(tOrder.getsDriverIdOne()==did){
maps.add(yardOne);
maps.add(destination);
}
@@ -773,7 +773,7 @@
TYard tYard1 = yardService.selectById(tTransportations2.getYardId());
// 第五个 yard
Map<String, Object> yardOne1 = getYardOne(tTransportations2, tYard1);
- if(typeStr==3 && tOrder.getType().equals("Live Unload")){
+ if(tOrder.geteDriverid()==did && tOrder.getType().equals("Live Unload")){
maps.add(yardOne1);
}
}
@@ -784,7 +784,7 @@
// 第六个 port
Map<String, Object> port = getPort(tTransportations3, tPort);
- if(typeStr==4 && tOrder.getType().equals("Live Unload")){
+ if(tOrder.geteDriverIdOne()==did && tOrder.getType().equals("Live Unload")){
maps.add(port);
}
}
--
Gitblit v1.7.1