Skip to content

C
clx-performance
提交 ca3632c8 authored 作者: aiqingguo's avatar aiqingguo
浏览文件
操作

承运同步

上级 cad96749
隐藏空白字符变更
内嵌 并排
正在显示 包含 123 行增加 和 138 行删除
performance-api/src/main/java/com/clx/performance/param/feign/transport/OrderChildBankInfoDTO.java
浏览文件 @ ca3632c8
......@@ -12,35 +12,31 @@ import lombok.ToString;
@NoArgsConstructor
public class OrderChildBankInfoDTO {
@ApiModelProperty(value = "运单号", dataType="String")
private String childNo;
@ApiModelProperty(value = "用户钱包", dataType="Integer")
// @ApiModelProperty(value = "运单号", dataType="String", required = true)
// private String childNo;
@ApiModelProperty(value = "用户钱包", dataType="Integer", required = true)
private Integer userCode;
@ApiModelProperty(value = "持卡人姓名", dataType="String")
@ApiModelProperty(value = "持卡人姓名", dataType="String", required = true)
private String name;
@ApiModelProperty(value = "银行卡卡号", dataType="String")
@ApiModelProperty(value = "银行卡卡号", dataType="String", required = true)
private String cardNo;
@ApiModelProperty(value = "手机号", dataType="String")
@ApiModelProperty(value = "手机号", dataType="String", required = true)
private String mobile;
@ApiModelProperty(value = "账户类型 11个人 12企业账户", dataType="Integer")
@ApiModelProperty(value = "账户类型 11个人 12企业账户", dataType="Integer", required = true)
private Integer accountType;
@ApiModelProperty(value = "银行卡类型10借记卡20借贷卡", dataType="String")
@ApiModelProperty(value = "银行卡类型10借记卡20借贷卡", dataType="String", required = true)
private String type;
@ApiModelProperty(value = "是否允许提现: 允许提现1 ,禁止提现0", dataType="Integer")
@ApiModelProperty(value = "是否允许提现: 允许提现1 ,禁止提现0", dataType="Integer", required = true)
private Integer cashOut;
@ApiModelProperty(value = "身份证号", dataType="String")
@ApiModelProperty(value = "身份证号", dataType="String", required = true)
private String idCard;
@ApiModelProperty(value = "银行", dataType="String")
@ApiModelProperty(value = "银行", dataType="String", required = true)
private String bank;
@ApiModelProperty(value = "银行编码", dataType="String")
@ApiModelProperty(value = "银行编码", dataType="String", required = true)
private String bankCode;
@ApiModelProperty(value = "身份证正面图片")
@ApiModelProperty(value = "身份证正面图片", required = true)
private String idCardFrontImg;
@ApiModelProperty(value = "身份证背面图片")
@ApiModelProperty(value = "身份证背面图片", required = true)
private String idCardBackImg;
@ApiModelProperty(value = "创建时间", dataType="String")
private String createTime;
@ApiModelProperty(value = "修改时间", dataType="String")
private String modifiedTime;
}
performance-api/src/main/java/com/clx/performance/param/feign/transport/OrderChildDriverInfoDTO.java
浏览文件 @ ca3632c8
......@@ -12,65 +12,61 @@ import lombok.ToString;
@NoArgsConstructor
public class OrderChildDriverInfoDTO {
@ApiModelProperty(value = "运单号", dataType="String")
private String childNo;
@ApiModelProperty(value = "司机ID", dataType="Integer")
// @ApiModelProperty(value = "运单号", dataType="String", required = true)
// private String childNo;
@ApiModelProperty(value = "司机ID", dataType="Integer", required = true)
private Integer driverId;
@ApiModelProperty(value = "手机号", dataType="String")
@ApiModelProperty(value = "手机号", dataType="String", required = true)
private String mobile;
@ApiModelProperty(value = "姓名", dataType="String")
@ApiModelProperty(value = "姓名", dataType="String", required = true)
private String name;
@ApiModelProperty(value = "性别1男2女", dataType="Integer")
@ApiModelProperty(value = "性别1男2女", dataType="Integer", required = true)
private Integer sex;
@ApiModelProperty(value = "头像相对地址", dataType="String")
@ApiModelProperty(value = "头像相对地址", dataType="String", required = true)
private String headImg;
@ApiModelProperty(value = "钱包账号", dataType="String")
@ApiModelProperty(value = "钱包账号", dataType="String", required = true)
private String walletCode;
@ApiModelProperty(value = "身份证号", dataType="String")
@ApiModelProperty(value = "身份证号", dataType="String", required = true)
private String cardNo;
@ApiModelProperty(value = "身份证有效期起始时间", dataType="String")
@ApiModelProperty(value = "身份证有效期起始时间", dataType="String", required = true)
private String cardStartTime;
@ApiModelProperty(value = "身份证有效期终止时间", dataType="String")
private String cardEndTime;
@ApiModelProperty(value = "是否是长期 0-非长期 1-长期", dataType="Integer")
@ApiModelProperty(value = "是否是长期 0-非长期 1-长期", dataType="Integer", required = true)
private Integer cardLongTerm;
@ApiModelProperty(value = "身份证正面图片地址", dataType="String")
@ApiModelProperty(value = "身份证正面图片地址", dataType="String", required = true)
private String cardFrontImg;
@ApiModelProperty(value = "身份证背面图片地址", dataType="String")
@ApiModelProperty(value = "身份证背面图片地址", dataType="String", required = true)
private String cardBackImg;
@ApiModelProperty(value = "手持身份证照片地址", dataType="String")
@ApiModelProperty(value = "手持身份证照片地址", dataType="String", required = true)
private String faceCardImg;
@ApiModelProperty(value = "驾驶证号码", dataType="String")
@ApiModelProperty(value = "驾驶证号码", dataType="String", required = true)
private String licenceNo;
@ApiModelProperty(value = "初次领证日期", dataType="String")
@ApiModelProperty(value = "初次领证日期", dataType="String", required = true)
private String licenseTime;
@ApiModelProperty(value = "驾照类型", dataType="String")
@ApiModelProperty(value = "驾照类型", dataType="String", required = true)
private String licenceClass;
@ApiModelProperty(value = "驾驶证正面图片", dataType="String")
@ApiModelProperty(value = "驾驶证正面图片", dataType="String", required = true)
private String licenceImg;
@ApiModelProperty(value = "驾驶证背面图片", dataType="String")
@ApiModelProperty(value = "驾驶证背面图片", dataType="String", required = true)
private String licenceBackImg;
@ApiModelProperty(value = "驾驶证有效期起始时间", dataType="String")
@ApiModelProperty(value = "驾驶证有效期起始时间", dataType="String", required = true)
private String licenceStartTime;
@ApiModelProperty(value = "驾驶证有效期终止时间", dataType="String")
@ApiModelProperty(value = "驾驶证有效期终止时间", dataType="String", required = true)
private String licenceEndTime;
@ApiModelProperty(value = "道路运输许可证图片地址", dataType="String")
@ApiModelProperty(value = "道路运输许可证图片地址", dataType="String", required = true)
private String transportLicenceImg;
@ApiModelProperty(value = "道路运输从业资格证号", dataType="String")
@ApiModelProperty(value = "道路运输从业资格证号", dataType="String", required = true)
private String occupationalLicenceNo;
@ApiModelProperty(value = "道路运输从业资格证图片地址", dataType="String")
@ApiModelProperty(value = "道路运输从业资格证图片地址", dataType="String", required = true)
private String occupationalLicenceImg;
@ApiModelProperty(value = "从业资格证有效期起始时间", dataType="String")
@ApiModelProperty(value = "从业资格证有效期起始时间", dataType="String", required = true)
private String occupationalStartTime;
@ApiModelProperty(value = "从业资格证有效期终止时间", dataType="String")
@ApiModelProperty(value = "从业资格证有效期终止时间", dataType="String", required = true)
private String occupationalEndTime;
@ApiModelProperty("驾驶证发证机关")
@ApiModelProperty(value = "驾驶证发证机关", required = true)
private String licenceIssueOrganization;
@ApiModelProperty("身份证住址")
@ApiModelProperty(value = "身份证住址", required = true)
private String idCardAddress;
@ApiModelProperty(value = "创建时间", dataType="String")
private String createTime;
@ApiModelProperty(value = "修改时间", dataType="String")
private String modifiedTime;
}
performance-api/src/main/java/com/clx/performance/param/feign/transport/OrderChildTruckInfoDTO.java
浏览文件 @ ca3632c8
......@@ -12,51 +12,47 @@ import lombok.ToString;
@NoArgsConstructor
public class OrderChildTruckInfoDTO {
@ApiModelProperty(value = "运单号", dataType="String")
private String childNo;
@ApiModelProperty(value = "车辆ID", dataType="Integer")
// @ApiModelProperty(value = "运单号", dataType="String", required = true)
// private String childNo;
@ApiModelProperty(value = "车辆ID", dataType="Integer", required = true)
private Integer truckId;
@ApiModelProperty(value = "车主id", dataType="Integer")
@ApiModelProperty(value = "车主id", dataType="Integer", required = true)
private Integer userId;
@ApiModelProperty(value = "车主手机号", dataType="String")
@ApiModelProperty(value = "车主手机号", dataType="String", required = true)
private String mobile;
@ApiModelProperty(value = "车牌号", dataType="String")
@ApiModelProperty(value = "车牌号", dataType="String", required = true)
private String truckNo;
@ApiModelProperty(value = "车头车牌颜色代码", dataType="Integer")
@ApiModelProperty(value = "车头车牌颜色代码", dataType="Integer", required = true)
private Integer truckNoColorCode;
@ApiModelProperty(value = "车头车牌颜色", dataType="String")
@ApiModelProperty(value = "车头车牌颜色", dataType="String", required = true)
private String truckNoColor;
@ApiModelProperty(value = "型号", dataType="String")
@ApiModelProperty(value = "型号", dataType="String", required = true)
private String model;
@ApiModelProperty(value = "载重单位吨", dataType="Integer")
@ApiModelProperty(value = "载重单位吨", dataType="Integer", required = true)
private Integer load;
@ApiModelProperty(value = "吨位 单位吨", dataType="Integer")
@ApiModelProperty(value = "吨位 单位吨", dataType="Integer", required = true)
private Integer grossMass;
@ApiModelProperty(value = "车头道路运输许可证编号", dataType="String")
@ApiModelProperty(value = "车头道路运输许可证编号", dataType="String", required = true)
private String roadTransportCertificateNo;
@ApiModelProperty(value = "行驶证主页照片", dataType="String")
@ApiModelProperty(value = "行驶证主页照片", dataType="String", required = true)
private String licenceImgMain;
@ApiModelProperty(value = "行驶证副业正面照片", dataType="String")
@ApiModelProperty(value = "行驶证副业正面照片", dataType="String", required = true)
private String licenceImgSecond;
@ApiModelProperty(value = "行驶证副业背面照片", dataType="String")
@ApiModelProperty(value = "行驶证副业背面照片", dataType="String", required = true)
private String licenceImgSecondBack;
@ApiModelProperty(value = "道路运输许可证图片地址", dataType="String")
@ApiModelProperty(value = "道路运输许可证图片地址", dataType="String", required = true)
private String transportLicenceImg;
@ApiModelProperty(value = "车辆燃料类型 1：柴油 2 天然气 3其他 4新能源/电", dataType="Integer")
@ApiModelProperty(value = "车辆燃料类型 1：柴油 2 天然气 3其他 4新能源/电", dataType="Integer", required = true)
private Integer powerType;
@ApiModelProperty("使用性质")
@ApiModelProperty(value = "使用性质", required = true)
private String useNature;
@ApiModelProperty("车辆识别代码")
@ApiModelProperty(value = "车辆识别代码", required = true)
private String identifyCode;
@ApiModelProperty("行驶证发证机关")
@ApiModelProperty(value = "行驶证发证机关", required = true)
private String licenceIssueOrganization;
@ApiModelProperty("注册日期")
@ApiModelProperty(value = "注册日期", required = true)
private String registerDate;
@ApiModelProperty("行驶证发证日期")
@ApiModelProperty(value = "行驶证发证日期", required = true)
private String licenceIssueDate;
@ApiModelProperty(value = "创建时间", dataType="String")
private String createTime;
@ApiModelProperty(value = "修改时间", dataType="String")
private String modifiedTime;
}
performance-api/src/main/java/com/clx/performance/param/feign/transport/OrderChildTruckTraceDTO.java
浏览文件 @ ca3632c8
package com.clx.performance.param.feign.transport;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
......@@ -14,19 +15,15 @@ import lombok.Setter;
@NoArgsConstructor
public class OrderChildTruckTraceDTO {
private Integer id;
/** 运单号 **/
private String childNo;
/** 定位时间 **/
// @ApiModelProperty(value = "运单号", required = true)
// private String childNo;
@ApiModelProperty(value = "定位时间", required = true)
private String locationTime;
/** 定位经度 **/
@ApiModelProperty(value = "定位经度", required = true)
private String locationLon;
/** 定位纬度 **/
@ApiModelProperty(value = "定位纬度", required = true)
private String locationLat;
/** 定位详细位置信息 **/
@ApiModelProperty(value = "定位详细位置信息", required = true)
private String locationAddress;
/** 创建时间 **/
private String createTime;
/** 修改时间 **/
private String modifiedTime;
}
performance-api/src/main/java/com/clx/performance/param/feign/transport/ThirdOrderChildBrokerParam.java
浏览文件 @ ca3632c8
......@@ -15,107 +15,107 @@ import java.util.List;
@NoArgsConstructor
public class ThirdOrderChildBrokerParam {
@ApiModelProperty(value = "订单编码", dataType="String")
@ApiModelProperty(value = "订单编码", dataType="String", required = true)
private String childNo;
@ApiModelProperty(value = "主单编码", dataType="String")
@ApiModelProperty(value = "主单编码", dataType="String", required = true)
private String orderNo;
@ApiModelProperty(value = "车牌号", dataType="String")
@ApiModelProperty(value = "车牌号", dataType="String", required = true)
private String truckNo;
@ApiModelProperty(value = "运费单价 单位分", dataType="Integer")
@ApiModelProperty(value = "运费单价 单位分", dataType="Integer", required = true)
private Integer freightPrice;
@ApiModelProperty(value = "运费 单位分", dataType="Integer")
@ApiModelProperty(value = "运费 单位分", dataType="Integer", required = true)
private Integer freight;
@ApiModelProperty(value = "实付运费 单位分", dataType="Integer")
@ApiModelProperty(value = "实付运费 单位分", dataType="Integer", required = true)
private Integer freightNoCard;
@ApiModelProperty(value = "溢价金额", dataType = "Integer")
@ApiModelProperty(value = "溢价金额", dataType = "Integer", required = true)
private Integer orderChildBrokerBeyondFreight;
@ApiModelProperty(value = "净重", dataType="BigDecimal")
@ApiModelProperty(value = "净重", dataType="BigDecimal", required = true)
private BigDecimal net;
@ApiModelProperty(value = "发货地址", dataType="String")
@ApiModelProperty(value = "发货地址", dataType="String", required = true)
private String sendAddress;
@ApiModelProperty(value = "货源所在省份", dataType="String")
@ApiModelProperty(value = "货源所在省份", dataType="String", required = true)
private String sendProvince;
@ApiModelProperty(value = "货源所在城市", dataType="String")
@ApiModelProperty(value = "货源所在城市", dataType="String", required = true)
private String sendCity;
@ApiModelProperty(value = "货源所在区县", dataType="String")
@ApiModelProperty(value = "货源所在区县", dataType="String", required = true)
private String sendCounty;
@ApiModelProperty(value = "货源所在乡镇", dataType="String")
@ApiModelProperty(value = "货源所在乡镇", dataType="String", required = true)
private String sendTown;
@ApiModelProperty(value = "发货人", dataType="String")
@ApiModelProperty(value = "发货人", dataType="String", required = true)
private String sendName;
@ApiModelProperty(value = "发货人手机号", dataType="String")
@ApiModelProperty(value = "发货人手机号", dataType="String", required = true)
private String sendMobile;
@ApiModelProperty(value = "收货人所在省", dataType="String")
@ApiModelProperty(value = "收货人所在省", dataType="String", required = true)
private String receiveProvince;
@ApiModelProperty(value = "收货人所在城市", dataType="String")
@ApiModelProperty(value = "收货人所在城市", dataType="String", required = true)
private String receiveCity;
@ApiModelProperty(value = "收货人所在区县", dataType="String")
@ApiModelProperty(value = "收货人所在区县", dataType="String", required = true)
private String receiveCounty;
@ApiModelProperty(value = "收货人所在乡镇", dataType="String")
@ApiModelProperty(value = "收货人所在乡镇", dataType="String", required = true)
private String receiveTown;
@ApiModelProperty(value = "收货地址", dataType="String")
@ApiModelProperty(value = "收货地址", dataType="String", required = true)
private String receiveAddress;
@ApiModelProperty(value = "收货人", dataType="String")
@ApiModelProperty(value = "收货人", dataType="String", required = true)
private String receiveName;
@ApiModelProperty(value = "收货人手机号", dataType="String")
@ApiModelProperty(value = "收货人手机号", dataType="String", required = true)
private String receiveMobile;
@ApiModelProperty(value = "装车地址经度")
@ApiModelProperty(value = "装车地址经度", required = true)
private String loadLongitude;
@ApiModelProperty(value = "装车地址纬度")
@ApiModelProperty(value = "装车地址纬度", required = true)
private String loadLatitude;
@ApiModelProperty(value = "卸车地址经度")
@ApiModelProperty(value = "卸车地址经度", required = true)
private String unloadLongitude;
@ApiModelProperty(value = "卸车地址纬度")
@ApiModelProperty(value = "卸车地址纬度", required = true)
private String unloadLatitude;
@ApiModelProperty(value = "运输距离（公里）")
@ApiModelProperty(value = "运输距离（公里）", required = true)
private BigDecimal distance;
@ApiModelProperty(value = "接单时间", dataType="String")
@ApiModelProperty(value = "接单时间", dataType="String", required = true)
private String payTime;
@ApiModelProperty(value = "装车时间", dataType="String")
@ApiModelProperty(value = "装车时间", dataType="String", required = true)
private String loadTime;
@ApiModelProperty(value = "卸车时间", dataType="String")
@ApiModelProperty(value = "卸车时间", dataType="String", required = true)
private String unloadTime;
@ApiModelProperty(value = "支付完成时间", dataType="String")
@ApiModelProperty(value = "支付完成时间", dataType="String", required = true)
private String payFinishedTime;
@ApiModelProperty(value = "备注", dataType="String")
private String remark;
@ApiModelProperty(value = "创建时间", dataType="String")
private String createTime;
@ApiModelProperty(value = "收货单位", dataType="String")
// @ApiModelProperty(value = "创建时间", dataType="String", required = true)
// private String createTime;
@ApiModelProperty(value = "收货单位", dataType="String", required = true)
private String receiveCompany;
@ApiModelProperty(value = "发货单位", dataType="String")
@ApiModelProperty(value = "发货单位", dataType="String", required = true)
private String sendCompany;
@ApiModelProperty(value = "收货净重", dataType="BigDecimal")
@ApiModelProperty(value = "收货净重", dataType="BigDecimal", required = true)
private BigDecimal receiveNet;
@ApiModelProperty(value = "货物名称", dataType="String")
@ApiModelProperty(value = "货物名称", dataType="String", required = true)
private String goodsName;
@ApiModelProperty(value = "是否车主本人：1是，0否", dataType="Integer")
private Integer personalDriverFlag;
@ApiModelProperty(value = "垫付类型 0 全额垫付 1 不垫付服务费", dataType="Integer")
// @ApiModelProperty(value = "是否车主本人：1是，0否", dataType="Integer", required = true)
// private Integer personalDriverFlag;
@ApiModelProperty(value = "垫付类型 0 全额垫付 1 不垫付服务费", dataType="Integer", required = true)
private Integer advanceType;
@ApiModelProperty(value = "货物价格 单位 分")
@ApiModelProperty(value = "货物价格 单位 分", required = true)
private Integer goodsPrice;
@ApiModelProperty("装车磅单图片")
@ApiModelProperty(value = "装车磅单图片", required = true)
private List<String> loadPoundImages;
@ApiModelProperty("卸车磅单图片")
@ApiModelProperty(value = "卸车磅单图片", required = true)
private List<String> unLoadPoundImages;
@ApiModelProperty(value = "关联账号")
@ApiModelProperty(value = "关联账号", required = true)
private String invoiceRelationNo;
@ApiModelProperty(value = "货单信息")
@ApiModelProperty(value = "货单信息", required = true)
private ThirdOrderInfoDTO orderInfoDTO;
@ApiModelProperty(value = "车主信息")
@ApiModelProperty(value = "车主信息", required = true)
private OrderChildDriverInfoDTO truckDriverInfoDTO;
@ApiModelProperty(value = "司机信息")
@ApiModelProperty(value = "司机信息", required = true)
private OrderChildDriverInfoDTO driverInfoDTO;
@ApiModelProperty(value = "车主银行卡信息")
@ApiModelProperty(value = "车主银行卡信息", required = true)
private OrderChildBankInfoDTO truckDriverBankInfoDTO;
@ApiModelProperty(value = "司机银行卡信息")
@ApiModelProperty(value = "司机银行卡信息", required = true)
private OrderChildBankInfoDTO driverBankInfoDTO;
@ApiModelProperty(value = "车辆信息")
@ApiModelProperty(value = "车辆信息", required = true)
private OrderChildTruckInfoDTO truckInfoDTO;
@ApiModelProperty(value = "运单轨迹")
@ApiModelProperty(value = "运单轨迹", required = true)
private List<OrderChildTruckTraceDTO> brokerTraceList;
@ApiModelProperty(value = "来源:0-货易来,1-诚联信 2承运", hidden = true)
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论