修改实体

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserDetail.java

@@ -32,4 +32,7 @@ public class AppUserDetail {
 	private Long updatetime;
 	private Integer isdel;
 
+	@Column(name = "rent_free_days")
+	private Integer rentFreeDays;
+
 }

ace-modules/ace-generator/src/main/resources/application.yml

@@ -10,7 +10,7 @@ spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.jdbc.Driver
-        url: jdbc:mysql://10.5.52.3:3306/ag_admin_v1?useUnicode=true&characterEncoding=UTF-8
+        url: jdbc:mysql://10.5.52.3:3306/xxfc_order?useUnicode=true&characterEncoding=UTF-8
         username: root
         password: sslcloud123*()
     jackson:

ace-modules/ace-generator/src/main/resources/generator.properties

 #代码生成器，配置信息
 
 #包名
-package=package com.github.wxiaoqi.security.admin
+package=com.xxfc.platform.order
 #作者
 author=zjw
 #Email

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/OrderTypeEnum.java

@@ -6,6 +6,7 @@ import java.util.Map;
 public enum OrderTypeEnum {
     RentVehicle(1, "租车订单"),
     TOUR(2, "旅游订单"),
+    MEMBER(3, "会员订单"),
     ;
     /**
      * 编码

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java

@@ -188,6 +188,11 @@ public class BaseOrder implements Serializable {
     @Column(name = "refund_time")
 	@ApiModelProperty(value = "退款时间")
     private Long refundTime;
-	
 
+	/**
+	 *  是否有优惠
+	 */
+	@Column(name = "has_discount")
+	@ApiModelProperty(value = "是否有优惠")
+	private Long hasDiscount;
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderRentVehicleDetail.java

@@ -251,6 +251,11 @@ public class OrderRentVehicleDetail implements Serializable {
     @Column(name = "collect_time")
 	@ApiModelProperty(value = "收车时间")
     private Long collectTime;
-	
 
+	/**
+	 *  免费天数
+	 */
+	@Column(name = "free_days")
+	@ApiModelProperty(value = "免费天数")
+	private Long freeDays;
 }