承运同步

performance-api/src/main/java/com/clx/performance/param/feign/transport/OrderChildBankInfoDTO.java

@@ -6,6 +6,8 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
+import javax.validation.constraints.NotBlank;
+
 @Getter
 @Setter
 @ToString
@@ -16,6 +18,7 @@ public class OrderChildBankInfoDTO {
 //    private String childNo;
 //    @ApiModelProperty(value = "用户钱包", dataType="Integer", required = true)
 //    private Integer userCode;
+
     @ApiModelProperty(value = "持卡人姓名", dataType="String", required = true)
     private String name;
     @ApiModelProperty(value = "银行卡卡号", dataType="String", required = true)
@@ -26,17 +29,25 @@ public class OrderChildBankInfoDTO {
     private Integer accountType;
     @ApiModelProperty(value = "银行卡类型10借记卡20借贷卡", dataType="String", required = true)
     private String type;
-    @ApiModelProperty(value = "是否允许提现: 允许提现1 ,禁止提现0", dataType="Integer", required = true)
-    private Integer cashOut;
+
+//    @ApiModelProperty(value = "是否允许提现: 允许提现1 ,禁止提现0", dataType="Integer", required = true)
+//    private Integer cashOut;
+
     @ApiModelProperty(value = "身份证号", dataType="String", required = true)
+    @NotBlank(message = "身份证号不能为空")
     private String idCard;
     @ApiModelProperty(value = "银行", dataType="String", required = true)
+    @NotBlank(message = "银行不能为空")
     private String bank;
     @ApiModelProperty(value = "银行编码", dataType="String", required = true)
+    @NotBlank(message = "银行编码不能为空")
     private String bankCode;
+
     @ApiModelProperty(value = "身份证正面图片", required = true)
+    @NotBlank(message = "身份证正面图片不能为空")
     private String idCardFrontImg;
     @ApiModelProperty(value = "身份证背面图片", required = true)
+    @NotBlank(message = "身份证背面图片不能为空")
     private String idCardBackImg;
 
 }

performance-api/src/main/java/com/clx/performance/param/feign/transport/OrderChildDriverInfoDTO.java

@@ -6,6 +6,9 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 @Getter
 @Setter
 @ToString
@@ -16,58 +19,84 @@ public class OrderChildDriverInfoDTO {
 //    private String childNo;
 //    @ApiModelProperty(value = "司机ID", dataType="Integer", required = true)
 //    private Integer driverId;
+
     @ApiModelProperty(value = "手机号", dataType="String", required = true)
+    @NotBlank(message = "手机号不能为空")
     private String mobile;
     @ApiModelProperty(value = "姓名", dataType="String", required = true)
+    @NotBlank(message = "姓名手机号不能为空")
     private String name;
     @ApiModelProperty(value = "性别1男2女", dataType="Integer", required = true)
     private Integer sex;
-    @ApiModelProperty(value = "头像相对地址", dataType="String", required = true)
-    private String headImg;
+
+//    @ApiModelProperty(value = "头像相对地址", dataType="String", required = true)
+//    private String headImg;
 //    @ApiModelProperty(value = "钱包账号", dataType="String", required = true)
 //    private String walletCode;
+
     @ApiModelProperty(value = "身份证号", dataType="String", required = true)
+    @NotBlank(message = "身份证号不能为空")
     private String cardNo;
     @ApiModelProperty(value = "身份证有效期起始时间", dataType="String", required = true)
+    @NotBlank(message = "身份证有效期起始时间不能为空")
     private String cardStartTime;
     @ApiModelProperty(value = "身份证有效期终止时间", dataType="String")
     private String cardEndTime;
     @ApiModelProperty(value = "是否是长期 0-非长期 1-长期", dataType="Integer", required = true)
+    @NotNull(message = "是否是长期不能为空")
     private Integer cardLongTerm;
     @ApiModelProperty(value = "身份证正面图片地址", dataType="String", required = true)
+    @NotBlank(message = "身份证正面图片地址不能为空")
     private String cardFrontImg;
     @ApiModelProperty(value = "身份证背面图片地址", dataType="String", required = true)
+    @NotBlank(message = "身份证背面图片地址不能为空")
     private String cardBackImg;
-    @ApiModelProperty(value = "手持身份证照片地址", dataType="String", required = true)
+    @ApiModelProperty(value = "手持身份证照片地址", dataType="String")
     private String faceCardImg;
 
     @ApiModelProperty(value = "驾驶证号码", dataType="String", required = true)
+    @NotBlank(message = "驾驶证号码不能为空")
     private String licenceNo;
     @ApiModelProperty(value = "初次领证日期", dataType="String", required = true)
+    @NotBlank(message = "初次领证日期不能为空")
     private String licenseTime;
     @ApiModelProperty(value = "驾照类型", dataType="String", required = true)
+    @NotBlank(message = "驾照类型不能为空")
     private String licenceClass;
     @ApiModelProperty(value = "驾驶证正面图片", dataType="String", required = true)
+    @NotBlank(message = "驾驶证正面图片不能为空")
     private String licenceImg;
     @ApiModelProperty(value = "驾驶证背面图片", dataType="String", required = true)
+    @NotBlank(message = "驾驶证背面图片不能为空")
     private String licenceBackImg;
     @ApiModelProperty(value = "驾驶证有效期起始时间", dataType="String", required = true)
+    @NotBlank(message = "驾驶证有效期起始时间不能为空")
     private String licenceStartTime;
     @ApiModelProperty(value = "驾驶证有效期终止时间", dataType="String", required = true)
+    @NotBlank(message = "驾驶证有效期终止时间不能为空")
     private String licenceEndTime;
+
     @ApiModelProperty(value = "道路运输许可证图片地址", dataType="String", required = true)
+    @NotBlank(message = "道路运输许可证图片地址不能为空")
     private String transportLicenceImg;
     @ApiModelProperty(value = "道路运输从业资格证号", dataType="String", required = true)
+    @NotBlank(message = "道路运输从业资格证号不能为空")
     private String occupationalLicenceNo;
     @ApiModelProperty(value = "道路运输从业资格证图片地址", dataType="String", required = true)
+    @NotBlank(message = "道路运输从业资格证图片地址不能为空")
     private String occupationalLicenceImg;
     @ApiModelProperty(value = "从业资格证有效期起始时间", dataType="String", required = true)
+    @NotBlank(message = "从业资格证有效期起始时间不能为空")
     private String occupationalStartTime;
     @ApiModelProperty(value = "从业资格证有效期终止时间", dataType="String", required = true)
+    @NotBlank(message = "从业资格证有效期终止时间不能为空")
     private String occupationalEndTime;
+
     @ApiModelProperty(value = "驾驶证发证机关", required = true)
+    @NotBlank(message = "驾驶证发证机关不能为空")
     private String licenceIssueOrganization;
     @ApiModelProperty(value = "身份证住址", required = true)
+    @NotBlank(message = "身份证住址不能为空")
     private String idCardAddress;
 
 }

performance-api/src/main/java/com/clx/performance/param/feign/transport/OrderChildTruckInfoDTO.java

@@ -6,6 +6,9 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 @Getter
 @Setter
 @ToString
@@ -18,34 +21,50 @@ public class OrderChildTruckInfoDTO {
 //    private Integer truckId;
 //    @ApiModelProperty(value = "车主id", dataType="Integer", required = true)
 //    private Integer userId;
+
     @ApiModelProperty(value = "车主手机号", dataType="String", required = true)
+    @NotBlank(message = "车主手机号不能为空")
     private String mobile;
     @ApiModelProperty(value = "车牌号", dataType="String", required = true)
+    @NotBlank(message = "车牌号不能为空")
     private String truckNo;
+
 //    @ApiModelProperty(value = "车头车牌颜色代码", dataType="Integer", required = true)
 //    private Integer truckNoColorCode;
+
     @ApiModelProperty(value = "车头车牌颜色", dataType="String", required = true)
+    @NotBlank(message = "车头车牌颜色不能为空")
     private String truckNoColor;
     @ApiModelProperty(value = "型号", dataType="String", required = true)
+    @NotBlank(message = "型号不能为空")
     private String model;
     @ApiModelProperty(value = "载重单位吨", dataType="Integer", required = true)
+    @NotNull(message = "载重单位吨不能为空")
     private Integer load;
     @ApiModelProperty(value = "吨位 单位吨", dataType="Integer", required = true)
+    @NotNull(message = "吨位不能为空")
     private Integer grossMass;
+
     @ApiModelProperty(value = "车头道路运输许可证编号", dataType="String", required = true)
+    @NotBlank(message = "车头道路运输许可证编号不能为空")
     private String roadTransportCertificateNo;
     @ApiModelProperty(value = "行驶证主页照片", dataType="String", required = true)
+    @NotBlank(message = "行驶证主页照片不能为空")
     private String licenceImgMain;
     @ApiModelProperty(value = "行驶证副业正面照片", dataType="String", required = true)
+    @NotBlank(message = "行驶证副业正面照片不能为空")
     private String licenceImgSecond;
     @ApiModelProperty(value = "行驶证副业背面照片", dataType="String", required = true)
+    @NotBlank(message = "行驶证副业背面照片不能为空")
     private String licenceImgSecondBack;
     @ApiModelProperty(value = "道路运输许可证图片地址", dataType="String", required = true)
+    @NotBlank(message = "道路运输许可证图片地址不能为空")
     private String transportLicenceImg;
 
     @ApiModelProperty(value = "行驶证有效期开始时间")
     private String drivingLicenseBeginTime;
     @ApiModelProperty(value = "行驶证有效期结束时间", required = true)
+    @NotBlank(message = "行驶证有效期结束时间不能为空")
     private String drivingLicenseEndTime;
     @ApiModelProperty(value = "运输证有效期开始时间")
     private String transportationLicenseBeginTime;
@@ -53,16 +72,22 @@ public class OrderChildTruckInfoDTO {
     private String transportationLicenseEndTime;
 
     @ApiModelProperty(value = "车辆燃料类型 1：柴油 2 天然气 3其他 4新能源/电", dataType="Integer", required = true)
+    @NotNull(message = "车辆燃料类型不能为空")
     private Integer powerType;
     @ApiModelProperty(value = "使用性质", required = true)
+    @NotBlank(message = "使用性质不能为空")
     private String useNature;
     @ApiModelProperty(value = "车辆识别代码", required = true)
+    @NotBlank(message = "车辆识别代码不能为空")
     private String identifyCode;
     @ApiModelProperty(value = "行驶证发证机关", required = true)
+    @NotBlank(message = "行驶证发证机关不能为空")
     private String licenceIssueOrganization;
     @ApiModelProperty(value = "注册日期", required = true)
+    @NotBlank(message = "注册日期不能为空")
     private String registerDate;
     @ApiModelProperty(value = "行驶证发证日期", required = true)
+    @NotBlank(message = "行驶证发证日期不能为空")
     private String licenceIssueDate;
 
 }

performance-api/src/main/java/com/clx/performance/param/feign/transport/ThirdOrderChildBrokerParam.java

@@ -6,6 +6,10 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -16,105 +20,168 @@ import java.util.List;
 public class ThirdOrderChildBrokerParam {
 
     @ApiModelProperty(value = "运单编码", dataType="String", required = true)
+    @NotBlank(message = "订单编码不能为空")
     private String childNo;
-    @ApiModelProperty(value = "订单编码", dataType="String", required = true)
-    private String orderNo;
-    @ApiModelProperty(value = "车牌号", dataType="String", required = true)
-    private String truckNo;
+
+//    @ApiModelProperty(value = "订单编码", dataType="String", required = true)
+//    @NotBlank(message = "货单编码不能为空")
+//    private String orderNo;
+//    @ApiModelProperty(value = "车牌号", dataType="String", required = true)
+//    private String truckNo;
+
     @ApiModelProperty(value = "运费单价 单位分", dataType="Integer", required = true)
+    @NotNull(message = "运费单价不能为空")
     private Integer freightPrice;
     @ApiModelProperty(value = "运费 单位分", dataType="Integer", required = true)
+    @NotNull(message = "运费不能为空")
     private Integer freight;
     @ApiModelProperty(value = "实付运费 单位分", dataType="Integer", required = true)
+    @NotNull(message = "实付运费不能为空")
     private Integer freightNoCard;
     @ApiModelProperty(value = "溢价金额", dataType = "Integer", required = true)
+    @NotNull(message = "溢价金额不能为空")
     private Integer orderChildBrokerBeyondFreight;
     @ApiModelProperty(value = "净重", dataType="BigDecimal", required = true)
+    @NotNull(message = "净重不能为空")
     private BigDecimal net;
+
     @ApiModelProperty(value = "发货地址", dataType="String", required = true)
+    @NotBlank(message = "发货地址不能为空")
     private String sendAddress;
     @ApiModelProperty(value = "货源所在省份", dataType="String", required = true)
+    @NotBlank(message = "货源所在省份不能为空")
     private String sendProvince;
     @ApiModelProperty(value = "货源所在城市", dataType="String", required = true)
+    @NotBlank(message = "货源所在城市不能为空")
     private String sendCity;
     @ApiModelProperty(value = "货源所在区县", dataType="String", required = true)
+    @NotBlank(message = "货源所在区县不能为空")
     private String sendCounty;
     @ApiModelProperty(value = "货源所在乡镇", dataType="String", required = true)
+    @NotBlank(message = "货源所在乡镇不能为空")
     private String sendTown;
     @ApiModelProperty(value = "发货人", dataType="String", required = true)
+    @NotBlank(message = "发货人不能为空")
     private String sendName;
     @ApiModelProperty(value = "发货人手机号", dataType="String", required = true)
+    @NotBlank(message = "发货人手机号不能为空")
     private String sendMobile;
+
     @ApiModelProperty(value = "收货人所在省", dataType="String", required = true)
+    @NotBlank(message = "收货人所在省不能为空")
     private String receiveProvince;
     @ApiModelProperty(value = "收货人所在城市", dataType="String", required = true)
+    @NotBlank(message = "收货人所在城市不能为空")
     private String receiveCity;
     @ApiModelProperty(value = "收货人所在区县", dataType="String", required = true)
+    @NotBlank(message = "收货人所在区县不能为空")
     private String receiveCounty;
     @ApiModelProperty(value = "收货人所在乡镇", dataType="String", required = true)
+    @NotBlank(message = "收货人所在乡镇不能为空")
     private String receiveTown;
     @ApiModelProperty(value = "收货地址", dataType="String", required = true)
+    @NotBlank(message = "收货地址不能为空")
     private String receiveAddress;
     @ApiModelProperty(value = "收货人", dataType="String", required = true)
+    @NotBlank(message = "收货人不能为空")
     private String receiveName;
     @ApiModelProperty(value = "收货人手机号", dataType="String", required = true)
+    @NotBlank(message = "收货人手机号不能为空")
     private String receiveMobile;
+
     @ApiModelProperty(value = "装车地址经度", required = true)
+    @NotBlank(message = "装车地址经度不能为空")
     private String loadLongitude;
     @ApiModelProperty(value = "装车地址纬度", required = true)
+    @NotBlank(message = "装车地址纬度不能为空")
     private String loadLatitude;
     @ApiModelProperty(value = "卸车地址经度", required = true)
+    @NotBlank(message = "卸车地址经度不能为空")
     private String unloadLongitude;
     @ApiModelProperty(value = "卸车地址纬度", required = true)
+    @NotBlank(message = "卸车地址纬度不能为空")
     private String unloadLatitude;
     @ApiModelProperty(value = "运输距离（公里）", required = true)
+    @NotNull(message = "运输距离不能为空")
     private BigDecimal distance;
+
     @ApiModelProperty(value = "接单时间", dataType="String", required = true)
+    @NotBlank(message = "接单时间不能为空")
     private String payTime;
     @ApiModelProperty(value = "装车时间", dataType="String", required = true)
+    @NotBlank(message = "装车时间不能为空")
     private String loadTime;
     @ApiModelProperty(value = "卸车时间", dataType="String", required = true)
+    @NotBlank(message = "卸车时间不能为空")
     private String unloadTime;
     @ApiModelProperty(value = "支付完成时间", dataType="String", required = true)
+    @NotBlank(message = "支付完成时间不能为空")
     private String payFinishedTime;
-    @ApiModelProperty(value = "备注", dataType="String")
-    private String remark;
+
+//    @ApiModelProperty(value = "备注", dataType="String")
+//    private String remark;
 //    @ApiModelProperty(value = "创建时间", dataType="String", required = true)
 //    private String createTime;
-    @ApiModelProperty(value = "收货单位", dataType="String", required = true)
+
+    @ApiModelProperty(value = "收货单位", dataType="String")
     private String receiveCompany;
-    @ApiModelProperty(value = "发货单位", dataType="String", required = true)
+    @ApiModelProperty(value = "发货单位", dataType="String")
     private String sendCompany;
     @ApiModelProperty(value = "收货净重", dataType="BigDecimal", required = true)
+    @NotNull(message = "收货净重不能为空")
     private BigDecimal receiveNet;
-    @ApiModelProperty(value = "货物名称", dataType="String", required = true)
-    private String goodsName;
+
+//    @ApiModelProperty(value = "货物名称", dataType="String", required = true)
+//    @NotBlank(message = "货物名称不能为空")
+//    private String goodsName;
 //    @ApiModelProperty(value = "是否车主本人：1是，0否", dataType="Integer", required = true)
 //    private Integer personalDriverFlag;
+
     @ApiModelProperty(value = "垫付类型 0 全额垫付 1 不垫付服务费", dataType="Integer", required = true)
+    @NotBlank(message = "垫付类型不能为空")
     private Integer advanceType;
-    @ApiModelProperty(value = "货物价格 单位 分", required = true)
-    private Integer goodsPrice;
+
+//    @ApiModelProperty(value = "货物价格 单位 分", required = true)
+//    private Integer goodsPrice;
+
     @ApiModelProperty(value = "装车磅单图片", required = true)
+    @NotEmpty(message = "装车磅单图片不能为空")
     private List<String> loadPoundImages;
     @ApiModelProperty(value = "卸车磅单图片", required = true)
+    @NotEmpty(message = "卸车磅单图片不能为空")
     private List<String> unLoadPoundImages;
+
     @ApiModelProperty(value = "关联账号(货主手机号)", required = true)
+    @NotBlank(message = "关联账号不能为空")
     private String invoiceRelationNo;
 
     @ApiModelProperty(value = "货单信息", required = true)
+    @Valid
     private ThirdOrderInfoDTO orderInfoDTO;
+
     @ApiModelProperty(value = "车主信息", required = true)
+    @Valid
     private OrderChildDriverInfoDTO truckDriverInfoDTO;
+
     @ApiModelProperty(value = "司机信息", required = true)
+    @Valid
     private OrderChildDriverInfoDTO driverInfoDTO;
+
     @ApiModelProperty(value = "车主银行卡信息", required = true)
+    @Valid
     private OrderChildBankInfoDTO truckDriverBankInfoDTO;
+
     @ApiModelProperty(value = "司机银行卡信息", required = true)
+    @Valid
     private OrderChildBankInfoDTO driverBankInfoDTO;
+
     @ApiModelProperty(value = "车辆信息", required = true)
+    @Valid
     private OrderChildTruckInfoDTO truckInfoDTO;
+
     @ApiModelProperty(value = "运单轨迹", required = true)
+    @Valid
+    @NotEmpty(message = "运单轨迹不能为空")
     private List<OrderChildTruckTraceDTO> brokerTraceList;
 
 //    @ApiModelProperty(value = "来源:0-货易来,1-诚联信 2承运", hidden = true)

performance-api/src/main/java/com/clx/performance/param/feign/transport/ThirdOrderInfoDTO.java

@@ -6,6 +6,8 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 
 @Setter
@@ -18,54 +20,81 @@ public class ThirdOrderInfoDTO {
     private String orderNo;
     @ApiModelProperty(value = "货物名称", required = true)
     private String goodsName;
-    @ApiModelProperty(value = "发货单位", required = true)
+
+    @ApiModelProperty(value = "发货单位")
     private String sendCompany;
     @ApiModelProperty(value = "发货所在省份", required = true)
+    @NotBlank(message = "发货所在省份不能为空")
     private String sendProvince;
     @ApiModelProperty(value = "发货所在城市", required = true)
+    @NotBlank(message = "发货所在城市不能为空")
     private String sendCity;
     @ApiModelProperty(value = "发货所在区县", required = true)
+    @NotBlank(message = "发货所在区县不能为空")
     private String sendCounty;
     @ApiModelProperty(value = "发货所在乡镇", required = true)
+    @NotBlank(message = "发货所在乡镇不能为空")
     private String sendTown;
     @ApiModelProperty(value = "发货详细地址", required = true)
+    @NotBlank(message = "发货详细地址不能为空")
     private String sendAddress;
     @ApiModelProperty(value = "发货联系人", required = true)
+    @NotBlank(message = "发货联系人不能为空")
     private String sendName;
     @ApiModelProperty(value = "发货联系人手机号", required = true)
+    @NotBlank(message = "发货联系人手机号不能为空")
     private String sendMobile;
     @ApiModelProperty(value = "发货地址经度", required = true)
+    @NotBlank(message = "发货地址经度不能为空")
     private String loadLongitude;
     @ApiModelProperty(value = "发货地址纬度", required = true)
+    @NotBlank(message = "发货地址纬度不能为空")
     private String loadLatitude;
-    @ApiModelProperty(value = "收货单位", required = true)
+
+    @ApiModelProperty(value = "收货单位")
     private String receiveCompany;
     @ApiModelProperty(value = "收货人所在省", required = true)
+    @NotBlank(message = "收货人所在省不能为空")
     private String receiveProvince;
     @ApiModelProperty(value = "收货人所在城市", required = true)
+    @NotBlank(message = "收货人所在城市不能为空")
     private String receiveCity;
     @ApiModelProperty(value = "收货人所在区县", required = true)
+    @NotBlank(message = "收货人所在区县不能为空")
     private String receiveCounty;
     @ApiModelProperty(value = "收货人所在乡镇", required = true)
+    @NotBlank(message = "收货人所在乡镇不能为空")
     private String receiveTown;
     @ApiModelProperty(value = "收货详细地址", required = true)
+    @NotBlank(message = "收货详细地址不能为空")
     private String receiveAddress;
     @ApiModelProperty(value = "收货联系人", required = true)
+    @NotBlank(message = "收货联系人不能为空")
     private String receiveName;
     @ApiModelProperty(value = "收货联系人手机号", required = true)
+    @NotBlank(message = "收货联系人手机号不能为空")
     private String receiveMobile;
     @ApiModelProperty(value = "收货地址经度", required = true)
+    @NotBlank(message = "收货地址经度不能为空")
     private String unloadLongitude;
     @ApiModelProperty(value = "收货地址纬度", required = true)
+    @NotBlank(message = "收货地址纬度不能为空")
     private String unloadLatitude;
+
     @ApiModelProperty(value = "货物单价（单位：分）", required = true)
+    @NotNull(message = "货物单价不能为空")
     private Integer goodsPrice;
     @ApiModelProperty(value = "运费单价（单位：分）", required = true)
+    @NotNull(message = "运费单价不能为空")
     private Integer transPrice;
     @ApiModelProperty(value = "货物总重量(吨)", required = true)
+    @NotNull(message = "货物总重量不能为空")
     private BigDecimal goodsAmount;
     @ApiModelProperty(value = "最晚装货时间", required = true)
+    @NotBlank(message = "最晚装货时间不能为空")
     private String extractTime;
     @ApiModelProperty(value = "司机最晚到达时间", required = true)
+    @NotBlank(message = "司机最晚到达时间不能为空")
     private String arriveTime;
+
 }