Skip to content

C
cloud-platform
Commit a6f9ce85 authored by hezhen's avatar hezhen
Browse files
Options

Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw

parents 8d244a69 5c02cfd4
Hide whitespace changes
Inline Side-by-side
Showing with 289 additions and 1 deletion
ace-modules/ace-generator/src/main/resources/application.yml
View file @ a6f9ce85
......@@ -11,7 +11,8 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.jdbc.Driver
#url: jdbc:mysql://10.5.52.3:3306/xxfc_vehicle?useUnicode=true&characterEncoding=UTF-8
url: jdbc:mysql://10.5.52.3:3306/tiande_order?useUnicode=true&characterEncoding=UTF-8
#url: jdbc:mysql://10.5.52.3:3306/tiande_order?useUnicode=true&characterEncoding=UTF-8
url: jdbc:mysql://10.5.52.4:3307/chw_order?useUnicode=true&characterEncoding=UTF-8
username: root
password: sslcloud123*()
jackson:
......
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/SpecialRent.java 0 → 100755
View file @ a6f9ce85
package com.xxfc.platform.order.entity;
import java.io.Serializable;
import java.util.Date;
import javax.persistence.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 特惠租车
*
* @author libin
* @email 18178966185@163.com
* @date 2020-10-31 11:02:42
*/
@Data
@Table(name = "special_rent")
public class SpecialRent implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@Id
@GeneratedValue(generator = "JDBC")
@ApiModelProperty("主键")
private Integer id;
/**
* 状态
0--删除
1--创建
2--取消
3--等待下单
4--下单成功
*/
@Column(name = "status")
@ApiModelProperty(value = "状态 0--删除 1--创建 2--取消 3--等待下单 4--下单成功")
private Integer status;
/**
* 创建时间
*/
@Column(name = "crt_time")
@ApiModelProperty(value = "创建时间", hidden = true )
private Date crtTime;
/**
* 创建者id
*/
@Column(name = "crt_user")
@ApiModelProperty(value = "创建者id")
private String crtUser;
/**
* 用户id
*/
@Column(name = "join_user_id")
@ApiModelProperty(value = "用户id")
private Integer joinUserId;
/**
* 更新者id
*/
@Column(name = "upd_user")
@ApiModelProperty(value = "更新者id")
private String updUser;
/**
* 更新时间
*/
@Column(name = "upd_time")
@ApiModelProperty(value = "更新时间", hidden = true )
private Date updTime;
/**
* 开始公司id
*/
@Column(name = "start_company_id")
@ApiModelProperty(value = "开始公司id")
private Integer startCompanyId;
/**
* 结束公司id
*/
@Column(name = "end_company_id")
@ApiModelProperty(value = "结束公司id")
private Integer endCompanyId;
/**
* 车辆id
*/
@Column(name = "vehicle_id")
@ApiModelProperty(value = "车辆id")
private String vehicleId;
/**
* 开始时间
*/
@Column(name = "start_time")
@ApiModelProperty(value = "开始时间")
private Long startTime;
/**
* 结束时间
*/
@Column(name = "end_time")
@ApiModelProperty(value = "结束时间")
private Long endTime;
/**
* 订单id
*/
@Column(name = "order_id")
@ApiModelProperty(value = "订单id")
private Integer orderId;
/**
* 订单编号
*/
@Column(name = "order_no")
@ApiModelProperty(value = "订单编号")
private String orderNo;
/**
* 开始公司名称
*/
@Column(name = "start_company_name")
@ApiModelProperty(value = "开始公司名称")
private String startCompanyName;
/**
* 结束公司名称
*/
@Column(name = "end_company_name")
@ApiModelProperty(value = "结束公司名称")
private String endCompanyName;
/**
* 开始城市编码
*/
@Column(name = "start_city_code")
@ApiModelProperty(value = "开始城市编码")
private Integer startCityCode;
/**
* 结束城市编码
*/
@Column(name = "end_city_code")
@ApiModelProperty(value = "结束城市编码")
private Integer endCityCode;
/**
* 发布的后台用户id
*/
@Column(name = "publish_user_id")
@ApiModelProperty(value = "发布的后台用户id")
private Integer publishUserId;
/**
* 发布的公司（门店）id
*/
@Column(name = "publish_company_id")
@ApiModelProperty(value = "发布的公司（门店）id")
private Integer publishCompanyId;
/**
* 预约记录id
*/
@Column(name = "book_record_id")
@ApiModelProperty(value = "预约记录id")
private Long bookRecordId;
/**
* 状态 1--待支付 2--已支付 3--已取消
*/
@Column(name = "order_status")
@ApiModelProperty(value = "状态 1--待支付 2--已支付 3--已取消")
private Integer orderStatus;
/**
* 品牌id
*/
@Column(name = "brand_id")
@ApiModelProperty(value = "品牌id")
private Integer brandId;
/**
* 型号id
*/
@Column(name = "category_id")
@ApiModelProperty(value = "型号id")
private Integer categoryId;
/**
* 商品类型 1--房车；2--机车；3--游艇
*/
@Column(name = "goods_type")
@ApiModelProperty(value = "商品类型 1--房车；2--机车；3--游艇")
private Integer goodsType;
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/SpecialRentBiz.java 0 → 100755
View file @ a6f9ce85
package com.xxfc.platform.order.biz;
import org.springframework.stereotype.Service;
import com.xxfc.platform.order.entity.SpecialRent;
import com.xxfc.platform.order.mapper.SpecialRentMapper;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
/**
* 特惠租车
*
* @author libin
* @email 18178966185@163.com
* @date 2020-10-31 11:02:42
*/
@Service
public class SpecialRentBiz extends BaseBiz<SpecialRentMapper, SpecialRent> {
}
\ No newline at end of file
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/SpecialRentMapper.java 0 → 100755
View file @ a6f9ce85
package com.xxfc.platform.order.mapper;
import com.xxfc.platform.order.entity.SpecialRent;
import tk.mybatis.mapper.common.Mapper;
/**
* 特惠租车
*
* @author libin
* @email 18178966185@163.com
* @date 2020-10-31 11:02:42
*/
public interface SpecialRentMapper extends Mapper<SpecialRent> {
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/SpecialRentController.java 0 → 100755
View file @ a6f9ce85
package com.xxfc.platform.order.rest;
import com.github.wxiaoqi.security.common.rest.BaseController;
import com.xxfc.platform.order.biz.SpecialRentBiz;
import com.xxfc.platform.order.entity.SpecialRent;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("specialRent")
public class SpecialRentController extends BaseController<SpecialRentBiz, SpecialRent> {
}
\ No newline at end of file
xx-order/xx-order-server/src/main/resources/mapper/SpecialRentMapper.xml 0 → 100755
View file @ a6f9ce85
<?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.xxfc.platform.order.mapper.SpecialRentMapper">
<!-- 可根据自己的需求，是否要使用 -->
<resultMap type="com.xxfc.platform.order.entity.SpecialRent" id="specialRentMap">
<result property="id" column="id"/>
<result property="status" column="status"/>
<result property="crtTime" column="crt_time"/>
<result property="crtUser" column="crt_user"/>
<result property="joinUserId" column="join_user_id"/>
<result property="updUser" column="upd_user"/>
<result property="updTime" column="upd_time"/>
<result property="startCompanyId" column="start_company_id"/>
<result property="endCompanyId" column="end_company_id"/>
<result property="vehicleId" column="vehicle_id"/>
<result property="startTime" column="start_time"/>
<result property="endTime" column="end_time"/>
<result property="orderId" column="order_id"/>
<result property="orderNo" column="order_no"/>
<result property="startCompanyName" column="start_company_name"/>
<result property="endCompanyName" column="end_company_name"/>
<result property="startCityCode" column="start_city_code"/>
<result property="endCityCode" column="end_city_code"/>
<result property="publishUserId" column="publish_user_id"/>
<result property="publishCompanyId" column="publish_company_id"/>
<result property="bookRecordId" column="book_record_id"/>
<result property="orderStatus" column="order_status"/>
<result property="brandId" column="brand_id"/>
<result property="categoryId" column="category_id"/>
<result property="goodsType" column="goods_type"/>
</resultMap>
</mapper>
\ 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