From 0dc953b5cb037762fb3eeed15ecca0b925ebe148 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 23 三月 2023 00:13:27 +0800
Subject: [PATCH] 新增加司机端接口
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java | 115 ++++++++++
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java | 7
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/AgentMapper.java | 11 +
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverService.java | 21 +
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java | 42 +++
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/EditionServiceImpl.java | 15 +
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Agent.java | 51 ++++
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IAgentService.java | 11 +
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AgentServiceImpl.java | 15 +
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/EditionMapper.xml | 15 +
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/AgentMapper.xml | 21 +
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java | 2
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java | 3
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/EditionWarpper.java | 20 +
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IEditionService.java | 11 +
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java | 2
super_save_driving.sql | 189 +++++++++-------
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Edition.java | 54 ++++
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/EditionMapper.java | 11 +
19 files changed, 523 insertions(+), 93 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java
index 3089742..561762b 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java
@@ -1,6 +1,7 @@
package com.supersavedriving.driver.modular.system.api;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.supersavedriving.driver.modular.system.model.Edition;
import com.supersavedriving.driver.modular.system.model.JoiningRequirements;
import com.supersavedriving.driver.modular.system.service.*;
import com.supersavedriving.driver.modular.system.util.PayMoneyUtil;
@@ -17,6 +18,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -71,6 +73,9 @@
@Autowired
private PayMoneyUtil payMoneyUtil;
+
+ @Autowired
+ private IEditionService editionService;
@@ -729,4 +734,114 @@
}
+ @ResponseBody
+ @PostMapping("/api/driver/updatePassword")
+// @ServiceLog(name = "修改密码", url = "/api/driver/updatePassword")
+ @ApiOperation(value = "修改密码", tags = {"司机端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "原密码", name = "oldPass", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "新密码", name = "newPass", required = true, dataType = "String"),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper updatePassword(String oldPass, String newPass){
+ if(ToolUtil.isEmpty(oldPass)){
+ return ResponseWarpper.success(ResultUtil.paranErr("oldPass"));
+ }
+ if(ToolUtil.isEmpty(newPass)){
+ return ResponseWarpper.success(ResultUtil.paranErr("newPass"));
+ }
+ try {
+ Integer uid = driverService.getUserByRequest();
+ if(null == uid){
+ return ResponseWarpper.tokenErr();
+ }
+ ResultUtil resultUtil = driverService.updatePassword(uid, oldPass, newPass);
+ return ResponseWarpper.success(resultUtil);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+ @ResponseBody
+ @PostMapping("/api/driver/recoverPassword")
+// @ServiceLog(name = "忘记密码", url = "/api/driver/recoverPassword")
+ @ApiOperation(value = "忘记密码", tags = {"司机端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "密码", name = "password", required = true, dataType = "String"),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper recoverPassword(String password){
+ if(ToolUtil.isEmpty(password)){
+ return ResponseWarpper.success(ResultUtil.paranErr("password"));
+ }
+ try {
+ Integer uid = driverService.getUserByRequest();
+ if(null == uid){
+ return ResponseWarpper.tokenErr();
+ }
+ ResultUtil resultUtil = driverService.recoverPassword(uid, password);
+ return ResponseWarpper.success(resultUtil);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/base/driver/verifySMSCode")
+// @ServiceLog(name = "验证短信验证码", url = "/base/driver/verifySMSCode")
+ @ApiOperation(value = "验证短信验证码", tags = {"司机端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "电话号码", name = "phone", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "验证码", name = "code", required = true, dataType = "String"),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper verifySMSCode(String phone, String code){
+ if(ToolUtil.isEmpty(phone)){
+ return ResponseWarpper.success(ResultUtil.paranErr("phone"));
+ }
+ if(ToolUtil.isEmpty(phone)){
+ return ResponseWarpper.success(ResultUtil.paranErr("code"));
+ }
+ try {
+ ResultUtil resultUtil = ResultUtil.success();
+ phone = phone.indexOf("+86") < 0 ? "+86" + phone : phone;
+ String value = redisUtil.getValue(phone);
+ if(ToolUtil.isEmpty(value) || !value.equals(code)){
+ resultUtil = ResultUtil.error("验证码无效");
+ }
+ redisUtil.remove(phone);
+ return ResponseWarpper.success(resultUtil);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+ @ResponseBody
+ @PostMapping("/api/driver/queryNewVersion")
+// @ServiceLog(name = "获取最新版本", url = "/api/driver/queryNewVersion")
+ @ApiOperation(value = "获取最新版本", tags = {"司机端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper<EditionWarpper> queryNewVersion(){
+ try {
+ Edition edition = editionService.selectOne(new EntityWrapper<Edition>().eq("editionPort", 2).eq("status", 1).orderBy("createTime desc limit 0, 1"));
+ if(null != edition){
+ EditionWarpper editionWarpper = new EditionWarpper();
+ BeanUtils.copyProperties(edition, editionWarpper);
+ return ResponseWarpper.success(editionWarpper);
+ }
+ return ResponseWarpper.success();
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
}
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 bcc54e8..9e24715 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
@@ -1,13 +1,11 @@
package com.supersavedriving.driver.modular.system.api;
-import com.supersavedriving.driver.modular.system.model.Order;
import com.supersavedriving.driver.modular.system.warpper.*;
import com.supersavedriving.driver.core.common.annotion.ServiceLog;
import com.supersavedriving.driver.core.util.ToolUtil;
import com.supersavedriving.driver.modular.system.service.IDriverService;
import com.supersavedriving.driver.modular.system.service.IOrderService;
import com.supersavedriving.driver.modular.system.util.ResultUtil;
-import com.supersavedriving.driver.modular.system.warpper.*;
import com.supersavedriving.driver.modular.system.warpper.AddOrderWarpper;
import com.supersavedriving.driver.modular.system.warpper.HallOrderList;
import com.supersavedriving.driver.modular.system.warpper.OrderInfoWarpper;
@@ -20,7 +18,6 @@
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
-import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/AgentMapper.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/AgentMapper.java
new file mode 100644
index 0000000..e7e8bb2
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/AgentMapper.java
@@ -0,0 +1,11 @@
+package com.supersavedriving.driver.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.supersavedriving.driver.modular.system.model.Agent;
+
+/**
+ * @author zhibing.pu
+ * @Date 2023/3/22 22:48
+ */
+public interface AgentMapper extends BaseMapper<Agent> {
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/EditionMapper.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/EditionMapper.java
new file mode 100644
index 0000000..5e407c8
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/EditionMapper.java
@@ -0,0 +1,11 @@
+package com.supersavedriving.driver.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.supersavedriving.driver.modular.system.model.Edition;
+
+/**
+ * @author zhibing.pu
+ * @Date 2023/3/22 23:30
+ */
+public interface EditionMapper extends BaseMapper<Edition> {
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/AgentMapper.xml b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/AgentMapper.xml
new file mode 100644
index 0000000..728d2be
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/AgentMapper.xml
@@ -0,0 +1,21 @@
+<?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.supersavedriving.driver.modular.system.dao.AgentMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.supersavedriving.driver.modular.system.model.Agent">
+ <id column="id" property="id"/>
+ <result column="principal" property="principal"/>
+ <result column="principalPhone" property="principalPhone"/>
+ <result column="email" property="email"/>
+ <result column="provinceName" property="provinceName"/>
+ <result column="provinceCode" property="provinceCode"/>
+ <result column="cityCode" property="cityCode"/>
+ <result column="cityName" property="cityName"/>
+ <result column="status" property="status"/>
+ <result column="createTime" property="createTime"/>
+ <result column="bankDeposit" property="bankDeposit"/>
+ <result column="bankAccount" property="bankAccount"/>
+ <result column="serviceCalls" property="serviceCalls"/>
+ </resultMap>
+</mapper>
\ No newline at end of file
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/EditionMapper.xml b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/EditionMapper.xml
new file mode 100644
index 0000000..4f877be
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/EditionMapper.xml
@@ -0,0 +1,15 @@
+<?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.supersavedriving.driver.modular.system.dao.EditionMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.supersavedriving.driver.modular.system.model.Edition">
+ <id column="id" property="id"/>
+ <result column="editionNo" property="editionNo"/>
+ <result column="editionFile" property="editionFile"/>
+ <result column="editionAnnouncement" property="editionAnnouncement"/>
+ <result column="editionPort" property="editionPort"/>
+ <result column="createTime" property="createTime"/>
+ <result column="status" property="status"/>
+ </resultMap>
+</mapper>
\ No newline at end of file
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Agent.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Agent.java
index 341b6b7..3eb742a 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Agent.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Agent.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;
+import java.util.Date;
+
/**
* 代理商
* @author zhibing.pu
@@ -31,6 +33,53 @@
@TableField("principalPhone")
private String principalPhone;
/**
- *
+ * 邮箱
*/
+ @TableField("email")
+ private String email;
+ /**
+ * 代理区域省名称
+ */
+ @TableField("provinceName")
+ private String provinceName;
+ /**
+ * 代理区域省编号
+ */
+ @TableField("provinceCode")
+ private String provinceCode;
+ /**
+ * 代理区域市编号
+ */
+ @TableField("cityCode")
+ private String cityCode;
+ /**
+ * 代理区域市名称
+ */
+ @TableField("cityName")
+ private String cityName;
+ /**
+ * 状态（1=正常，2=冻结，3=删除）
+ */
+ @TableField("status")
+ private Integer status;
+ /**
+ * 添加时间
+ */
+ @TableField("createTime")
+ private Date createTime;
+ /**
+ * 开户银行
+ */
+ @TableField("bankDeposit")
+ private String bankDeposit;
+ /**
+ * 银行账号
+ */
+ @TableField("bankAccount")
+ private String bankAccount;
+ /**
+ * 客服电话
+ */
+ @TableField("serviceCalls")
+ private String serviceCalls;
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Edition.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Edition.java
new file mode 100644
index 0000000..88680c5
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Edition.java
@@ -0,0 +1,54 @@
+package com.supersavedriving.driver.modular.system.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 lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zhibing.pu
+ * @Date 2023/3/22 23:27
+ */
+@Data
+@TableName("t_edition")
+public class Edition {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ @TableField("id")
+ private Integer id;
+ /**
+ * 版本编号
+ */
+ @TableField("editionNo")
+ private String editionNo;
+ /**
+ * 版本文件
+ */
+ @TableField("editionFile")
+ private String editionFile;
+ /**
+ * 版本公告
+ */
+ @TableField("editionAnnouncement")
+ private String editionAnnouncement;
+ /**
+ * 端口 1用户端 2司机端
+ */
+ @TableField("editionPort")
+ private Integer editionPort;
+ /**
+ * 添加时间
+ */
+ @TableField("createTime")
+ private Date createTime;
+ /**
+ * 状态（1=正常，2=冻结，3=删除）
+ */
+ @TableField("status")
+ private Integer status;
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IAgentService.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IAgentService.java
new file mode 100644
index 0000000..cc35f85
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IAgentService.java
@@ -0,0 +1,11 @@
+package com.supersavedriving.driver.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.supersavedriving.driver.modular.system.model.Agent;
+
+/**
+ * @author zhibing.pu
+ * @Date 2023/3/22 22:52
+ */
+public interface IAgentService extends IService<Agent> {
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverService.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverService.java
index 5d32466..89d7324 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverService.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverService.java
@@ -137,4 +137,25 @@
* @throws Exception
*/
void balanceRechargeCallback(String out_trade_no, String transaction_id) throws Exception;
+
+
+ /**
+ * 修改密码
+ * @param uid
+ * @param oldPass
+ * @param newPass
+ * @return
+ * @throws Exception
+ */
+ ResultUtil updatePassword(Integer uid, String oldPass, String newPass) throws Exception;
+
+
+ /**
+ * 设置密码
+ * @param uid
+ * @param password
+ * @return
+ * @throws Exception
+ */
+ ResultUtil recoverPassword(Integer uid, String password) throws Exception;
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IEditionService.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IEditionService.java
new file mode 100644
index 0000000..b28f71f
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IEditionService.java
@@ -0,0 +1,11 @@
+package com.supersavedriving.driver.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.supersavedriving.driver.modular.system.model.Edition;
+
+/**
+ * @author zhibing.pu
+ * @Date 2023/3/22 23:31
+ */
+public interface IEditionService extends IService<Edition> {
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AgentServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AgentServiceImpl.java
new file mode 100644
index 0000000..ce2526b
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AgentServiceImpl.java
@@ -0,0 +1,15 @@
+package com.supersavedriving.driver.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.supersavedriving.driver.modular.system.dao.AgentMapper;
+import com.supersavedriving.driver.modular.system.model.Agent;
+import com.supersavedriving.driver.modular.system.service.IAgentService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author zhibing.pu
+ * @Date 2023/3/22 22:52
+ */
+@Service
+public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements IAgentService {
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
index e957afc..b6a8177 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
@@ -91,6 +91,9 @@
@Autowired
private IRechargeRecordService rechargeRecordService;
+ @Autowired
+ private IAgentService agentService;
+
/**
@@ -538,6 +541,8 @@
driverInfo.setOnline(second);
}
driverInfo.setWechatAuthorization(driver.getOpenid() == null ? 0 : 1);
+ Agent agent = agentService.selectById(driver.getAgentId());
+ driverInfo.setServiceCalls(agent.getServiceCalls());
return driverInfo;
}
@@ -733,4 +738,41 @@
rechargeRecord1.setOrderNumber(transaction_id);
rechargeRecordService.updateById(rechargeRecord1);
}
+
+
+ /**
+ * 修改密码
+ * @param uid
+ * @param oldPass
+ * @param newPass
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public ResultUtil updatePassword(Integer uid, String oldPass, String newPass) throws Exception {
+ Driver driver = this.selectById(uid);
+ if(!ShiroKit.md5(oldPass, salt).equals(driver.getPassword())){
+ return ResultUtil.error("原密码错误");
+ }
+ newPass = ShiroKit.md5(newPass, salt);
+ driver.setPassword(newPass);
+ this.updateById(driver);
+ return ResultUtil.success();
+ }
+
+ /**
+ * 设置密码
+ * @param uid
+ * @param password
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public ResultUtil recoverPassword(Integer uid, String password) throws Exception {
+ Driver driver = this.selectById(uid);
+ password = ShiroKit.md5(password, salt);
+ driver.setPassword(password);
+ this.updateById(driver);
+ return ResultUtil.success();
+ }
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/EditionServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/EditionServiceImpl.java
new file mode 100644
index 0000000..3c1dd22
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/EditionServiceImpl.java
@@ -0,0 +1,15 @@
+package com.supersavedriving.driver.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.supersavedriving.driver.modular.system.dao.EditionMapper;
+import com.supersavedriving.driver.modular.system.model.Edition;
+import com.supersavedriving.driver.modular.system.service.IEditionService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author zhibing.pu
+ * @Date 2023/3/22 23:32
+ */
+@Service
+public class EditionServiceImpl extends ServiceImpl<EditionMapper, Edition> implements IEditionService {
+}
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 21016f6..646f3a3 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
@@ -888,8 +888,11 @@
pushOrderInfoWarpper.setWaitTime(order.getWaitTime());
pushOrderInfoWarpper.setState(order.getState());
pushOrderInfoWarpper.setActualMileage(Double.valueOf(order.getActualMileage() / 1000));
- int travelTime = Double.valueOf((System.currentTimeMillis() - order.getStartTime().getTime()) / 60000).intValue();
- pushOrderInfoWarpper.setTravelTime(travelTime);
+ pushOrderInfoWarpper.setTravelTime(0);
+ if(null != order.getStartTime()){
+ int travelTime = Double.valueOf((System.currentTimeMillis() - order.getStartTime().getTime()) / 60000).intValue();
+ pushOrderInfoWarpper.setTravelTime(travelTime);
+ }
pushUtil.pushOrderInfo(uid, 2, pushOrderInfoWarpper);
}
},0, 5000);
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java
index a92965c..18e5e42 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java
@@ -45,4 +45,6 @@
private String zfbCollectionCode;
@ApiModelProperty("是否微信授权（0=否，1=是）")
private Integer wechatAuthorization;
+ @ApiModelProperty("客服电话")
+ private String serviceCalls;
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/EditionWarpper.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/EditionWarpper.java
new file mode 100644
index 0000000..1d50786
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/EditionWarpper.java
@@ -0,0 +1,20 @@
+package com.supersavedriving.driver.modular.system.warpper;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zhibing.pu
+ * @Date 2023/3/22 23:33
+ */
+@Data
+@ApiModel
+public class EditionWarpper {
+ @ApiModelProperty("版本编号")
+ private String editionNo;
+ @ApiModelProperty("版本文件")
+ private String editionFile;
+ @ApiModelProperty("版本公告")
+ private String editionAnnouncement;
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java
index 51450e0..389091e 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java
@@ -41,6 +41,8 @@
private String endLat;
@ApiModelProperty("终点经度")
private String endLng;
+ @ApiModelProperty("预估费用")
+ private Double estimatedPrice;
@ApiModelProperty("预估里程")
private Double estimatedMileage;
@ApiModelProperty("起步价")
diff --git a/super_save_driving.sql b/super_save_driving.sql
index 3f0e06d..5f2921d 100644
--- a/super_save_driving.sql
+++ b/super_save_driving.sql
@@ -11,7 +11,7 @@
Target Server Version : 50637
File Encoding : 65001
- Date: 22/03/2023 22:33:48
+ Date: 23/03/2023 00:12:29
*/
SET NAMES utf8mb4;
@@ -74,7 +74,7 @@
`id` int(11) NOT NULL AUTO_INCREMENT,
`money` decimal(20, 2) NULL DEFAULT NULL COMMENT '报销金额',
`desc` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '描述',
- `createtime` datetime NULL DEFAULT NULL COMMENT '创建时间',
+ `createtime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`state` int(11) NULL DEFAULT NULL COMMENT '状态: 1.待提交 2:待审核 3.审核通过 4:驳回',
`userid` int(11) NULL DEFAULT NULL COMMENT '用户id',
`processId` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '流程定义id',
@@ -93,7 +93,7 @@
`id` int(65) NOT NULL AUTO_INCREMENT COMMENT '主键',
`logname` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '日志名称',
`userid` int(65) NULL DEFAULT NULL COMMENT '管理员id',
- `createtime` datetime NULL DEFAULT NULL COMMENT '创建时间',
+ `createtime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`succeed` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否执行成功',
`message` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '具体消息',
`ip` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '登录ip',
@@ -1013,7 +1013,7 @@
`title` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '标题',
`type` int(11) NULL DEFAULT NULL COMMENT '类型',
`content` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '内容',
- `createtime` datetime NULL DEFAULT NULL COMMENT '创建时间',
+ `createtime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`creater` int(11) NULL DEFAULT NULL COMMENT '创建人',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 9 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '通知表' ROW_FORMAT = COMPACT;
@@ -1035,7 +1035,7 @@
`userid` int(65) NULL DEFAULT NULL COMMENT '用户id',
`classname` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类名称',
`method` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '方法名称',
- `createtime` datetime NULL DEFAULT NULL COMMENT '创建时间',
+ `createtime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`succeed` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否成功',
`message` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '备注',
PRIMARY KEY (`id`) USING BTREE
@@ -1528,16 +1528,16 @@
`password` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '密码',
`salt` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'md5密码盐',
`name` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '名字',
- `birthday` datetime NULL DEFAULT NULL COMMENT '生日',
+ `birthday` datetime(0) NULL DEFAULT NULL COMMENT '生日',
`sex` int(11) NULL DEFAULT NULL COMMENT '性别（1：男 2：女）',
`email` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '电子邮件',
`phone` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '电话',
`roleid` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色id',
`deptid` int(11) NULL DEFAULT NULL COMMENT '部门id',
`status` int(11) NULL DEFAULT NULL COMMENT '状态(1：启用 2：冻结 3：删除）',
- `createtime` datetime NULL DEFAULT NULL COMMENT '创建时间',
+ `createtime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`version` int(11) NULL DEFAULT NULL COMMENT '保留字段',
- `pass_word_update` datetime NULL DEFAULT NULL COMMENT '密码修改时间',
+ `pass_word_update` datetime(0) NULL DEFAULT NULL COMMENT '密码修改时间',
`role_type` int(1) NULL DEFAULT NULL COMMENT '角色类型 1=平台 2=分公司 3=加盟商',
`object_id` int(11) NULL DEFAULT NULL COMMENT '公司id',
PRIMARY KEY (`id`) USING BTREE
@@ -1563,7 +1563,7 @@
`oldData` double(10, 2) NULL DEFAULT NULL COMMENT '历史数据',
`newData` double(10, 2) NULL DEFAULT NULL COMMENT '新数据',
`explain` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '变动说明',
- `createTime` datetime NULL DEFAULT NULL COMMENT '变动时间',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '变动时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '账户变动明细' ROW_FORMAT = COMPACT;
@@ -1592,7 +1592,7 @@
`cityCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '代理区域市编号',
`cityName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '代理区域市名称',
`status` int(1) NULL DEFAULT 1 COMMENT '状态（1=正常，2=冻结，3=删除）',
- `createTime` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
+ `createTime` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '添加时间',
`bankDeposit` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '开户银行',
`bankAccount` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '银行账号',
`serviceCalls` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '客服电话',
@@ -1630,7 +1630,7 @@
`accountBalance` double(11, 2) NULL DEFAULT NULL COMMENT '账户余额',
`userTagId` int(11) NULL DEFAULT NULL COMMENT '用户标签id',
`status` int(1) NULL DEFAULT NULL COMMENT '状态（1=正常，2=冻结，3=删除）',
- `createTime` datetime NULL DEFAULT NULL COMMENT '添加时间',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '添加时间',
`is_exception` int(1) NULL DEFAULT 1 COMMENT '是否异常 1正常 2异常',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '启用/冻结理由',
`inviterType` int(1) NULL DEFAULT NULL COMMENT '邀约人类型（1=用户，2=司机）',
@@ -1678,9 +1678,9 @@
`addresseePhone` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '收件人电话',
`addresseeEmail` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '收件人邮箱',
`state` int(1) NULL DEFAULT 1 COMMENT '开票状态 1待开票 2已开票 3开票失败',
- `createTime` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
+ `createTime` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '添加时间',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '发票管理' ROW_FORMAT = Compact;
+) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '发票管理' ROW_FORMAT = COMPACT;
-- ----------------------------
-- Records of t_bill
@@ -1704,7 +1704,7 @@
`districtCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '代理区域区编号',
`districtName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '代理区域区名称',
`status` int(1) NULL DEFAULT NULL COMMENT '状态（1=正常，2=冻结，3=删除）',
- `createTime` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
+ `createTime` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '添加时间',
`branchOfficeName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '分公司名称',
`operatingBusiness` int(1) NULL DEFAULT 1 COMMENT '经营业务 1司机代驾',
`bankDeposit` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '开户银行',
@@ -1729,10 +1729,10 @@
`content` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '消息内容',
`sort` int(11) NULL DEFAULT NULL COMMENT '排序',
`status` int(1) NULL DEFAULT NULL COMMENT '状态（1=正常，2=冻结，3=删除）',
- `createTime` datetime NULL DEFAULT NULL COMMENT '添加时间',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '添加时间',
`isShow` tinyint(1) NULL DEFAULT 0 COMMENT '是否显示 1是 0否',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '广播' ROW_FORMAT = Compact;
+) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '广播' ROW_FORMAT = COMPACT;
-- ----------------------------
-- Records of t_broadcast
@@ -1751,7 +1751,7 @@
`userId` int(11) NULL DEFAULT NULL COMMENT '用户id',
`cause` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '转单原因',
`status` int(1) NULL DEFAULT NULL COMMENT '状态（1=正常，2=冻结，3=删除）',
- `createTime` datetime NULL DEFAULT NULL COMMENT '添加时间',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '添加时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '订单取消记录' ROW_FORMAT = COMPACT;
@@ -1775,9 +1775,9 @@
`amount` decimal(10, 2) NULL DEFAULT NULL COMMENT '提现金额',
`state` int(1) NULL DEFAULT NULL COMMENT '提现状态 1未成功 2成功',
`orderNumber` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '第三方流水号',
- `createTime` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
+ `createTime` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '添加时间',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '提现记录' ROW_FORMAT = Compact;
+) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '提现记录' ROW_FORMAT = COMPACT;
-- ----------------------------
-- Records of t_cash_withdrawal
@@ -1801,9 +1801,9 @@
`html` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT '富文本',
`sort` int(11) NULL DEFAULT NULL COMMENT '排序',
`status` int(1) NULL DEFAULT NULL COMMENT '状态（1=正常，2=冻结，3=删除）',
- `createTime` datetime NULL DEFAULT NULL COMMENT '添加时间',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '添加时间',
`createUserId` int(11) NULL DEFAULT NULL COMMENT '添加人员id',
- `updateTime` datetime NULL DEFAULT NULL COMMENT '更新时间',
+ `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
`updateUserId` int(11) NULL DEFAULT NULL COMMENT '更新人员id',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '广告' ROW_FORMAT = COMPACT;
@@ -2033,10 +2033,10 @@
`notes` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '注释',
`state` int(1) NULL DEFAULT NULL COMMENT '处理状态（1=待处理，2=已处理）',
`status` int(1) NULL DEFAULT NULL COMMENT '状态（1=正常，2=冻结，3=删除）',
- `createTime` datetime NULL DEFAULT NULL COMMENT '添加时间',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '添加时间',
`auditId` int(11) NULL DEFAULT NULL COMMENT '处理人id',
`auditPersonName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '处理人名称',
- `auditTime` datetime NULL DEFAULT NULL COMMENT '处理时间',
+ `auditTime` datetime(0) NULL DEFAULT NULL COMMENT '处理时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '投诉' ROW_FORMAT = COMPACT;
@@ -2054,7 +2054,7 @@
`user_id` int(11) NULL DEFAULT NULL COMMENT '用户id',
`agent_id` int(11) NULL DEFAULT NULL COMMENT '代理商id',
`branch_office_id` int(11) NULL DEFAULT NULL COMMENT '分公司id',
- `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `create_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
`coupon_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '优惠券名称',
`coupon_type` int(1) NULL DEFAULT NULL COMMENT '优惠券类型 1活动券 2新人券',
`coupon_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '优惠券码',
@@ -2107,12 +2107,12 @@
`approvalStatus` int(1) NULL DEFAULT 1 COMMENT '审核状态（1=待审核，2=已同意，3=已拒绝）',
`approvalNotes` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '审核注释',
`approvalUserId` int(11) NULL DEFAULT NULL COMMENT '审核用户id',
- `approvalTime` datetime NULL DEFAULT NULL COMMENT '审核时间',
+ `approvalTime` datetime(0) NULL DEFAULT NULL COMMENT '审核时间',
`serverStatus` int(1) NULL DEFAULT NULL COMMENT '服务状态（1=空闲，2=服务中）',
`integral` int(11) NULL DEFAULT 0 COMMENT '剩余积分',
`score` double(11, 1) NULL DEFAULT NULL COMMENT '评分',
`status` int(1) NULL DEFAULT 1 COMMENT '状态（1=正常，2=冻结，3=删除）',
- `createTime` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
+ `createTime` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '添加时间',
`backgroundBalance` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '后台充值余额',
`couponBalance` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '优惠券余额（订单优惠券支付的金额）',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '启用冻结理由',
@@ -2123,7 +2123,7 @@
`cityName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '加盟区域市名称',
`areaCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '加盟区域区编号',
`areaName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '加盟区域区名称',
- `firstCertificateTime` datetime NULL DEFAULT NULL COMMENT '驾驶证初次领证时间',
+ `firstCertificateTime` datetime(0) NULL DEFAULT NULL COMMENT '驾驶证初次领证时间',
`commission` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '佣金',
`wxCollectionCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '微信收款码',
`zfbCollectionCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '支付宝收款码',
@@ -2155,8 +2155,8 @@
CREATE TABLE `t_driver_work` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
`driverId` int(11) NULL DEFAULT NULL COMMENT '司机id',
- `workTime` datetime NULL DEFAULT NULL COMMENT '上班时间',
- `offWorkTime` datetime NULL DEFAULT NULL COMMENT '下班时间',
+ `workTime` datetime(0) NULL DEFAULT NULL COMMENT '上班时间',
+ `offWorkTime` datetime(0) NULL DEFAULT NULL COMMENT '下班时间',
`onlineTime` bigint(20) NULL DEFAULT NULL COMMENT '在线时长（秒）',
`status` int(1) NULL DEFAULT NULL COMMENT '状态（1=上班，2=下班）',
PRIMARY KEY (`id`) USING BTREE
@@ -2195,10 +2195,10 @@
`editionFile` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '版本文件',
`editionAnnouncement` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '版本公告',
`editionPort` int(1) NULL DEFAULT NULL COMMENT '端口 1用户端 2司机端',
- `createTime` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `createTime` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
`status` int(1) NULL DEFAULT 1 COMMENT '状态（1=正常，2=冻结，3=删除）',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 15 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '版本管理' ROW_FORMAT = Compact;
+) ENGINE = InnoDB AUTO_INCREMENT = 15 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '版本管理' ROW_FORMAT = COMPACT;
-- ----------------------------
-- Records of t_edition
@@ -2217,7 +2217,7 @@
`score` int(1) NULL DEFAULT NULL COMMENT '评分',
`evaluate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '评价内容',
`status` int(1) NULL DEFAULT NULL COMMENT '状态（1=正常，2=冻结，3=删除）',
- `createTime` datetime NULL DEFAULT NULL COMMENT '添加时间',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '添加时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '订单评价' ROW_FORMAT = COMPACT;
@@ -2234,7 +2234,7 @@
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
`type` int(1) NULL DEFAULT NULL COMMENT '类型（1=代驾服务协议与隐私政策保护，2=法律条款，3=个人信息处理规则，4=积分说明，5=佣金规则说明，6=行程录音说明，7=预估价格说明，8=加盟基本要求，9=加盟流程，10=起步价说明，11=注销协议，12=关于我们，13=司机消单说明）',
`html` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT 'H5内容',
- `createTime` datetime NULL DEFAULT NULL COMMENT '添加时间',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '添加时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 14 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = 'H5富文本' ROW_FORMAT = COMPACT;
@@ -2263,7 +2263,7 @@
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
`type` int(1) NULL DEFAULT NULL COMMENT '数据类型（1=启动页）',
`img` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '图片地址',
- `createTime` datetime NULL DEFAULT NULL COMMENT '添加时间',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '添加时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '系统图片' ROW_FORMAT = COMPACT;
@@ -2280,9 +2280,9 @@
`content` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '内容',
`sort` int(1) NULL DEFAULT NULL COMMENT '排序',
`status` int(1) NULL DEFAULT NULL COMMENT '状态（1=正常，2=冻结，3=删除）',
- `createTime` datetime NULL DEFAULT NULL COMMENT '添加时间',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '添加时间',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '加盟要求' ROW_FORMAT = Compact;
+) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '加盟要求' ROW_FORMAT = COMPACT;
-- ----------------------------
-- Records of t_joining_requirements
@@ -2302,9 +2302,9 @@
`type` int(1) NULL DEFAULT NULL COMMENT '数据类型（1=转单，2=司机消单，3=用户取消订单）',
`content` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '内容',
`status` int(1) NULL DEFAULT NULL COMMENT '状态（1=正常，2=冻结，3=删除）',
- `createTime` datetime NULL DEFAULT NULL COMMENT '添加时间',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '添加时间',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 10 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '事由管理' ROW_FORMAT = Compact;
+) ENGINE = InnoDB AUTO_INCREMENT = 10 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '事由管理' ROW_FORMAT = COMPACT;
-- ----------------------------
-- Records of t_main_content
@@ -2333,53 +2333,53 @@
`source` int(1) NULL DEFAULT NULL COMMENT '订单来源（1=小程序，2=APP）',
`agentId` int(11) NULL DEFAULT NULL COMMENT '代理商id',
`branchOfficeId` int(11) NULL DEFAULT NULL COMMENT '分公司id',
- `orderTakingTime` datetime NULL DEFAULT NULL COMMENT '接单时间',
- `goToAppointmentPointTime` datetime NULL DEFAULT NULL COMMENT '前往预约点时间',
- `arrivalTimeAtTheAppointmentPoint` datetime NULL DEFAULT NULL COMMENT '到达预约点时间',
- `startTime` datetime NULL DEFAULT NULL COMMENT '开始服务时间',
+ `orderTakingTime` datetime(0) NULL DEFAULT NULL COMMENT '接单时间',
+ `goToAppointmentPointTime` datetime(0) NULL DEFAULT NULL COMMENT '前往预约点时间',
+ `arrivalTimeAtTheAppointmentPoint` datetime(0) NULL DEFAULT NULL COMMENT '到达预约点时间',
+ `startTime` datetime(0) NULL DEFAULT NULL COMMENT '开始服务时间',
`startAddress` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '起点地址',
`startLat` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '起点纬度',
`startLng` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '起点经度',
`endAddress` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '终点地址',
`endLat` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '终点纬度',
`endLng` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '终点经度',
- `boardingTime` datetime NULL DEFAULT NULL COMMENT '上车时间',
- `getoffTime` datetime NULL DEFAULT NULL COMMENT '下车时间',
- `startDistance` double(11, 2) NULL DEFAULT NULL COMMENT '起步里程（公里）',
- `startPrice` decimal(10, 2) NULL DEFAULT NULL COMMENT '起步价',
- `overDriveDistance` double(11, 2) NULL DEFAULT NULL COMMENT '超出起步里程',
- `overDrivePrice` decimal(10, 2) NULL DEFAULT NULL COMMENT '超出起步里程费',
+ `boardingTime` datetime(0) NULL DEFAULT NULL COMMENT '上车时间',
+ `getoffTime` datetime(0) NULL DEFAULT NULL COMMENT '下车时间',
+ `startDistance` double(11, 2) NULL DEFAULT 0.00 COMMENT '起步里程（公里）',
+ `startPrice` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '起步价',
+ `overDriveDistance` double(11, 2) NULL DEFAULT 0.00 COMMENT '超出起步里程',
+ `overDrivePrice` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '超出起步里程费',
`longDistance` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '长途里程',
- `longDistancePrice` decimal(10, 2) NULL DEFAULT NULL COMMENT '长途里程费',
- `overLongDistance` double(11, 2) NULL DEFAULT NULL COMMENT '超出长途里程',
- `overLongDistancePrice` decimal(10, 2) NULL DEFAULT NULL COMMENT '超出长途里程费',
- `waitTime` int(11) NULL DEFAULT NULL COMMENT '等待时长（分钟）',
- `waitTimePrice` decimal(10, 2) NULL DEFAULT NULL COMMENT '等待费',
- `outWaitTime` int(11) NULL DEFAULT NULL COMMENT '超出等待时长（分钟）',
- `outWaitTimePrice` decimal(10, 2) NULL DEFAULT NULL COMMENT '超出等待费',
- `badWeatherDistance` decimal(10, 2) NULL DEFAULT NULL COMMENT '恶劣天气里程',
- `badWeatherPrice` decimal(10, 2) NULL DEFAULT NULL COMMENT '恶劣天气费',
- `overBadWeatherDistance` double(10, 2) NULL DEFAULT NULL COMMENT '恶劣天气超出里程',
- `overBadWeatherPrice` decimal(10, 2) NULL DEFAULT NULL COMMENT '恶劣天气超出费',
+ `longDistancePrice` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '长途里程费',
+ `overLongDistance` double(11, 2) NULL DEFAULT 0.00 COMMENT '超出长途里程',
+ `overLongDistancePrice` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '超出长途里程费',
+ `waitTime` int(11) NULL DEFAULT 0 COMMENT '等待时长（分钟）',
+ `waitTimePrice` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '等待费',
+ `outWaitTime` int(11) NULL DEFAULT 0 COMMENT '超出等待时长（分钟）',
+ `outWaitTimePrice` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '超出等待费',
+ `badWeatherDistance` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '恶劣天气里程',
+ `badWeatherPrice` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '恶劣天气费',
+ `overBadWeatherDistance` double(10, 2) NULL DEFAULT 0.00 COMMENT '恶劣天气超出里程',
+ `overBadWeatherPrice` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '恶劣天气超出费',
`weather` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '天气',
- `estimatedPrice` decimal(10, 2) NULL DEFAULT NULL COMMENT '预估价',
- `estimatedMileage` decimal(10, 2) NULL DEFAULT NULL COMMENT '预估里程',
- `orderMoney` decimal(10, 2) NULL DEFAULT NULL COMMENT '订单金额',
- `actualMileage` int(11) NULL DEFAULT NULL COMMENT '实际里程（米）',
- `payMoney` decimal(10, 2) NULL DEFAULT NULL COMMENT '支付金额',
- `discountedPrice` decimal(10, 2) NULL DEFAULT NULL COMMENT '优惠金额',
+ `estimatedPrice` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '预估价',
+ `estimatedMileage` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '预估里程',
+ `orderMoney` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '订单金额',
+ `actualMileage` int(11) NULL DEFAULT 0 COMMENT '实际里程（米）',
+ `payMoney` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '支付金额',
+ `discountedPrice` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '优惠金额',
`couponId` int(11) NULL DEFAULT NULL COMMENT '优惠券id',
- `discountAmount` decimal(10, 2) NULL DEFAULT NULL COMMENT '折扣优惠金额',
- `discount` decimal(10, 2) NULL DEFAULT NULL COMMENT '折扣',
+ `discountAmount` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '折扣优惠金额',
+ `discount` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '折扣',
`payType` int(1) NULL DEFAULT NULL COMMENT '支付类型（1=微信支付，2=余额支付，3=线下收款）',
- `payTime` datetime NULL DEFAULT NULL COMMENT '支付时间',
+ `payTime` datetime(0) NULL DEFAULT NULL COMMENT '支付时间',
`orderNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '第三方支付流水号',
`hallOrder` int(1) NULL DEFAULT 0 COMMENT '大厅订单（0=否，1=是）',
- `startWaitTime` datetime NULL DEFAULT NULL COMMENT '开始进入等待状态时间',
+ `startWaitTime` datetime(0) NULL DEFAULT NULL COMMENT '开始进入等待状态时间',
`state` int(1) NULL DEFAULT NULL COMMENT '订单状态（101=待接单，102=已接单，103=前往预约点，104=到达预约点，105=开始服务，106=到达目的地，107=待支付，108=待评价，109=已完成，201=转单中，301=已取消，401=等待中）',
`oldState` int(1) NULL DEFAULT NULL COMMENT '历史订单状态（用于还原之前状态）',
`status` int(1) NULL DEFAULT NULL COMMENT '状态（1=正常，2=冻结，3=删除）',
- `createTime` datetime NULL DEFAULT NULL COMMENT '添加时间',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '添加时间',
`routeRecord` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '行程录音',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 15 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '订单' ROW_FORMAT = COMPACT;
@@ -2412,7 +2412,7 @@
`startAddress` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '起点地址',
`endAddress` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '终点地址',
`code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '编号',
- `createTime` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
+ `createTime` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '添加时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '拒单记录' ROW_FORMAT = COMPACT;
@@ -2432,8 +2432,8 @@
`newDriverId` int(11) NULL DEFAULT NULL COMMENT '新司机id',
`cause` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '转单原因',
`status` int(1) NULL DEFAULT NULL COMMENT '状态（1=正常，2=冻结，3=删除）',
- `successTime` datetime NULL DEFAULT NULL COMMENT '转单成功时间',
- `createTime` datetime NULL DEFAULT NULL COMMENT '添加时间',
+ `successTime` datetime(0) NULL DEFAULT NULL COMMENT '转单成功时间',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '添加时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '订单转派记录' ROW_FORMAT = COMPACT;
@@ -2453,10 +2453,10 @@
`code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流水号',
`amount` decimal(10, 2) NULL DEFAULT NULL COMMENT '充值金额',
`payType` int(1) NULL DEFAULT NULL COMMENT '支付方式（1=微信，2=系统充值）',
- `payTime` datetime NULL DEFAULT NULL COMMENT '完成支付时间',
+ `payTime` datetime(0) NULL DEFAULT NULL COMMENT '完成支付时间',
`payStatus` int(1) NULL DEFAULT NULL COMMENT '支付状态（1=待支付，2=已完成）',
`orderNumber` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '第三方流水号',
- `createTime` datetime NULL DEFAULT NULL COMMENT '添加时间',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '添加时间',
`agentId` int(11) NULL DEFAULT NULL COMMENT '代理商ID',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '充值记录' ROW_FORMAT = COMPACT;
@@ -6033,7 +6033,7 @@
`orderId` int(11) NULL DEFAULT NULL COMMENT '订单id',
`amount` decimal(10, 2) NULL DEFAULT NULL COMMENT '收入金额',
`balance` decimal(10, 2) NULL DEFAULT NULL COMMENT '余额',
- `createTime` datetime NULL DEFAULT NULL COMMENT '添加时间',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '添加时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '收入记录' ROW_FORMAT = COMPACT;
@@ -6054,7 +6054,7 @@
`content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT '内容',
`state` int(1) NULL DEFAULT NULL COMMENT '是否发送 1未发送 2已发送',
`status` int(1) NULL DEFAULT NULL COMMENT '状态（1=正常，2=冻结，3=删除）',
- `createTime` datetime NULL DEFAULT NULL COMMENT '添加时间',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '添加时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '系统公告' ROW_FORMAT = COMPACT;
@@ -6076,7 +6076,7 @@
`userId` int(11) NULL DEFAULT NULL COMMENT '用户id',
`isRead` int(1) NULL DEFAULT NULL COMMENT '阅读（0=否，1=是）',
`status` int(1) NULL DEFAULT NULL COMMENT '状态（1=正常，2=冻结，3=删除）',
- `createTime` datetime NULL DEFAULT NULL COMMENT '添加时间',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '添加时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '系统公告-用户关系' ROW_FORMAT = COMPACT;
@@ -6122,7 +6122,7 @@
`content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT '内容',
`isRead` int(1) NULL DEFAULT NULL COMMENT '阅读状态（0=否，1=是）',
`status` int(1) NULL DEFAULT NULL COMMENT '状态（1=正常，2=冻结，3=删除）',
- `createTime` datetime NULL DEFAULT NULL COMMENT '添加时间',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '添加时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 9 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '系统消息' ROW_FORMAT = COMPACT;
@@ -6139,6 +6139,21 @@
INSERT INTO `t_system_message` VALUES (8, 2, 13, '接单成功', '您已成功接到用户订单，请尽快联系客户！', 1, 1, '2023-03-22 15:12:26');
-- ----------------------------
+-- Table structure for t_systen_config
+-- ----------------------------
+DROP TABLE IF EXISTS `t_systen_config`;
+CREATE TABLE `t_systen_config` (
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `type` int(1) NULL DEFAULT NULL COMMENT '类型（1=派单规则，2=佣金分成规则，3=抽成规则，4=积分规则，5=价格规则，6=余额规则，7=客服管理）',
+ `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT '内容',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '系统配置' ROW_FORMAT = COMPACT;
+
+-- ----------------------------
+-- Records of t_systen_config
+-- ----------------------------
+
+-- ----------------------------
-- Table structure for t_user_tag
-- ----------------------------
DROP TABLE IF EXISTS `t_user_tag`;
@@ -6147,7 +6162,7 @@
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '标签名',
`content` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '达标条件',
`status` int(1) NULL DEFAULT NULL COMMENT '状态（1=正常，2=冻结，3=删除）',
- `createTime` datetime NULL DEFAULT NULL COMMENT '添加时间',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '添加时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '用户标签' ROW_FORMAT = COMPACT;
@@ -6166,11 +6181,11 @@
`couponTotal` int(11) NULL DEFAULT NULL COMMENT '领取总数量',
`validCount` int(11) NULL DEFAULT NULL COMMENT '有效数量',
`expireCount` int(11) NULL DEFAULT 0 COMMENT '过期数量',
- `expireTime` datetime NULL DEFAULT NULL COMMENT '过期时间',
- `createTime` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间-领取时间',
+ `expireTime` datetime(0) NULL DEFAULT NULL COMMENT '过期时间',
+ `createTime` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间-领取时间',
`status` int(1) NULL DEFAULT 1 COMMENT '状态 1正常 2冻结 3删除',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '用户优惠券中间表' ROW_FORMAT = Compact;
+) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '用户优惠券中间表' ROW_FORMAT = COMPACT;
-- ----------------------------
-- Records of t_user_to_coupon
@@ -9439,7 +9454,7 @@
`effectiveTime` int(11) NULL DEFAULT NULL COMMENT '有效天数',
`content` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '服务内容',
`status` int(1) NULL DEFAULT 1 COMMENT '状态（1=正常，2=冻结，3=删除）',
- `createTime` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
+ `createTime` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '添加时间',
`distance` double(11, 2) NULL DEFAULT NULL COMMENT '优推距离',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '优推' ROW_FORMAT = COMPACT;
@@ -9462,10 +9477,10 @@
`integral` int(11) NULL DEFAULT NULL COMMENT '积分',
`type` int(1) NULL DEFAULT NULL COMMENT '优推类型（1=次数，2=小时）',
`surplusQuantity` int(11) NULL DEFAULT NULL COMMENT '剩余数量',
- `endTime` datetime NULL DEFAULT NULL COMMENT '优推结束时间',
+ `endTime` datetime(0) NULL DEFAULT NULL COMMENT '优推结束时间',
`state` int(1) NULL DEFAULT NULL COMMENT '状态（1=未使用，2=使用中，3=已结束）',
- `failureTime` datetime NULL DEFAULT NULL COMMENT '失效时间',
- `createTime` datetime NULL DEFAULT NULL COMMENT '添加时间',
+ `failureTime` datetime(0) NULL DEFAULT NULL COMMENT '失效时间',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '添加时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '司机优推数据' ROW_FORMAT = COMPACT;
--
Gitblit v1.7.1