From 7de016fea904b91a4b9d4ff3264c779793cfb991 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 19:56:47 +0800
Subject: [PATCH] 更新订单管理页面
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java | 71 +++++----
/dev/null | 269 --------------------------------------
management/guns-admin/src/main/resources/application.yml | 10
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderDetail.html | 19 ++
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java | 6
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java | 14 ++
management/guns-admin/src/main/resources/redis.properties | 24 +-
8 files changed, 88 insertions(+), 327 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java
index 86f53e9..06ffdf6 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java
@@ -24,6 +24,7 @@
import com.supersavedriving.driver.modular.system.warpper.OrderInfoWarpper;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -261,9 +262,10 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "long"),
@ApiImplicitParam(value = "原因", name = "cause", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "手机号", name = "phone", required = true, dataType = "string"),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResponseWarpper transferOrder(Long orderId, String cause){
+ public ResponseWarpper transferOrder(Long orderId, String cause, String phone){
if(ToolUtil.isEmpty(orderId)){
return ResponseWarpper.success(ResultUtil.paranErr("orderId"));
}
@@ -275,7 +277,7 @@
if(null == uid){
return ResponseWarpper.tokenErr();
}
- ResultUtil resultUtil = orderService.transferOrder(uid, orderId, cause);
+ ResultUtil resultUtil = orderService.transferOrder(uid, orderId, cause, phone);
return ResponseWarpper.success(resultUtil);
}catch (Exception e){
e.printStackTrace();
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java
index 99067f6..d3b4bb2 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java
@@ -109,7 +109,7 @@
* @return
* @throws Exception
*/
- ResultUtil transferOrder(Integer uid, Long orderId, String cause) throws Exception;
+ ResultUtil transferOrder(Integer uid, Long orderId, String cause, String phone) throws Exception;
/**
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
index 60e3ef1..52240af 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
@@ -247,14 +247,14 @@
* @param city 查询天气的城市
* @return
*/
- public Order getOrderPrice(Integer type, Double distance, Integer waitTime, Order order, String city){
+ public Order getOrderPrice(Integer type, Double distance, Integer waitTime, Order order, String city) {
order = getOrderInitialPrice(order);
SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 5));
- if(null == systemConfig){
- if(type == 1){//预估金额
+ if (null == systemConfig) {
+ if (type == 1) {//预估金额
order.setEstimatedPrice(0D);
}
- if(type == 2){//订单金额
+ if (type == 2) {//订单金额
order.setOrderMoney(0D);
}
return order;
@@ -294,19 +294,19 @@
e.set(Calendar.MINUTE, Integer.valueOf(split1[1]));
e.set(Calendar.SECOND, 0);
- if(hour1 > hour2){
- if(s.getTimeInMillis() > date.getTime()){
+ if (hour1 > hour2) {
+ if (s.getTimeInMillis() > date.getTime()) {
s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) - 1);
- }else{
+ } else {
e.set(Calendar.DAY_OF_YEAR, e.get(Calendar.DAY_OF_YEAR) + 1);
}
}
- if(date.getTime() >= s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()){
- if(num3.compareTo(distance) >= 0){//起步里程内
+ if (date.getTime() >= s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()) {
+ if (num3.compareTo(distance) >= 0) {//起步里程内
order.setStartDistance(distance);//起步里程
order.setStartPrice(num4);//起步价
- }else{
+ } else {
Double distance1 = distance;//原始里程
order.setStartDistance(num3);//起步里程
order.setStartPrice(num4);//起步价
@@ -318,7 +318,7 @@
order.setOverDrivePrice(multiply.doubleValue());//超出起步里程费
//计算长途费（超出长途起始公里，费用开始按照长途规则计算。）
- if(distance.compareTo(num7) > 0){
+ if (distance.compareTo(num7) > 0) {
order.setStartDistance(0D);//起步里程
order.setStartPrice(0D);//起步价
order.setOverDriveDistance(0D);//超出起步里程
@@ -328,7 +328,7 @@
order.setLongDistancePrice(num9);//长途费
}
//计算长途里程超出的部分
- if(distance.compareTo(num8) > 0){
+ if (distance.compareTo(num8) > 0) {
order.setOverLongDistance(new BigDecimal(distance1 - num8).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//超出长途里程
BigDecimal divide1 = new BigDecimal(distance - num8).divide(new BigDecimal(num10), 2, BigDecimal.ROUND_HALF_EVEN);
@@ -352,7 +352,7 @@
Double num9 = extraCost.getDouble("num9");//恶劣天气最高收取金额
//等待费用
- if(waitTime.compareTo(num1 * 60) >= 0){
+ if (waitTime.compareTo(num1 * 60) >= 0) {
order.setWaitTime(num1 * 60);//等待时长
order.setWaitTimePrice(num2);//等待费用
@@ -364,15 +364,15 @@
//恶劣天气
systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 8));
- if(null != systemConfig) {
+ if (null != systemConfig) {
JSONObject jsonObject1 = JSON.parseObject(systemConfig.getContent());
Integer num11 = jsonObject1.getInteger("num1");//开启恶劣天气计价
- if(1 == num11){
+ if (1 == num11) {
boolean badWeather = WeatherUtil.isBadWeather(city);
- if(badWeather){
+ if (badWeather) {
order.setBadWeatherDistance(num5);//恶劣天气公里
order.setBadWeatherPrice(num6);//恶劣天气费
- if(distance.compareTo(num7) > 0){
+ if (distance.compareTo(num7) > 0) {
BigDecimal subtract = new BigDecimal(distance).subtract(new BigDecimal(num7));
BigDecimal multiply = subtract.multiply(new BigDecimal(num8));
order.setOverBadWeatherDistance(subtract.doubleValue());//恶劣天气超出公里
@@ -380,36 +380,39 @@
}
double add = new BigDecimal(order.getOverBadWeatherPrice()).add(new BigDecimal(order.getBadWeatherPrice())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
- if(num9.compareTo(add) < 0){//超出最高金额（重新调整金额）
- if(num9.compareTo(num6) < 0){//如果恶劣天气费大于最高金额
+ if (num9.compareTo(add) < 0) {//超出最高金额（重新调整金额）
+ if (num9.compareTo(num6) < 0) {//如果恶劣天气费大于最高金额
order.setBadWeatherPrice(num9);//恶劣天气费
order.setOverBadWeatherPrice(0D);//恶劣天气超出公里费
- }else{
+ } else {
BigDecimal subtract = new BigDecimal(num9).subtract(new BigDecimal(add));
order.setOverBadWeatherPrice(subtract.doubleValue());//恶劣天气超出公里费
}
+ }
}
}
- }
- //计算折扣
- if(null != order.getUserId()){
+ //计算折扣
+ if (null != order.getUserId()) {
- }
+ }
- //计算总金额
- BigDecimal bigDecimal = new BigDecimal(order.getStartPrice() + order.getOverDrivePrice() + order.getLongDistancePrice() + order.getOverLongDistancePrice() +
- order.getWaitTimePrice() + order.getOutWaitTimePrice() + order.getBadWeatherPrice() + order.getOverBadWeatherPrice() - order.getDiscountAmount()).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ //计算总金额
+ BigDecimal bigDecimal = new BigDecimal(order.getStartPrice() + order.getOverDrivePrice() + order.getLongDistancePrice() + order.getOverLongDistancePrice() +
+ order.getWaitTimePrice() + order.getOutWaitTimePrice() + order.getBadWeatherPrice() + order.getOverBadWeatherPrice() - order.getDiscountAmount()).setScale(2, BigDecimal.ROUND_HALF_EVEN);
- if(type == 1){//预估价
- order.setEstimatedPrice(bigDecimal.doubleValue());
- }
- if(type == 2){//订单金额
- order.setOrderMoney(bigDecimal.doubleValue());
+ if (type == 1) {//预估价
+ order.setEstimatedPrice(bigDecimal.doubleValue());
+ }
+ if (type == 2) {//订单金额
+ order.setOrderMoney(bigDecimal.doubleValue());
+ }
+ return order;
}
return order;
}
+
/**
@@ -1147,7 +1150,7 @@
* @throws Exception
*/
@Override
- public ResultUtil transferOrder(Integer uid, Long orderId, String cause) throws Exception {
+ public ResultUtil transferOrder(Integer uid, Long orderId, String cause, String phone) throws Exception {
// 7.13改动
OrderTransfer orderTransfer = new OrderTransfer();
Order order = this.selectById(orderId);
@@ -1190,7 +1193,7 @@
new Thread(new Runnable() {
@Override
public void run() {
- pushOrder(finalOrder);
+ pushOrder(finalOrder.getId());
}
}).start();
}
diff --git "a/management/guns-admin/guns-admin \0501\051.iml" "b/management/guns-admin/guns-admin \0501\051.iml"
deleted file mode 100644
index d060d6c..0000000
--- "a/management/guns-admin/guns-admin \0501\051.iml"
+++ /dev/null
@@ -1,269 +0,0 @@
-<?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>
- <descriptors>
- <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
- </descriptors>
- <webroots>
- <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
- </webroots>
- <sourceRoots>
- <root url="file://$MODULE_DIR$/src/main/java" />
- <root url="file://$MODULE_DIR$/src/main/resources" />
- <root url="file://$MODULE_DIR$/src/main/webapp" />
- </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/main/webapp" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="guns-core (1)" />
- <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: 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="library" name="Maven: org.apache.poi:poi-examples:3.9" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi-excelant:3.9" level="project" />
- <orderEntry type="library" name="Maven: org.apache.ant:ant:1.8.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.8.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.9" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" level="project" />
- <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi-scratchpad:3.9" level="project" />
- <orderEntry type="library" name="Maven: com.huaweicloud:esdk-obs-java:3.19.5" level="project" />
- <orderEntry type="library" name="Maven: com.jamesmurty.utils:java-xmlbuilder:1.1" 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.14.0" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.5" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.10.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.10.0" level="project" />
- <orderEntry type="module" module-name="guns-generator (1)" />
- <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.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.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" 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" 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: redis.clients:jedis:2.9.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:5.0.0" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" />
- <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
- <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" 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.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: 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: 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" />
- <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
- <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.8.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.8.0" level="project" />
- <orderEntry type="library" name="Maven: org.owasp.encoder:encoder:1.2.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.8.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: cn.jpush.api:jpush-client:3.2.17" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.23.Final" level="project" />
- <orderEntry type="library" name="Maven: cn.jpush.api:jiguang-common:1.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: 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: commons-io:commons-io:2.6" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:2.5.0" level="project" />
- <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" />
- <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" level="project" />
- <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" level="project" />
- <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
- <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" />
- <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.1" level="project" />
- <orderEntry type="library" name="Maven: cn.rongcloud.im:server-sdk-java:3.0.4" level="project" />
- <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.10" level="project" />
- <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
- <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.6" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.10" level="project" />
- <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
- <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.6" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.0.4.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.0.6.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.0.6.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.0.6.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.0.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.0.4.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.1.6.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.23.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.23.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.23.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.23.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.23.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.23.Final" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.20" level="project" />
- <orderEntry type="library" name="Maven: com.github.wechatpay-apiv3:wechatpay-java-shangmi:0.2.1" level="project" />
- <orderEntry type="library" name="Maven: com.github.wechatpay-apiv3:wechatpay-java-core:0.2.1" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: com.tencent.kona:kona-crypto:1.0.3" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.bouncycastle:bcprov-jdk18on:1.72" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: com.tencent.kona:kona-pkix:1.0.3" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: com.tencent.kona:kona-provider:1.0.3" level="project" />
- <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.7" level="project" />
- </component>
-</module>
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
index 8f3883c..9eaa306 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
@@ -114,6 +114,20 @@
model.addAttribute("routeRecord",tOrder.getRouteRecord());//行程录音
model.addAttribute("userPhone",tOrder.getUserPhone());//用户手机号
model.addAttribute("userName",tOrder.getUserName());//用户名称
+ if(null != tOrder.getActualMileage()){
+ model.addAttribute("actualMileage",new BigDecimal(tOrder.getActualMileage() / 1000).setScale(2, RoundingMode.HALF_EVEN).doubleValue());//用户名称
+ }else{
+ model.addAttribute("actualMileage", 0);
+ }
+ if(null != tOrder.getGetoffTime() && null != tOrder.getBoardingTime()){
+ long t = tOrder.getGetoffTime().getTime() - tOrder.getBoardingTime().getTime();
+ int ti = Long.valueOf(t / 1000).intValue();
+ Integer s = ti % 60;
+ Integer m = ti / 60;
+ model.addAttribute("time", (m < 10 ? ("0" + m) : m) + ":" + (s < 10 ? ("0" + s) : s));//用户名称
+ }else{
+ model.addAttribute("time", 0);
+ }
// 查询用户
TAppUser tAppUser = tAppUserMapper.selectById(tOrder.getUserId());
diff --git a/management/guns-admin/src/main/resources/application.yml b/management/guns-admin/src/main/resources/application.yml
index cf84684..47c0ed2 100644
--- a/management/guns-admin/src/main/resources/application.yml
+++ b/management/guns-admin/src/main/resources/application.yml
@@ -15,8 +15,8 @@
spring:
profiles:
-# active: dev
- active: produce
+ active: dev
+# active: produce
mvc:
static-path-pattern: /static/**
view:
@@ -50,10 +50,10 @@
spring:
datasource:
- url: jdbc:mysql://127.0.0.1:3306/super_save_driving?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+ url: jdbc:mysql://192.168.110.80:3306/super_save_driving?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
username: root
- password: f4OfRjqoN3jSiNGiUoiNsQdOBtCOKYRj
-# password: 123456
+# password: f4OfRjqoN3jSiNGiUoiNsQdOBtCOKYRj
+ password: 123456
db-name: super_save_driving #用来搜集数据库的所有表
filters: wall,mergeStat
diff --git a/management/guns-admin/src/main/resources/redis.properties b/management/guns-admin/src/main/resources/redis.properties
index d6449e6..7f6bf6d 100644
--- a/management/guns-admin/src/main/resources/redis.properties
+++ b/management/guns-admin/src/main/resources/redis.properties
@@ -2,19 +2,19 @@
# Redis���ݿ�������Ĭ��Ϊ0��
spring.redis.database=0
-## Redis��������ַ
-spring.redis.host=127.0.0.1
-## Redis���������Ӷ˿�
-spring.redis.port=16379
-## Redis�������������루Ĭ��Ϊ�գ�
-spring.redis.password=cKsEeyffDXG5PzNg8CIbrWxFluXrCprZ
-
-# Redis��������ַ
+### Redis��������ַ
#spring.redis.host=127.0.0.1
-## Redis���������Ӷ˿�
-#spring.redis.port=6379
-## Redis�������������루Ĭ��Ϊ�գ�
-#spring.redis.password=123456
+### Redis���������Ӷ˿�
+#spring.redis.port=16379
+### Redis�������������루Ĭ��Ϊ�գ�
+#spring.redis.password=cKsEeyffDXG5PzNg8CIbrWxFluXrCprZ
+
+ Redis��������ַ
+spring.redis.host=127.0.0.1
+# Redis���������Ӷ˿�
+spring.redis.port=6379
+# Redis�������������루Ĭ��Ϊ�գ�
+spring.redis.password=123456
# ���ӳ������������ʹ�ø�ֵ��ʾû�����ƣ�
spring.redis.jedis.pool.max-active=1024
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderDetail.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderDetail.html
index 92fdffd..0addecd 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderDetail.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderDetail.html
@@ -179,10 +179,21 @@
</div>
</div>
@}
-
- <div class="row" style="margin-top: 30px;">
- <div class="col-sm-4">
- <h2 class="h3Class" style="font-weight: 700;">线路轨迹</h2>
+ <hr/>
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <div style="background-color: gray;height: 35px;line-height: 35px">
+ <label style="color: #0C0C0C">线路轨迹</label>
+ </div>
+ </div>
+ <hr/>
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <div class="initialLevel col-sm-3 control-label form-group" >
+ <label class="control-label" >行驶里程:</label>
+ <label>${actualMileage}KM</label>
+ </div>
+ <div class="initialLevel col-sm-3 control-label form-group" >
+ <label class="control-label" >行驶时长:</label>
+ <label>${time}</label>
</div>
</div>
<div class="row">
--
Gitblit v1.7.1