Skip to content

C
clx-performance
提交 135268c5 authored 作者: liuhaiquan's avatar liuhaiquan
浏览文件
操作

Merge remote-tracking branch 'origin/test' into test

上级 c3d36bb4 d5cd54bc
隐藏空白字符变更
内嵌 并排
正在显示 包含 39 行增加 和 39 行删除
performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java
浏览文件 @ 135268c5
......@@ -823,7 +823,6 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
}
if (flag == 2) {
log.info("冻结账户完毕");
log.info("插入保证金冻结流水");
accountList = ownerAccountDao.accountInfo(userNo);
for (OwnerAccount ownerAccount : accountList) {
if (ownerAccount.getAccountType().equals(OwnerAccountEnum.AccountTypeStatus.MARGIN_ACCOUNT.getCode())) {
......
performance-web/src/main/java/com/clx/performance/service/impl/TransportSyncServiceImpl.java
浏览文件 @ 135268c5
......@@ -52,16 +52,17 @@ public class TransportSyncServiceImpl implements TransportSyncService {
@Override
public ThirdOrderChildBrokerParam generateOrderChildSync(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail,SettlementDriverDetail settlementDriverDetail) {
FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderGoods.getOrderNo());
String host = documentFeign.getHost().getData();
ThirdOrderChildBrokerParam param = new ThirdOrderChildBrokerParam();
FeignAddressVO data = addressFeign.getSendAndReceiveAddress(orderChild.getSendAddressId(), orderChild.getReceiveAddressId()).getData();
FeignAddressVO.Address receiveAddress = data.getReceiveAddress();
FeignAddressVO.Address sendAddress = data.getSendAddress();
//生成基础参数
generateBaseInfo(orderChild, orderGoods, param, sendAddress, receiveAddress, orderInfoFeign, settlementOwnerDetail,settlementDriverDetail);
generateBaseInfo(orderChild, orderGoods, param, sendAddress, receiveAddress, orderInfoFeign, settlementOwnerDetail,settlementDriverDetail, host);
//生成货单数据
generateOrderGoods(orderGoods, orderChild, sendAddress, receiveAddress, param);
//生成车辆信息
generateTruckInfo(orderChild, param);
generateTruckInfo(orderChild, param, host);
List<GdRouteDTO> route = gdService.getRoute(orderGoods.getSendLongitude().setScale(4, RoundingMode.DOWN)
, orderGoods.getSendLatitude().setScale(4, RoundingMode.DOWN),
orderGoods.getReceiveLongitude().setScale(4, RoundingMode.DOWN),
......@@ -82,13 +83,13 @@ public class TransportSyncServiceImpl implements TransportSyncService {
DriverLicenceFeignVO truckOwnerLicenceFeignVO = syncOrderChildVO.getTruckOwnerLicenceFeignVO();
//设置司机银行卡
generateDriverBankCard(driverBankCard, driverUserIdCardVO, param);
generateDriverBankCard(driverBankCard, driverUserIdCardVO, param, host);
//设置车主银行卡
generateTruckDriverBankCard(truckOwnerBankCard, truckOwnerUserIdCardVO, param);
generateTruckDriverBankCard(truckOwnerBankCard, truckOwnerUserIdCardVO, param, host);
//司机信息
generateDriverInfoDTO(diverInfo, driverLicenceFeignVO, driverUserIdCardVO, param);
generateDriverInfoDTO(diverInfo, driverLicenceFeignVO, driverUserIdCardVO, param, host);
//车主信息
generateTruckDriverInfoDTO(truckOwnerInfo, truckOwnerLicenceFeignVO, truckOwnerUserIdCardVO, param);
generateTruckDriverInfoDTO(truckOwnerInfo, truckOwnerLicenceFeignVO, truckOwnerUserIdCardVO, param, host);
//设置轨迹
generateRouteList(gdRouteDTO, param);
return param;
......@@ -98,7 +99,7 @@ public class TransportSyncServiceImpl implements TransportSyncService {
FeignAddressVO.Address sendAddress,
FeignAddressVO.Address receiveAddress, FeignOrderVO orderInfoFeign,
SettlementOwnerDetail settlementOwnerDetail,
SettlementDriverDetail settlementDriverDetail
SettlementDriverDetail settlementDriverDetail, String host
) {
param.setChildNo(orderChild.getChildNo());
param.setCreateTime(DateUtils.formatDateTime(orderChild.getCreateTime()).get());
......@@ -149,9 +150,9 @@ public class TransportSyncServiceImpl implements TransportSyncService {
List<OrderChildImage> orderChildImages = listOptional.get();
for (OrderChildImage image : orderChildImages) {
if (image.getType().equals(1)) {
loadPoundImages.add(documentFeign.getHost().getData() + image.getImage());
loadPoundImages.add(host + image.getImage());
} else {
unLoadPoundImages.add(documentFeign.getHost().getData() + image.getImage());
unLoadPoundImages.add(host + image.getImage());
}
}
param.setLoadPoundImages(loadPoundImages);
......@@ -193,7 +194,7 @@ public class TransportSyncServiceImpl implements TransportSyncService {
}
//车辆信息
public void generateTruckInfo(OrderChild orderChild, ThirdOrderChildBrokerParam param) {
public void generateTruckInfo(OrderChild orderChild, ThirdOrderChildBrokerParam param, String host) {
TruckInfoFeignVo truckInfoFeignVo = truckFeign.getTruckInfoWithTransport(orderChild.getTruckId()).getData();
OrderChildTruckInfoDTO truckInfoDTO = new OrderChildTruckInfoDTO();
DriverInfoFeignVo ownerInfo = driverFeign.getDriverInfo(orderChild.getTruckOwnUserNo()).getData();
......@@ -204,10 +205,10 @@ public class TransportSyncServiceImpl implements TransportSyncService {
truckInfoDTO.setLoad(truckInfoFeignVo.getLoad());
truckInfoDTO.setGrossMass(truckInfoFeignVo.getGrossMass() == null ? null : truckInfoFeignVo.getGrossMass().intValue());
truckInfoDTO.setRoadTransportCertificateNo(truckInfoFeignVo.getRoadTransportCertificateNo());
truckInfoDTO.setLicenceImgMain(documentFeign.getHost().getData() + truckInfoFeignVo.getLicenceImgMain());
truckInfoDTO.setLicenceImgSecond(documentFeign.getHost().getData() + truckInfoFeignVo.getLicenceImgSecond());
truckInfoDTO.setLicenceImgSecondBack(documentFeign.getHost().getData() + truckInfoFeignVo.getLicenceImgSecondBack());
truckInfoDTO.setTransportLicenceImg(documentFeign.getHost().getData() + truckInfoFeignVo.getTransportLicenceImg());
truckInfoDTO.setLicenceImgMain(host + truckInfoFeignVo.getLicenceImgMain());
truckInfoDTO.setLicenceImgSecond(host + truckInfoFeignVo.getLicenceImgSecond());
truckInfoDTO.setLicenceImgSecondBack(host + truckInfoFeignVo.getLicenceImgSecondBack());
truckInfoDTO.setTransportLicenceImg(host + truckInfoFeignVo.getTransportLicenceImg());
if (StringUtils.isNotBlank(truckInfoFeignVo.getPowerType())) {
//"车辆燃料类型 1：柴油 2 天然气 3其他 4新能源/电"
truckInfoDTO.setPowerType(PowerTypeEnum.Type.getCodeByName(truckInfoFeignVo.getPowerType()));
......@@ -222,19 +223,19 @@ public class TransportSyncServiceImpl implements TransportSyncService {
// 挂车
if (Objects.equals(truckInfoFeignVo.getTruckType(), 1)) {
truckInfoDTO.setTruckNo2(truckInfoFeignVo.getTruckNo2());
truckInfoDTO.setLicenceImgMain2(StringUtils.isBlank(truckInfoFeignVo.getLicenceImgMain2())? null : documentFeign.getHost().getData() + truckInfoFeignVo.getLicenceImgMain2());
truckInfoDTO.setLicenceImgSecond2(StringUtils.isBlank(truckInfoFeignVo.getLicenceImgSecond2())? null : documentFeign.getHost().getData() + truckInfoFeignVo.getLicenceImgSecond2());
truckInfoDTO.setLicenceImgSecond2Back(StringUtils.isBlank(truckInfoFeignVo.getLicenceImgSecond2Back())? null : documentFeign.getHost().getData() + truckInfoFeignVo.getLicenceImgSecond2Back());
truckInfoDTO.setLicenceImgMain2(StringUtils.isBlank(truckInfoFeignVo.getLicenceImgMain2())? null : host + truckInfoFeignVo.getLicenceImgMain2());
truckInfoDTO.setLicenceImgSecond2(StringUtils.isBlank(truckInfoFeignVo.getLicenceImgSecond2())? null : host + truckInfoFeignVo.getLicenceImgSecond2());
truckInfoDTO.setLicenceImgSecond2Back(StringUtils.isBlank(truckInfoFeignVo.getLicenceImgSecond2Back())? null : host + truckInfoFeignVo.getLicenceImgSecond2Back());
truckInfoDTO.setLicenceImgMain2EndTime(truckInfoFeignVo.getLicenceImgMain2EndTime()==null? null : DateUtils.formatDateTime(truckInfoFeignVo.getLicenceImgMain2EndTime()).get());
truckInfoDTO.setRoadTransportCertificateNo2(truckInfoFeignVo.getRoadTransportCertificateNo2());
truckInfoDTO.setTransportLicenceImg2(StringUtils.isBlank(truckInfoFeignVo.getTransportLicenceImg2())? null : documentFeign.getHost().getData() + truckInfoFeignVo.getTransportLicenceImg2());
truckInfoDTO.setTransportLicenceImg2(StringUtils.isBlank(truckInfoFeignVo.getTransportLicenceImg2())? null : host + truckInfoFeignVo.getTransportLicenceImg2());
}
param.setTruckInfoDTO(truckInfoDTO);
}
//车主信息
public void generateTruckDriverInfoDTO(DriverInfoFeignVo truckOwnerInfo, DriverLicenceFeignVO licenceVO, UserIdCardVO idCardVO, ThirdOrderChildBrokerParam param) {
public void generateTruckDriverInfoDTO(DriverInfoFeignVo truckOwnerInfo, DriverLicenceFeignVO licenceVO, UserIdCardVO idCardVO, ThirdOrderChildBrokerParam param, String host) {
OrderChildDriverInfoDTO dto = new OrderChildDriverInfoDTO();
dto.setMobile(truckOwnerInfo.getMobile());
dto.setName(truckOwnerInfo.getName());
......@@ -243,19 +244,19 @@ public class TransportSyncServiceImpl implements TransportSyncService {
dto.setCardStartTime(idCardVO.getCardStartTime());
dto.setCardEndTime(idCardVO.getCardEndTime());
dto.setCardLongTerm(idCardVO.getCardLongTerm());
dto.setCardFrontImg(documentFeign.getHost().getData() + idCardVO.getCardFaceImg());
dto.setCardBackImg(documentFeign.getHost().getData() + idCardVO.getCardBackImg());
dto.setFaceCardImg(documentFeign.getHost().getData() + idCardVO.getCardFaceImg());
dto.setCardFrontImg(host + idCardVO.getCardFaceImg());
dto.setCardBackImg(host + idCardVO.getCardBackImg());
dto.setFaceCardImg(host + idCardVO.getCardFaceImg());
if (null != licenceVO) {
dto.setLicenceNo(licenceVO.getLicenceNo());
dto.setLicenseTime(licenceVO.getLicenceTime() == null ? null : DateUtils.formatDateTime(licenceVO.getLicenceTime()).get());
dto.setLicenceClass(licenceVO.getLicenceClass());
dto.setLicenceImg(documentFeign.getHost().getData() + licenceVO.getLicenceImg());
dto.setLicenceBackImg(documentFeign.getHost().getData() + licenceVO.getLicenceBackImg());
dto.setLicenceImg(host + licenceVO.getLicenceImg());
dto.setLicenceBackImg(host + licenceVO.getLicenceBackImg());
dto.setLicenceStartTime(Optional.ofNullable(licenceVO.getLicenceStartTime()).isPresent() ? DateUtils.formatDateTime(licenceVO.getLicenceStartTime()).get() : null);
dto.setLicenceEndTime(Optional.ofNullable(licenceVO.getLicenceEndTime()).isPresent() ? DateUtils.formatDateTime(licenceVO.getLicenceEndTime()).get() : "2099-12-31 00:00:00");
dto.setOccupationalLicenceNo(licenceVO.getOccupationalLicenceNo());
dto.setOccupationalLicenceImg(documentFeign.getHost().getData() + licenceVO.getOccupationalLicenceImg());
dto.setOccupationalLicenceImg(host + licenceVO.getOccupationalLicenceImg());
dto.setOccupationalStartTime(licenceVO.getOccupationalLicenceStartTime() == null ? null : DateUtils.formatDateTime(licenceVO.getOccupationalLicenceStartTime()).get());
dto.setOccupationalEndTime(licenceVO.getOccupationalLicenceEndTime() == null ? null : DateUtils.formatDateTime(licenceVO.getOccupationalLicenceEndTime()).get());
dto.setLicenceIssueOrganization(licenceVO.getLicenceIssueOrganization());
......@@ -266,7 +267,7 @@ public class TransportSyncServiceImpl implements TransportSyncService {
}
//司机信息
public void generateDriverInfoDTO(DriverInfoFeignVo driverInfo, DriverLicenceFeignVO licenceVO, UserIdCardVO idCardVO, ThirdOrderChildBrokerParam param) {
public void generateDriverInfoDTO(DriverInfoFeignVo driverInfo, DriverLicenceFeignVO licenceVO, UserIdCardVO idCardVO, ThirdOrderChildBrokerParam param, String host) {
OrderChildDriverInfoDTO dto = new OrderChildDriverInfoDTO();
dto.setMobile(driverInfo.getMobile());
dto.setName(driverInfo.getName());
......@@ -275,18 +276,18 @@ public class TransportSyncServiceImpl implements TransportSyncService {
dto.setCardStartTime(idCardVO.getCardStartTime());
dto.setCardEndTime(idCardVO.getCardEndTime());
dto.setCardLongTerm(idCardVO.getCardLongTerm());
dto.setCardFrontImg(documentFeign.getHost().getData() + idCardVO.getCardFaceImg());
dto.setCardBackImg(documentFeign.getHost().getData() + idCardVO.getCardBackImg());
dto.setFaceCardImg(documentFeign.getHost().getData() + idCardVO.getCardFaceImg());
dto.setCardFrontImg(host + idCardVO.getCardFaceImg());
dto.setCardBackImg(host + idCardVO.getCardBackImg());
dto.setFaceCardImg(host + idCardVO.getCardFaceImg());
dto.setLicenceNo(licenceVO.getLicenceNo());
dto.setLicenseTime(licenceVO.getLicenceTime() == null ? null : DateUtils.formatDateTime(licenceVO.getLicenceTime()).get());
dto.setLicenceClass(licenceVO.getLicenceClass());
dto.setLicenceImg(documentFeign.getHost().getData() + licenceVO.getLicenceImg());
dto.setLicenceBackImg(documentFeign.getHost().getData() + licenceVO.getLicenceBackImg());
dto.setLicenceImg(host + licenceVO.getLicenceImg());
dto.setLicenceBackImg(host + licenceVO.getLicenceBackImg());
dto.setLicenceStartTime(licenceVO.getLicenceStartTime() == null ? null : DateUtils.formatDateTime(licenceVO.getLicenceStartTime()).get());
dto.setLicenceEndTime(Optional.ofNullable(licenceVO.getLicenceEndTime()).isPresent() ? DateUtils.formatDateTime(licenceVO.getLicenceEndTime()).get() : "2099-12-31 00:00:00");
dto.setOccupationalLicenceNo(licenceVO.getOccupationalLicenceNo());
dto.setOccupationalLicenceImg(documentFeign.getHost().getData() + licenceVO.getOccupationalLicenceImg());
dto.setOccupationalLicenceImg(host + licenceVO.getOccupationalLicenceImg());
dto.setOccupationalStartTime(licenceVO.getOccupationalLicenceStartTime() == null ? null : DateUtils.formatDateTime(licenceVO.getOccupationalLicenceStartTime()).get());
dto.setOccupationalEndTime(licenceVO.getOccupationalLicenceEndTime() == null ? null : DateUtils.formatDateTime(licenceVO.getOccupationalLicenceEndTime()).get());
dto.setLicenceIssueOrganization(licenceVO.getLicenceIssueOrganization());
......@@ -295,7 +296,7 @@ public class TransportSyncServiceImpl implements TransportSyncService {
}
//司机银行卡
public void generateDriverBankCard(BankCardVO bankCardVO, UserIdCardVO idCardVO, ThirdOrderChildBrokerParam param) {
public void generateDriverBankCard(BankCardVO bankCardVO, UserIdCardVO idCardVO, ThirdOrderChildBrokerParam param, String host) {
OrderChildBankInfoDTO dto = new OrderChildBankInfoDTO();
if (null != bankCardVO) {
dto.setName(bankCardVO.getName());
......@@ -307,13 +308,13 @@ public class TransportSyncServiceImpl implements TransportSyncService {
dto.setBank(bankCardVO.getBank());
dto.setBankCode(bankCardVO.getBankCode());
}
dto.setIdCardFrontImg(documentFeign.getHost().getData() + idCardVO.getCardFaceImg());
dto.setIdCardBackImg(documentFeign.getHost().getData() + idCardVO.getCardBackImg());
dto.setIdCardFrontImg(host + idCardVO.getCardFaceImg());
dto.setIdCardBackImg(host + idCardVO.getCardBackImg());
param.setDriverBankInfoDTO(dto);
}
//车主银行卡
public void generateTruckDriverBankCard(BankCardVO bankCardVO, UserIdCardVO idCardVO, ThirdOrderChildBrokerParam param) {
public void generateTruckDriverBankCard(BankCardVO bankCardVO, UserIdCardVO idCardVO, ThirdOrderChildBrokerParam param, String host) {
OrderChildBankInfoDTO dto = new OrderChildBankInfoDTO();
if (null != bankCardVO) {
dto.setName(bankCardVO.getName());
......@@ -325,8 +326,8 @@ public class TransportSyncServiceImpl implements TransportSyncService {
dto.setBank(bankCardVO.getBank());
dto.setBankCode(bankCardVO.getBankCode());
}
dto.setIdCardFrontImg(documentFeign.getHost().getData() + idCardVO.getCardFaceImg());
dto.setIdCardBackImg(documentFeign.getHost().getData() + idCardVO.getCardBackImg());
dto.setIdCardFrontImg(host + idCardVO.getCardFaceImg());
dto.setIdCardBackImg(host + idCardVO.getCardBackImg());
param.setTruckDriverBankInfoDTO(dto);
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论