Skip to content

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

同步运单

上级 ae01ca1b
隐藏空白字符变更
内嵌 并排
正在显示 包含 27 行增加 和 22 行删除
performance-web/src/main/java/com/clx/performance/service/impl/TransportSyncServiceImpl.java
浏览文件 @ cb5b253a
......@@ -10,6 +10,8 @@ import com.clx.performance.dto.gd.GdRouteDTO;
import com.clx.performance.model.OrderChild;
import com.clx.performance.model.OrderChildImage;
import com.clx.performance.model.OrderGoods;
import com.clx.performance.model.settle.SettlementDriverDetail;
import com.clx.performance.model.settle.SettlementOwnerDetail;
import com.clx.performance.param.feign.transport.*;
import com.clx.performance.service.TransportSyncService;
import com.clx.performance.utils.gd.GdService;
......@@ -17,6 +19,7 @@ import com.clx.user.feign.DriverFeign;
import com.clx.user.feign.TruckFeign;
import com.clx.user.vo.feign.*;
import com.msl.common.base.Optional;
import com.msl.common.utils.DateUtils;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
......@@ -87,7 +90,9 @@ public class TransportSyncServiceImpl implements TransportSyncService {
private void generateBaseInfo(OrderChild orderChild, OrderGoods orderGoods, ThirdOrderChildBrokerParam param,
FeignAddressVO.Address sendAddress,
FeignAddressVO.Address receiveAddress, FeignOrderVO orderInfoFeign) {
FeignAddressVO.Address receiveAddress, FeignOrderVO orderInfoFeign,
SettlementOwnerDetail settlementOwnerDetail
) {
param.setChildNo(orderChild.getChildNo());
param.setFreightPrice(Integer.valueOf(orderChild.getFreightPrice().toString()));
param.setFreight(Integer.valueOf(orderChild.getFreight().toString()));
......@@ -111,19 +116,19 @@ public class TransportSyncServiceImpl implements TransportSyncService {
param.setLoadLatitude(orderGoods.getSendLatitude().toString());
param.setUnloadLongitude(orderGoods.getReceiveLongitude().toString());
param.setUnloadLatitude(orderGoods.getReceiveLatitude().toString());
param.setPayTime(orderChild.getPayTime().toString());
param.setLoadTime(orderChild.getLoadTime().toString());
param.setUnloadTime(orderChild.getUnloadTime().toString());
param.setPayFinishedTime(orderChild.getFinishTime().toString());
param.setPayTime(DateUtils.formatDateTime(orderChild.getPayTime()).get());
param.setLoadTime(DateUtils.formatDateTime(orderChild.getLoadTime()).get());
param.setUnloadTime(DateUtils.formatDateTime(orderChild.getUnloadTime()).get());
param.setPayFinishedTime(DateUtils.formatDateTime(orderChild.getFinishTime()).get());
param.setReceiveNet(orderChild.getUnloadNet());
param.setAdvanceType(0);
param.setSourceOrderNo(orderChild.getOrderNo());
param.setSourceGoodsNo(orderChild.getOrderGoodsNo());
param.setSourceInvoicingType();
param.setSourceFreightPrice();
param.setSourceInvoicingPrice();
param.setSourceLossPrice();
param.setSourceInvoicingType(settlementOwnerDetail.getSettlementWay());
param.setSourceFreightPrice(settlementOwnerDetail.getFreightPrice());
param.setSourceInvoicingPrice(settlementOwnerDetail.getInvoiceFreight());
param.setSourceLossPrice(settlementOwnerDetail.getLossFreight());
param.setInvoiceRelationNo(orderInfoFeign.getContactPhoneOwner());
Optional<List<OrderChildImage>> listOptional = orderChildImageDao.listLoadAndUnload(orderChild.getChildNo());
......@@ -170,8 +175,8 @@ public class TransportSyncServiceImpl implements TransportSyncService {
orderGoodsDto.setGoodsPrice(Integer.valueOf(orderChild.getOrderFreightPrice().toString()));
orderGoodsDto.setTransPrice(Integer.valueOf(orderChild.getFreightPrice().toString()));
orderGoodsDto.setGoodsAmount(orderGoods.getExtractWeight());
orderGoodsDto.setExtractTime(orderGoods.getLastLoadTime().toString());
orderGoodsDto.setArriveTime(orderGoods.getLastArriveSendTime().toString());
orderGoodsDto.setExtractTime(DateUtils.formatDateTime(orderGoods.getLastLoadTime()).get());
orderGoodsDto.setArriveTime(DateUtils.formatDateTime(orderGoods.getLastArriveSendTime()).get());
param.setOrderInfoDTO(orderGoodsDto);
}
//车辆信息
......@@ -196,7 +201,7 @@ public class TransportSyncServiceImpl implements TransportSyncService {
truckInfoDTO.setLicenceIssueOrganization(truckInfoFeignVo.getLicenceIssueOrganization());
truckInfoDTO.setRegisterDate(truckInfoFeignVo.getRegisterDate().toString());
truckInfoDTO.setLicenceIssueDate(truckInfoFeignVo.getLicenceIssueDate().toString());
truckInfoDTO.setDrivingLicenseEndTime(truckInfoFeignVo.getLicenceImgMainEndTime().toString());
truckInfoDTO.setDrivingLicenseEndTime(DateUtils.formatDateTime(truckInfoFeignVo.getLicenceImgMainEndTime()).get());
param.setTruckInfoDTO(truckInfoDTO);
}
......@@ -214,16 +219,16 @@ public class TransportSyncServiceImpl implements TransportSyncService {
dto.setCardBackImg(idCardVO.getCardBackImg());
dto.setFaceCardImg(idCardVO.getCardFaceImg());
dto.setLicenceNo(licenceVO.getLicenceNo());
dto.setLicenseTime(licenceVO.getLicenceTime().toString());
dto.setLicenseTime(DateUtils.formatDateTime(licenceVO.getLicenceTime()).get());
dto.setLicenceClass(licenceVO.getLicenceClass());
dto.setLicenceImg(licenceVO.getLicenceImg());
dto.setLicenceBackImg(licenceVO.getLicenceBackImg());
dto.setLicenceStartTime(licenceVO.getLicenceStartTime().toString());
dto.setLicenceEndTime(licenceVO.getLicenceEndTime().toString());
dto.setLicenceStartTime(DateUtils.formatDateTime(licenceVO.getLicenceStartTime()).get());
dto.setLicenceEndTime(DateUtils.formatDateTime(licenceVO.getLicenceEndTime()).get());
dto.setOccupationalLicenceNo(licenceVO.getOccupationalLicenceNo());
dto.setOccupationalLicenceImg(licenceVO.getOccupationalLicenceImg());
dto.setOccupationalStartTime(licenceVO.getOccupationalLicenceStartTime().toString());
dto.setOccupationalEndTime(licenceVO.getOccupationalLicenceEndTime().toString());
dto.setOccupationalStartTime(DateUtils.formatDateTime(licenceVO.getOccupationalLicenceStartTime()).get());
dto.setOccupationalEndTime(DateUtils.formatDateTime(licenceVO.getOccupationalLicenceEndTime()).get());
dto.setLicenceIssueOrganization(licenceVO.getLicenceIssueOrganization());
dto.setIdCardAddress(idCardVO.getAddress());
param.setTruckDriverInfoDTO(dto);
......@@ -243,16 +248,16 @@ public class TransportSyncServiceImpl implements TransportSyncService {
dto.setCardBackImg(idCardVO.getCardBackImg());
dto.setFaceCardImg(idCardVO.getCardFaceImg());
dto.setLicenceNo(licenceVO.getLicenceNo());
dto.setLicenseTime(licenceVO.getLicenceTime().toString());
dto.setLicenseTime(DateUtils.formatDateTime(licenceVO.getLicenceTime()).get());
dto.setLicenceClass(licenceVO.getLicenceClass());
dto.setLicenceImg(licenceVO.getLicenceImg());
dto.setLicenceBackImg(licenceVO.getLicenceBackImg());
dto.setLicenceStartTime(licenceVO.getLicenceStartTime().toString());
dto.setLicenceEndTime(licenceVO.getLicenceEndTime().toString());
dto.setLicenceStartTime(DateUtils.formatDateTime(licenceVO.getLicenceStartTime()).get());
dto.setLicenceEndTime(DateUtils.formatDateTime(licenceVO.getLicenceEndTime()).get());
dto.setOccupationalLicenceNo(licenceVO.getOccupationalLicenceNo());
dto.setOccupationalLicenceImg(licenceVO.getOccupationalLicenceImg());
dto.setOccupationalStartTime(licenceVO.getOccupationalLicenceStartTime().toString());
dto.setOccupationalEndTime(licenceVO.getOccupationalLicenceEndTime().toString());
dto.setOccupationalStartTime(DateUtils.formatDateTime(licenceVO.getOccupationalLicenceStartTime()).get());
dto.setOccupationalEndTime(DateUtils.formatDateTime(licenceVO.getOccupationalLicenceEndTime()).get());
dto.setLicenceIssueOrganization(licenceVO.getLicenceIssueOrganization());
dto.setIdCardAddress(idCardVO.getAddress());
param.setDriverInfoDTO(dto);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论