同步网络货运

performance-web/src/main/java/com/clx/performance/service/impl/TransportSyncServiceImpl.java

@@ -8,10 +8,7 @@ import com.clx.performance.dao.OrderChildImageDao;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderChildImage;
 import com.clx.performance.model.OrderGoods;
-import com.clx.performance.param.feign.transport.OrderChildDriverInfoDTO;
-import com.clx.performance.param.feign.transport.OrderChildTruckInfoDTO;
-import com.clx.performance.param.feign.transport.ThirdOrderChildBrokerParam;
-import com.clx.performance.param.feign.transport.ThirdOrderInfoDTO;
+import com.clx.performance.param.feign.transport.*;
 import com.clx.performance.service.TransportSyncService;
 import com.clx.user.feign.DriverFeign;
 import com.clx.user.feign.TruckFeign;
@@ -49,7 +46,7 @@ public class TransportSyncServiceImpl implements TransportSyncService {
         generateTruckInfo(orderChild,param);
         SyncOrderChildVO syncOrderChildVO = driverFeign.getSyncOrderChild(orderChild.getDriverUserNo(), orderChild.getTruckOwnUserNo()).getData();
         DriverInfoFeignVo truckOwnerInfo = syncOrderChildVO.getTruckOwnerInfo();
-
+        BankCardVO driverBankCard = syncOrderChildVO.getDriverBankCard();
 
         return param;
     }
@@ -57,9 +54,7 @@ public class TransportSyncServiceImpl implements TransportSyncService {
     private void generateBaseInfo(OrderChild orderChild, OrderGoods orderGoods, ThirdOrderChildBrokerParam param,
                                   FeignAddressVO.Address sendAddress,
                                   FeignAddressVO.Address receiveAddress, FeignOrderVO orderInfoFeign) {
-        param.setOrderNo(orderChild.getOrderNo());
         param.setChildNo(orderChild.getChildNo());
-        param.setTruckNo(orderChild.getTruckNo());
         param.setFreightPrice(Integer.valueOf(orderChild.getFreightPrice().toString()));
         param.setFreight(Integer.valueOf(orderChild.getFreight().toString()));
 
@@ -87,9 +82,7 @@ public class TransportSyncServiceImpl implements TransportSyncService {
         param.setUnloadTime(orderChild.getUnloadTime().toString());
         param.setPayFinishedTime(orderChild.getFinishTime().toString());
         param.setReceiveNet(orderChild.getUnloadNet());
-        param.setGoodsName(orderChild.getGoodsName());
         param.setAdvanceType(0);
-        param.setGoodsPrice(Integer.valueOf(orderChild.getOrderFreightPrice().toString()));
         param.setInvoiceRelationNo(orderInfoFeign.getContactPhoneOwner());
         Optional<List<OrderChildImage>> listOptional = orderChildImageDao.listLoadAndUnload(orderChild.getChildNo());
         if (listOptional.isPresent()) {
@@ -165,13 +158,12 @@ public class TransportSyncServiceImpl implements TransportSyncService {
         param.setTruckInfoDTO(truckInfoDTO);
     }
 
+    //车主信息
     public void generateTruckDriverInfoDTO(DriverInfoFeignVo truckOwnerInfo,DriverLicenceFeignVO licenceVO, UserIdCardVO idCardVO, ThirdOrderChildBrokerParam param) {
         OrderChildDriverInfoDTO dto = new OrderChildDriverInfoDTO();
         dto.setMobile(truckOwnerInfo.getMobile());
         dto.setName(truckOwnerInfo.getName());
         dto.setSex(idCardVO.getSex());
-        dto.setHeadImg(truckOwnerInfo.getHeadImg());
-        dto.setWalletCode(truckOwnerInfo.getWalletCode() + "");
         dto.setCardNo(idCardVO.getCardNo());
         dto.setCardStartTime(idCardVO.getCardStartTime());
         dto.setCardEndTime(idCardVO.getCardEndTime());
@@ -186,7 +178,50 @@ public class TransportSyncServiceImpl implements TransportSyncService {
         dto.setLicenceBackImg(licenceVO.getLicenceBackImg());
         dto.setLicenceStartTime(licenceVO.getLicenceStartTime().toString());
         dto.setLicenceEndTime(licenceVO.getLicenceEndTime().toString());
-
+        dto.setOccupationalLicenceNo(licenceVO.getOccupationalLicenceNo());
+        dto.setOccupationalLicenceImg(licenceVO.getOccupationalLicenceImg());
+        dto.setOccupationalStartTime(licenceVO.getOccupationalLicenceStartTime().toString());
+        dto.setOccupationalEndTime(licenceVO.getOccupationalLicenceEndTime().toString());
+        dto.setLicenceIssueOrganization(licenceVO.getLicenceIssueOrganization());
+        dto.setIdCardAddress(idCardVO.getAddress());
         param.setTruckDriverInfoDTO(dto);
     }
+
+    //司机信息
+    public void generateDriverInfoDTO(DriverInfoFeignVo driverInfo,DriverLicenceFeignVO licenceVO, UserIdCardVO idCardVO, ThirdOrderChildBrokerParam param) {
+        OrderChildDriverInfoDTO dto = new OrderChildDriverInfoDTO();
+        dto.setMobile(driverInfo.getMobile());
+        dto.setName(driverInfo.getName());
+        dto.setSex(idCardVO.getSex());
+        dto.setCardNo(idCardVO.getCardNo());
+        dto.setCardStartTime(idCardVO.getCardStartTime());
+        dto.setCardEndTime(idCardVO.getCardEndTime());
+        dto.setCardLongTerm(idCardVO.getCardLongTerm());
+        dto.setCardFrontImg(idCardVO.getCardFaceImg());
+        dto.setCardBackImg(idCardVO.getCardBackImg());
+        dto.setFaceCardImg(idCardVO.getCardFaceImg());
+        dto.setLicenceNo(licenceVO.getLicenceNo());
+        dto.setLicenseTime(licenceVO.getLicenceTime().toString());
+        dto.setLicenceClass(licenceVO.getLicenceClass());
+        dto.setLicenceImg(licenceVO.getLicenceImg());
+        dto.setLicenceBackImg(licenceVO.getLicenceBackImg());
+        dto.setLicenceStartTime(licenceVO.getLicenceStartTime().toString());
+        dto.setLicenceEndTime(licenceVO.getLicenceEndTime().toString());
+        dto.setOccupationalLicenceNo(licenceVO.getOccupationalLicenceNo());
+        dto.setOccupationalLicenceImg(licenceVO.getOccupationalLicenceImg());
+        dto.setOccupationalStartTime(licenceVO.getOccupationalLicenceStartTime().toString());
+        dto.setOccupationalEndTime(licenceVO.getOccupationalLicenceEndTime().toString());
+        dto.setLicenceIssueOrganization(licenceVO.getLicenceIssueOrganization());
+        dto.setIdCardAddress(idCardVO.getAddress());
+        param.setDriverInfoDTO(dto);
+    }
+
+    //司机银行卡
+    public void generateDriverBankCard(BankCardVO bankCardVO, ThirdOrderChildBrokerParam param) {
+        OrderChildBankInfoDTO dto = new OrderChildBankInfoDTO();
+        dto.setName(bankCardVO.getName());
+        dto.setCardNo(bankCardVO.getCardNo());
+        dto.setMobile(bankCardVO.getMobile());
+        dto.setAccountType(Integer.valueOf(bankCardVO.getAccountType()));
+    }
 }