提交 85058374 authored 作者: aiqingguo's avatar aiqingguo

承运同步

上级 931af657
package com.clx.performance.param.feign.transport;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@ToString
@NoArgsConstructor
public class OrderChildBankInfoDTO {
@ApiModelProperty(value = "运单号", dataType="String")
private String childNo;
@ApiModelProperty(value = "用户钱包", dataType="Integer")
private Integer userCode;
@ApiModelProperty(value = "持卡人姓名", dataType="String")
private String name;
@ApiModelProperty(value = "银行卡卡号", dataType="String")
private String cardNo;
@ApiModelProperty(value = "手机号", dataType="String")
private String mobile;
@ApiModelProperty(value = "账户类型 11个人 12企业账户", dataType="Integer")
private Integer accountType;
@ApiModelProperty(value = "银行卡类型10借记卡20借贷卡", dataType="String")
private String type;
@ApiModelProperty(value = "是否允许提现: 允许提现1 ,禁止提现0", dataType="Integer")
private Integer cashOut;
@ApiModelProperty(value = "身份证号", dataType="String")
private String idCard;
@ApiModelProperty(value = "银行", dataType="String")
private String bank;
@ApiModelProperty(value = "银行编码", dataType="String")
private String bankCode;
@ApiModelProperty(value = "身份证正面图片")
private String idCardFrontImg;
@ApiModelProperty(value = "身份证背面图片")
private String idCardBackImg;
@ApiModelProperty(value = "创建时间", dataType="String")
private String createTime;
@ApiModelProperty(value = "修改时间", dataType="String")
private String modifiedTime;
}
package com.clx.performance.param.feign.transport;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@ToString
@NoArgsConstructor
public class OrderChildDriverInfoDTO {
@ApiModelProperty(value = "运单号", dataType="String")
private String childNo;
@ApiModelProperty(value = "司机ID", dataType="Integer")
private Integer driverId;
@ApiModelProperty(value = "手机号", dataType="String")
private String mobile;
@ApiModelProperty(value = "姓名", dataType="String")
private String name;
@ApiModelProperty(value = "性别1男2女", dataType="Integer")
private Integer sex;
@ApiModelProperty(value = "头像相对地址", dataType="String")
private String headImg;
@ApiModelProperty(value = "钱包账号", dataType="String")
private String walletCode;
@ApiModelProperty(value = "身份证号", dataType="String")
private String cardNo;
@ApiModelProperty(value = "身份证有效期起始时间", dataType="String")
private String cardStartTime;
@ApiModelProperty(value = "身份证有效期终止时间", dataType="String")
private String cardEndTime;
@ApiModelProperty(value = "是否是长期 0-非长期 1-长期", dataType="Integer")
private Integer cardLongTerm;
@ApiModelProperty(value = "身份证正面图片地址", dataType="String")
private String cardFrontImg;
@ApiModelProperty(value = "身份证背面图片地址", dataType="String")
private String cardBackImg;
@ApiModelProperty(value = "手持身份证照片地址", dataType="String")
private String faceCardImg;
@ApiModelProperty(value = "驾驶证号码", dataType="String")
private String licenceNo;
@ApiModelProperty(value = "初次领证日期", dataType="String")
private String licenseTime;
@ApiModelProperty(value = "驾照类型", dataType="String")
private String licenceClass;
@ApiModelProperty(value = "驾驶证正面图片", dataType="String")
private String licenceImg;
@ApiModelProperty(value = "驾驶证背面图片", dataType="String")
private String licenceBackImg;
@ApiModelProperty(value = "驾驶证有效期起始时间", dataType="String")
private String licenceStartTime;
@ApiModelProperty(value = "驾驶证有效期终止时间", dataType="String")
private String licenceEndTime;
@ApiModelProperty(value = "道路运输许可证图片地址", dataType="String")
private String transportLicenceImg;
@ApiModelProperty(value = "道路运输从业资格证号", dataType="String")
private String occupationalLicenceNo;
@ApiModelProperty(value = "道路运输从业资格证图片地址", dataType="String")
private String occupationalLicenceImg;
@ApiModelProperty(value = "从业资格证有效期起始时间", dataType="String")
private String occupationalStartTime;
@ApiModelProperty(value = "从业资格证有效期终止时间", dataType="String")
private String occupationalEndTime;
@ApiModelProperty("驾驶证发证机关")
private String licenceIssueOrganization;
@ApiModelProperty("身份证住址")
private String idCardAddress;
@ApiModelProperty(value = "创建时间", dataType="String")
private String createTime;
@ApiModelProperty(value = "修改时间", dataType="String")
private String modifiedTime;
}
package com.clx.performance.param.feign.transport;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@ToString
@NoArgsConstructor
public class OrderChildTruckInfoDTO {
@ApiModelProperty(value = "运单号", dataType="String")
private String childNo;
@ApiModelProperty(value = "车辆ID", dataType="Integer")
private Integer truckId;
@ApiModelProperty(value = "车主id", dataType="Integer")
private Integer userId;
@ApiModelProperty(value = "车主手机号", dataType="String")
private String mobile;
@ApiModelProperty(value = "车牌号", dataType="String")
private String truckNo;
@ApiModelProperty(value = "车头车牌颜色代码", dataType="Integer")
private Integer truckNoColorCode;
@ApiModelProperty(value = "车头车牌颜色", dataType="String")
private String truckNoColor;
@ApiModelProperty(value = "型号", dataType="String")
private String model;
@ApiModelProperty(value = "载重单位吨", dataType="Integer")
private Integer load;
@ApiModelProperty(value = "吨位 单位吨", dataType="Integer")
private Integer grossMass;
@ApiModelProperty(value = "车头道路运输许可证编号", dataType="String")
private String roadTransportCertificateNo;
@ApiModelProperty(value = "行驶证主页照片", dataType="String")
private String licenceImgMain;
@ApiModelProperty(value = "行驶证副业正面照片", dataType="String")
private String licenceImgSecond;
@ApiModelProperty(value = "行驶证副业背面照片", dataType="String")
private String licenceImgSecondBack;
@ApiModelProperty(value = "道路运输许可证图片地址", dataType="String")
private String transportLicenceImg;
@ApiModelProperty(value = "车辆燃料类型 1:柴油 2 天然气 3其他 4新能源/电", dataType="Integer")
private Integer powerType;
@ApiModelProperty("使用性质")
private String useNature;
@ApiModelProperty("车辆识别代码")
private String identifyCode;
@ApiModelProperty("行驶证发证机关")
private String licenceIssueOrganization;
@ApiModelProperty("注册日期")
private String registerDate;
@ApiModelProperty("行驶证发证日期")
private String licenceIssueDate;
@ApiModelProperty(value = "创建时间", dataType="String")
private String createTime;
@ApiModelProperty(value = "修改时间", dataType="String")
private String modifiedTime;
}
package com.clx.performance.param.feign.transport;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
/**
* @description:
* @Author:liumingchao
* @Date:2022/11/4 13:50
*/
@Getter
@Setter
@NoArgsConstructor
public class OrderChildTruckTraceDTO {
private Integer id;
/** 运单号 **/
private String childNo;
/** 定位时间 **/
private String locationTime;
/** 定位经度 **/
private String locationLon;
/** 定位纬度 **/
private String locationLat;
/** 定位详细位置信息 **/
private String locationAddress;
/** 创建时间 **/
private String createTime;
/** 修改时间 **/
private String modifiedTime;
}
package com.clx.performance.param.feign.transport;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import java.math.BigDecimal;
import java.util.List;
@Getter
@Setter
@ToString
@NoArgsConstructor
public class ThirdOrderChildBrokerParam {
@ApiModelProperty(value = "订单编码", dataType="String")
private String childNo;
@ApiModelProperty(value = "主单编码", dataType="String")
private String orderNo;
@ApiModelProperty(value = "车牌号", dataType="String")
private String truckNo;
@ApiModelProperty(value = "运费单价 单位分", dataType="Integer")
private Integer freightPrice;
@ApiModelProperty(value = "运费 单位分", dataType="Integer")
private Integer freight;
@ApiModelProperty(value = "实付运费 单位分", dataType="Integer")
private Integer freightNoCard;
@ApiModelProperty(value = "溢价金额", dataType = "Integer")
private Integer orderChildBrokerBeyondFreight;
@ApiModelProperty(value = "净重", dataType="BigDecimal")
private BigDecimal net;
@ApiModelProperty(value = "发货地址", dataType="String")
private String sendAddress;
@ApiModelProperty(value = "货源所在省份", dataType="String")
private String sendProvince;
@ApiModelProperty(value = "货源所在城市", dataType="String")
private String sendCity;
@ApiModelProperty(value = "货源所在区县", dataType="String")
private String sendCounty;
@ApiModelProperty(value = "货源所在乡镇", dataType="String")
private String sendTown;
@ApiModelProperty(value = "发货人", dataType="String")
private String sendName;
@ApiModelProperty(value = "发货人手机号", dataType="String")
private String sendMobile;
@ApiModelProperty(value = "收货人所在省", dataType="String")
private String receiveProvince;
@ApiModelProperty(value = "收货人所在城市", dataType="String")
private String receiveCity;
@ApiModelProperty(value = "收货人所在区县", dataType="String")
private String receiveCounty;
@ApiModelProperty(value = "收货人所在乡镇", dataType="String")
private String receiveTown;
@ApiModelProperty(value = "收货地址", dataType="String")
private String receiveAddress;
@ApiModelProperty(value = "收货人", dataType="String")
private String receiveName;
@ApiModelProperty(value = "收货人手机号", dataType="String")
private String receiveMobile;
@ApiModelProperty(value = "装车地址经度")
private String loadLongitude;
@ApiModelProperty(value = "装车地址纬度")
private String loadLatitude;
@ApiModelProperty(value = "卸车地址经度")
private String unloadLongitude;
@ApiModelProperty(value = "卸车地址纬度")
private String unloadLatitude;
@ApiModelProperty(value = "运输距离(公里)")
private BigDecimal distance;
@ApiModelProperty(value = "接单时间", dataType="String")
private String payTime;
@ApiModelProperty(value = "装车时间", dataType="String")
private String loadTime;
@ApiModelProperty(value = "卸车时间", dataType="String")
private String unloadTime;
@ApiModelProperty(value = "支付完成时间", dataType="String")
private String payFinishedTime;
@ApiModelProperty(value = "备注", dataType="String")
private String remark;
@ApiModelProperty(value = "创建时间", dataType="String")
private String createTime;
@ApiModelProperty(value = "收货单位", dataType="String")
private String receiveCompany;
@ApiModelProperty(value = "发货单位", dataType="String")
private String sendCompany;
@ApiModelProperty(value = "收货净重", dataType="BigDecimal")
private BigDecimal receiveNet;
@ApiModelProperty(value = "货物名称", dataType="String")
private String goodsName;
@ApiModelProperty(value = "是否车主本人:1是,0否", dataType="Integer")
private Integer personalDriverFlag;
@ApiModelProperty(value = "垫付类型 0 全额垫付 1 不垫付服务费", dataType="Integer")
private Integer advanceType;
@ApiModelProperty(value = "货物价格 单位 分")
private Integer goodsPrice;
@ApiModelProperty("装车磅单图片")
private List<String> loadPoundImages;
@ApiModelProperty("卸车磅单图片")
private List<String> unLoadPoundImages;
@ApiModelProperty(value = "关联账号")
private String invoiceRelationNo;
@ApiModelProperty(value = "货单信息")
private ThirdOrderInfoDTO orderInfoDTO;
@ApiModelProperty(value = "车主信息")
private OrderChildDriverInfoDTO truckDriverInfoDTO;
@ApiModelProperty(value = "司机信息")
private OrderChildDriverInfoDTO driverInfoDTO;
@ApiModelProperty(value = "车主银行卡信息")
private OrderChildBankInfoDTO truckDriverBankInfoDTO;
@ApiModelProperty(value = "司机银行卡信息")
private OrderChildBankInfoDTO driverBankInfoDTO;
@ApiModelProperty(value = "车辆信息")
private OrderChildTruckInfoDTO truckInfoDTO;
@ApiModelProperty(value = "运单轨迹")
private List<OrderChildTruckTraceDTO> brokerTraceList;
@ApiModelProperty(value = "来源:0-货易来,1-诚联信 2承运", hidden = true)
private Integer source;
}
package com.clx.performance.param.feign.transport;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import java.math.BigDecimal;
@Setter
@Getter
@ToString
@NoArgsConstructor
public class ThirdOrderInfoDTO {
@ApiModelProperty(value = "货单编码", required = true)
private String orderNo;
@ApiModelProperty(value = "货物名称", required = true)
private String goodsName;
@ApiModelProperty(value = "发货单位", required = true)
private String sendCompany;
@ApiModelProperty(value = "发货所在省份", required = true)
private String sendProvince;
@ApiModelProperty(value = "发货所在城市", required = true)
private String sendCity;
@ApiModelProperty(value = "发货所在区县", required = true)
private String sendCounty;
@ApiModelProperty(value = "发货所在乡镇", required = true)
private String sendTown;
@ApiModelProperty(value = "发货详细地址", required = true)
private String sendAddress;
@ApiModelProperty(value = "发货联系人", required = true)
private String sendName;
@ApiModelProperty(value = "发货联系人手机号", required = true)
private String sendMobile;
@ApiModelProperty(value = "发货地址经度", required = true)
private String loadLongitude;
@ApiModelProperty(value = "发货地址纬度", required = true)
private String loadLatitude;
@ApiModelProperty(value = "收货单位", required = true)
private String receiveCompany;
@ApiModelProperty(value = "收货人所在省", required = true)
private String receiveProvince;
@ApiModelProperty(value = "收货人所在城市", required = true)
private String receiveCity;
@ApiModelProperty(value = "收货人所在区县", required = true)
private String receiveCounty;
@ApiModelProperty(value = "收货人所在乡镇", required = true)
private String receiveTown;
@ApiModelProperty(value = "收货详细地址", required = true)
private String receiveAddress;
@ApiModelProperty(value = "收货联系人", required = true)
private String receiveName;
@ApiModelProperty(value = "收货联系人手机号", required = true)
private String receiveMobile;
@ApiModelProperty(value = "收货地址经度", required = true)
private String unloadLongitude;
@ApiModelProperty(value = "收货地址纬度", required = true)
private String unloadLatitude;
@ApiModelProperty(value = "货物单价(单位:分)", required = true)
private Integer goodsPrice;
@ApiModelProperty(value = "运费单价(单位:分)", required = true)
private Integer transPrice;
@ApiModelProperty(value = "货物总重量(吨)", required = true)
private BigDecimal goodsAmount;
@ApiModelProperty(value = "最晚装货时间", required = true)
private String extractTime;
@ApiModelProperty(value = "司机最晚到达时间", required = true)
private String arriveTime;
}
package com.clx.performance.controller.temp; package com.clx.performance.controller.temp;
import com.clx.performance.extranal.transport.TransportService;
import com.clx.performance.param.feign.transport.ThirdOrderChildBrokerParam;
import com.clx.performance.service.TempService; import com.clx.performance.service.TempService;
import com.clx.performance.service.child.FeignOrderChildService; import com.clx.performance.service.child.FeignOrderChildService;
import com.clx.performance.vo.pc.child.OrderChildLineStatisticsVO; import com.clx.performance.vo.pc.child.OrderChildLineStatisticsVO;
...@@ -30,6 +32,8 @@ public class TempController { ...@@ -30,6 +32,8 @@ public class TempController {
private TempService tempService; private TempService tempService;
@Autowired @Autowired
private FeignOrderChildService carrierOrderChildService; private FeignOrderChildService carrierOrderChildService;
@Autowired
private TransportService transportService;
...@@ -69,4 +73,17 @@ public class TempController { ...@@ -69,4 +73,17 @@ public class TempController {
return Result.ok(); return Result.ok();
} }
@ApiOperation(value = "承运同步网络货运 (临时接口)", notes = "<br>By:胡宁宁")
@RequestMapping(value = "/orderChildSync", method = RequestMethod.GET)
public Result<Void> orderChildSync() {
ThirdOrderChildBrokerParam param = new ThirdOrderChildBrokerParam();
param.setChildNo("123");
transportService.orderChildSync(param);
return Result.ok();
}
} }
package com.clx.performance.extranal.transport;
import com.clx.performance.param.feign.transport.ThirdOrderChildBrokerParam;
public interface TransportService {
void orderChildSync(ThirdOrderChildBrokerParam param);
}
package com.clx.performance.extranal.transport.impl;
import com.clx.performance.extranal.transport.TransportService;
import com.clx.performance.feign.TransportFeignService;
import com.clx.performance.param.feign.transport.ThirdOrderChildBrokerParam;
import com.msl.common.base.Optional;
import com.msl.common.enums.ResultCodeEnum;
import com.msl.common.result.Result;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Slf4j
@Service
public class TransportServiceImpl implements TransportService {
@Autowired
private TransportFeignService transportFeignService;
@Override
public void orderChildSync(ThirdOrderChildBrokerParam param) {
Optional.ofNullable(transportFeignService.orderChildSync(param))
.filter(Result::succeed).orElseThrow(ResultCodeEnum.FAIL);
}
}
package com.clx.performance.feign;
import com.clx.performance.param.feign.transport.ThirdOrderChildBrokerParam;
import com.msl.common.result.Result;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@FeignClient(name = "transport-service-yitu")
@RequestMapping(value = "/transport-service/feign/order")
public interface TransportFeignService {
/**
* 运单同步
*/
@RequestMapping(value = "/orderChildSync", method = RequestMethod.POST)
Result<Integer> orderChildSync(@RequestBody ThirdOrderChildBrokerParam param);
}
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论