Skip to content

C
cloud-platform
Commit 93302c81 authored by 周健威's avatar 周健威
Browse files
Options

修改实体

parent 994d032c
Show whitespace changes
Inline Side-by-side
Showing with 431 additions and 200 deletions
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java
View file @ 93302c81
......@@ -13,83 +13,105 @@ import lombok.Data;
*
* @author zjw
* @email nishijjo@qq.com
* @date 2019-05-24 21:56:10
* @date 2019-06-15 11:35:33
*/
@Table(name = "base_order")
@Data
@Table(name = "base_order")
public class BaseOrder implements Serializable {
private static final long serialVersionUID = 1L;
//主键
/**
* 主键
*/
@Id
@GeneratedValue(generator = "JDBC")
@ApiModelProperty("主键")
private Integer id;
//订单号
/**
* 订单号
*/
@Column(name = "no")
@ApiModelProperty(value = "订单号")
private String no;
//订单类型 1--租车；2--旅游
/**
* 名称
*/
@Column(name = "name")
@ApiModelProperty(value = "名称")
private String name;
/**
* 订单类型 1--租车；2--旅游
*/
@Column(name = "type")
@ApiModelProperty(value = "订单类型 1--租车；2--旅游")
private Integer type;
//订单详情id
/**
* 订单详情id
*/
@Column(name = "detail_id")
@ApiModelProperty(value = "订单详情id")
private Integer detailId;
//订单状态
/**
* 订单状态
0--删除
1--创建订单
2--取消
3--待付款
4--待出行
5--出行中（进行中）
6--已完成
*/
@Column(name = "status")
@ApiModelProperty(value = "订单状态\n" +
"0--删除\n" +
"1--创建订单\n" +
"2--取消\n" +
"3--待付款\n" +
"4--待出行\n" +
"5--出行中（进行中）\n" +
"6--已完成")
@ApiModelProperty(value = "订单状态"
+"0--删除"
+"1--创建订单"
+"2--取消"
+"3--待付款"
+"4--待出行"
+"5--出行中（进行中）"
+"6--已完成")
private Integer status;
//商品价格
/**
* 商品价格
*/
@Column(name = "goods_amount")
@ApiModelProperty(value = "商品价格")
private BigDecimal goodsAmount;
//实际价格
/**
* 订单价格
*/
@Column(name = "order_amount")
@ApiModelProperty(value = "订单价格")
private BigDecimal orderAmount;
//实际价格
/**
* 实际价格
*/
@Column(name = "real_amount")
@ApiModelProperty(value = "实际价格")
private BigDecimal realAmount;
//详情json信息
@Column(name = "detail_json")
@ApiModelProperty(value = "详情json信息")
private String detailJson;
//第三方类型（支付渠道）
/**
* 第三方类型（支付渠道）
*/
@Column(name = "third_type")
@ApiModelProperty(value = "第三方类型（支付渠道）")
private Integer thirdType;
//流水号
/**
* 流水号
*/
@Column(name = "out_trade_no")
@ApiModelProperty(value = "流水号")
private String outTradeNo;
/**
* 用户id
*/
@Column(name = "user_id")
@ApiModelProperty(value = "用户id")
private Integer userId;
/**
* 订单图片
*/
......@@ -98,56 +120,74 @@ public class BaseOrder implements Serializable {
private String picture;
/**
* 订单图片
*/
@Column(name = "name")
@ApiModelProperty(value = "名称")
private String name;
/**
* 取消原因
* 创建时间
*/
@Column(name = "cancel_reason")
@ApiModelProperty(value = "取消原因")
private String cancelReason;
//创建时间
@Column(name = "crt_time")
@ApiModelProperty(value = "创建时间", hidden = true )
private Date crtTime;
//创建者id
/**
* 创建者id
*/
@Column(name = "crt_user")
@ApiModelProperty(value = "创建者id")
private String crtUser;
//创建者名称
/**
* 创建者名称
*/
@Column(name = "crt_name")
@ApiModelProperty(value = "创建者名称")
private String crtName;
//创建者ip
@Column(name = "crt_host")
@ApiModelProperty(value = "创建者ip")
private String crtHost;
/**
* 用户id
*/
@Column(name = "user_id")
@ApiModelProperty(value = "用户id")
private Integer userId;
//更新时间
/**
* 更新时间
*/
@Column(name = "upd_time")
@ApiModelProperty(value = "更新时间", hidden = true )
private Date updTime;
//更新者id
@Column(name = "upd_user")
@ApiModelProperty(value = "更新者id")
private String updUser;
/**
* 创建者ip
*/
@Column(name = "crt_host")
@ApiModelProperty(value = "创建者ip")
private String crtHost;
/**
* 取消原因
*/
@Column(name = "cancel_reason")
@ApiModelProperty(value = "取消原因")
private String cancelReason;
/**
* 退款流水号
*/
@Column(name = "refund_trade_no")
@ApiModelProperty(value = "退款流水号")
private String refundTradeNo;
/**
* 支付时间
*/
@Column(name = "pay_time")
@ApiModelProperty(value = "支付时间")
private Long payTime;
/**
* 退款时间
*/
@Column(name = "refund_time")
@ApiModelProperty(value = "退款时间")
private Long refundTime;
//更新者名称
@Column(name = "upd_name")
@ApiModelProperty(value = "更新者名称")
private String updName;
//更新者ip
@Column(name = "upd_host")
@ApiModelProperty(value = "更新者ip")
private String updHost;
}
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderRentVehicleDetail.java
View file @ 93302c81
package com.xxfc.platform.order.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import javax.persistence.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -11,135 +13,244 @@ import lombok.Data;
*
* @author zjw
* @email nishijjo@qq.com
* @date 2019-05-27 15:13:55
* @date 2019-06-15 14:18:42
*/
@Data
@Table(name = "order_rent_vehicle_detail")
public class OrderRentVehicleDetail implements Serializable{
public class OrderRentVehicleDetail implements Serializable {
private static final long serialVersionUID = 1L;
//主键
/**
* 主键
*/
@Id
@GeneratedValue(generator = "JDBC")
@ApiModelProperty("主键")
private Integer id;
//基础订单id
/**
* 基础订单id
*/
@Column(name = "order_id")
@ApiModelProperty(value = "基础订单id")
private Integer orderId;
//基础订单id
/**
* 名称
*/
@Column(name = "name")
@ApiModelProperty(value = "名称")
private String name;
//创建时间
/**
* 创建时间
*/
@Column(name = "crt_time")
@ApiModelProperty(value = "创建时间", hidden = true )
private Long crtTime;
//更新时间
/**
* 更新时间
*/
@Column(name = "upd_time")
@ApiModelProperty(value = "更新时间", hidden = true )
private Long updTime;
//开始时间
/**
* 开始时间
*/
@Column(name = "start_time")
@ApiModelProperty(value = "开始时间")
private Long startTime;
//结束时间
/**
* 结束时间
*/
@Column(name = "end_time")
@ApiModelProperty(value = "结束时间")
private Long endTime;
//天数
/**
* 天数
*/
@Column(name = "day_num")
@ApiModelProperty(value = "天数")
private Integer dayNum;
//取车地点
/**
* 取车地点
*/
@Column(name = "start_addr")
@ApiModelProperty(value = "取车地点")
private String startAddr;
//还车地点
/**
* 还车地点
*/
@Column(name = "end_addr")
@ApiModelProperty(value = "还车地点")
private String endAddr;
//车辆id
/**
* 车辆id
*/
@Column(name = "vehicle_id")
@ApiModelProperty(value = "车辆id")
private String vehicleId;
//费用详情
@Column(name = "cost_detail")
@ApiModelProperty(value = "费用详情")
private String costDetail;
//取车城市编号
/**
* 取车城市编号
*/
@Column(name = "start_city")
@ApiModelProperty(value = "取车城市编号")
private Integer startCity;
//还车城市编号
/**
* 还车城市编号
*/
@Column(name = "end_city")
@ApiModelProperty(value = "还车城市编号")
private Integer endCity;
//取车城市名称
/**
* 取车城市名称
*/
@Column(name = "start_city_name")
@ApiModelProperty(value = "取车城市名称")
private String startCityName;
//还车城市名称
/**
* 还车城市名称
*/
@Column(name = "end_city_name")
@ApiModelProperty(value = "还车城市名称")
private String endCityName;
//司机类型 1--公司司机；2--自己司机
/**
* 司机类型 1--公司司机；2--自己司机
*/
@Column(name = "driver_type")
@ApiModelProperty(value = "司机类型 1--公司司机；2--自己司机")
private Integer driverType;
//自己司机ids
/**
* 自己司机ids
*/
@Column(name = "my_driver_ids")
@ApiModelProperty(value = "自己司机ids")
private String myDriverIds;
//出发公司Id
/**
* 出发公司Id
*/
@Column(name = "start_company_id")
@ApiModelProperty(value = "出发公司Id")
private Integer startCompanyId;
//结束公司Id
/**
* 结束公司Id
*/
@Column(name = "end_company_id")
@ApiModelProperty(value = "结束公司Id")
private Integer endCompanyId;
//车型id
/**
* 车型id
*/
@Column(name = "model_id")
@ApiModelProperty(value = "车型id")
private Integer modelId;
//评分
/**
* 评分人
*/
@Column(name = "s_userid")
@ApiModelProperty(value = "评分人")
private Integer sUserid;
/**
* 评分
*/
@Column(name = "score")
@ApiModelProperty(value = "评分")
private Integer score;
//评分人
@Column(name = "s_userid")
@ApiModelProperty(value = "评分人")
private Integer sUserid;
/**
* 费用明细
*/
@Column(name = "cost_detail")
@ApiModelProperty(value = "费用明细")
private String costDetail;
//评分时间
/**
* 押金
*/
@Column(name = "deposit")
@ApiModelProperty(value = "押金")
private BigDecimal deposit;
/**
* 评分时间
*/
@Column(name = "s_time")
@ApiModelProperty(value = "评分时间")
private Long sTime;
@Column(name = "deposit")
@ApiModelProperty(value = "押金")
private Long deposit;
/**
* 交付人id
*/
@Column(name = "delivery_user")
@ApiModelProperty(value = "交付人id")
private Integer deliveryUser;
/**
* 交付人名称
*/
@Column(name = "delivery_name")
@ApiModelProperty(value = "交付人名称")
private String deliveryName;
/**
* 交付人手机号
*/
@Column(name = "delivery_phone")
@ApiModelProperty(value = "交付人手机号")
private String deliveryPhone;
/**
* 交车时间
*/
@Column(name = "delivery_time")
@ApiModelProperty(value = "交车时间")
private Long deliveryTime;
/**
* 收车人id
*/
@Column(name = "collect_user")
@ApiModelProperty(value = "收车人id")
private Integer collectUser;
/**
* 收车人名称
*/
@Column(name = "collect_name")
@ApiModelProperty(value = "收车人名称")
private String collectName;
/**
* 收车人手机号
*/
@Column(name = "collect_phone")
@ApiModelProperty(value = "收车人手机号")
private String collectPhone;
/**
* 收车时间
*/
@Column(name = "collect_time")
@ApiModelProperty(value = "收车时间")
private Long collectTime;
}
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderTourDetail.java
View file @ 93302c81
......@@ -12,136 +12,216 @@ import lombok.Data;
*
* @author zjw
* @email nishijjo@qq.com
* @date 2019-06-10 10:36:31
* @date 2019-06-15 14:18:42
*/
@Data
@Table(name = "order_tour_detail")
public class OrderTourDetail implements Serializable {
private static final long serialVersionUID = 1L;
//主键
/**
* 主键
*/
@Id
@GeneratedValue(generator = "JDBC")
@ApiModelProperty("主键")
private Integer id;
//基础订单id
/**
* 基础订单id
*/
@Column(name = "order_id")
@ApiModelProperty(value = "基础订单id")
private Integer orderId;
//名称
/**
* 名称
*/
@Column(name = "name")
@ApiModelProperty(value = "名称")
private String name;
//创建时间
/**
* 创建时间
*/
@Column(name = "crt_time")
@ApiModelProperty(value = "创建时间", hidden = true )
private Long crtTime;
//更新时间
/**
* 更新时间
*/
@Column(name = "upd_time")
@ApiModelProperty(value = "更新时间", hidden = true )
private Long updTime;
//开始时间
/**
* 开始时间
*/
@Column(name = "start_time")
@ApiModelProperty(value = "开始时间")
private Long startTime;
//结束时间
/**
* 结束时间
*/
@Column(name = "end_time")
@ApiModelProperty(value = "结束时间")
private Long endTime;
//天数
/**
* 天数
*/
@Column(name = "day_num")
@ApiModelProperty(value = "天数")
private Integer dayNum;
//出发地点
/**
* 出发地点
*/
@Column(name = "start_addr")
@ApiModelProperty(value = "出发地点")
private String startAddr;
//还车地点
/**
* 还车地点
*/
@Column(name = "end_addr")
@ApiModelProperty(value = "还车地点")
private String endAddr;
//出游乘客ids
/**
* 出游乘客ids
*/
@Column(name = "tour_user_ids")
@ApiModelProperty(value = "出游乘客ids")
private String tourUserIds;
//出发公司Id
/**
* 成人人数
*/
@Column(name = "adult_num")
@ApiModelProperty(value = "成人人数")
private Integer adultNum;
/**
* 儿童人数
*/
@Column(name = "child_num")
@ApiModelProperty(value = "儿童人数")
private Integer childNum;
/**
* 出发公司Id
*/
@Column(name = "start_company_id")
@ApiModelProperty(value = "出发公司Id")
private Integer startCompanyId;
//费用明细
/**
* 费用明细
*/
@Column(name = "cost_detail")
@ApiModelProperty(value = "费用明细")
private String costDetail;
//商品id
/**
* 商品id
*/
@Column(name = "good_id")
@ApiModelProperty(value = "商品id")
private Integer goodId;
//规格ids
/**
* 总人数
*/
@Column(name = "total_number")
@ApiModelProperty(value = "总人数")
private Integer totalNumber;
/**
* 规格ids
*/
@Column(name = "spe_ids")
@ApiModelProperty(value = "规格ids")
private String speIds;
//具体商品（商品项）id
/**
* 具体商品（商品项）id
*/
@Column(name = "spe_price_id")
@ApiModelProperty(value = "具体商品（商品项）id")
private Integer spePriceId;
@Column(name = "verification_id")
@ApiModelProperty(value = "核销id")
private Integer verificationId;
//联系人
/**
* 联系人
*/
@Column(name = "contact_man")
@ApiModelProperty(value = "联系人")
private String contactMan;
//联系电话
/**
* 联系电话
*/
@Column(name = "contact_phone")
@ApiModelProperty(value = "联系电话")
private String contactPhone;
//联系邮箱
/**
* 联系邮箱
*/
@Column(name = "contact_email")
@ApiModelProperty(value = "联系邮箱")
private String contactEmail;
//总人数
@Column(name = "total_number")
@ApiModelProperty(value = "总人数")
private Integer totalNumber;
//成人人数
@Column(name = "adult_num")
@ApiModelProperty(value = "成人人数")
private Integer adultNum;
//儿童人数
@Column(name = "child_num")
@ApiModelProperty(value = "儿童人数")
private Integer childNum;
/**
* 出发城市名称
*/
@Column(name = "start_city_name")
@ApiModelProperty(value = "出发城市名称")
private String startCityName;
//出发城市编号
/**
* 出发城市编号
*/
@Column(name = "start_city")
@ApiModelProperty(value = "出发城市编号")
private Integer startCity;
//出发城市名称
@Column(name = "start_city_name")
@ApiModelProperty(value = "出发城市名称")
private String startCityName;
/**
* 核销id
*/
@Column(name = "verification_id")
@ApiModelProperty(value = "核销id")
private Integer verificationId;
/**
* 核销人
*/
@Column(name = "verification_user")
@ApiModelProperty(value = "核销人")
private Integer verificationUser;
/**
* 核销人名称
*/
@Column(name = "verification_name")
@ApiModelProperty(value = "核销人名称")
private String verificationName;
/**
* 核销人联系电话
*/
@Column(name = "verification_phone")
@ApiModelProperty(value = "核销人联系电话")
private Integer verificationPhone;
/**
* 核销时间
*/
@Column(name = "verification_time")
@ApiModelProperty(value = "核销时间")
private Long verificationTime;
}
xx-order/xx-order-server/pom.xml
View file @ 93302c81
......@@ -31,32 +31,32 @@
<build>
<!-- <finalName>xx-order-server</finalName>-->
<plugins>
<!-- &lt;!&ndash; 此插件用来生成通用mapper的代码 &ndash;&gt;-->
<!-- <plugin>-->
<!-- <groupId>org.mybatis.generator</groupId>-->
<!-- <artifactId>mybatis-generator-maven-plugin</artifactId>-->
<!-- <version>1.3.2</version>-->
<!-- <configuration>-->
<!-- <configurationFile>-->
<!-- ${basedir}/src/main/resources/builder/generatorConfig.xml-->
<!-- </configurationFile>-->
<!-- <overwrite>true</overwrite>-->
<!-- <verbose>true</verbose>-->
<!-- </configuration>-->
<!-- <dependencies>-->
<!-- <dependency>-->
<!-- <groupId>mysql</groupId>-->
<!-- <artifactId>mysql-connector-java</artifactId>-->
<!-- <version>5.1.30</version>-->
<!-- <scope>runtime</scope>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>tk.mybatis</groupId>-->
<!-- <artifactId>mapper</artifactId>-->
<!-- <version>${mapper.version}</version>-->
<!-- </dependency>-->
<!-- </dependencies>-->
<!-- </plugin>-->
<!-- 此插件用来生成通用mapper的代码 -->
<plugin>
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-maven-plugin</artifactId>
<version>1.3.2</version>
<configuration>
<configurationFile>
${basedir}/src/main/resources/builder/generatorConfig.xml
</configurationFile>
<overwrite>true</overwrite>
<verbose>true</verbose>
</configuration>
<dependencies>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.30</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>tk.mybatis</groupId>
<artifactId>mapper</artifactId>
<version>${mapper.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
......
xx-order/xx-order-server/src/main/resources/builder/generatorConfig.xml
View file @ 93302c81
......@@ -15,9 +15,9 @@
</plugin>
<jdbcConnection driverClass="com.mysql.jdbc.Driver"
connectionURL="jdbc:mysql://localhost:3306/vehicle?useUnicode=true&amp;characterEncoding=UTF8"
connectionURL="jdbc:mysql://10.5.52.3:3306/xxfc_order?useUnicode=true&amp;characterEncoding=UTF8"
userId="root"
password="xx2019fc">
password="sslcloud123*()">
</jdbcConnection>
<javaModelGenerator targetPackage="${targetModelPackage}" targetProject="${targetJavaProject}"/>
......@@ -37,7 +37,7 @@
<!-- </table>-->
<!-- <table tableName="branch_company_stock_info" domainObjectName="BranchCompanyStockInfo"></table>-->
<!-- <table tableName="branch_company_stock_apply_info" domainObjectName="BranchCompanyStockApplyInfo"></table>-->
<table tableName="vehicle_upkeep_item" domainObjectName="VehicleUpkeepItem"></table>
<table tableName="vehicle_upkeep_log" domainObjectName="VehicleUpkeepLog"></table>
<table tableName="base_order" domainObjectName="baseOrder"></table>
<!-- <table tableName="vehicle_upkeep_log" domainObjectName="VehicleUpkeepLog"></table>-->
</context>
</generatorConfiguration>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment