ods

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/ois/issue/OrderSaveManagerImpl.java

             etcOrderVehicleInfo.setEngineNum(vehicle.getEngineNum());
             etcOrderVehicleInfo.setType(vehicle.getType());
             etcOrderVehicleInfo.setUseCharacter(vehicle.getUseCharacter());
-            etcOrderVehicleInfo.setRegisterDate(vehicle.getRegisterDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            etcOrderVehicleInfo.setIssueDate(vehicle.getRegisterDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            etcOrderVehicleInfo.setRegisterDate(vehicle.getRegisterDate());
+            etcOrderVehicleInfo.setIssueDate(vehicle.getRegisterDate());
             etcOrderVehicleInfo.setFileNum(vehicle.getFileNum());
             etcOrderVehicleInfo.setApprovedCount(vehicle.getApprovedCount());
             etcOrderVehicleInfo.setTotalMass(vehicle.getTotalMass().intValue());
             etcOrderVehicleInfo.setPermittedTowWeight(vehicle.getPermittedTowWeight().intValue());
             etcOrderVehicleInfo.setAxleDistance(vehicle.getAxleDistance());
             etcOrderVehicleInfo.setTestRecord(vehicle.getTestRecord());
-//            etcOrderVehicleInfo.setWheelCount(vehicle.getWheelCount());
+            etcOrderVehicleInfo.setWheelCount(vehicle.getVehicleWheelCount());
             etcOrderVehicleInfo.setAxisType(vehicle.getAxisType());
-//            etcOrderVehicleInfo.setOwnerIdNum(vehicle.getOwnerIdNum());
-//            etcOrderVehicleInfo.setOwnerIdType(vehicle.getOwnerIdType());
+            etcOrderVehicleInfo.setOwnerIdNum(vehicle.getOwnerIdNum());
+            etcOrderVehicleInfo.setOwnerIdType(vehicle.getOwnerIdType().getCode());
             etcOrderVehicleInfo.setOwnerTel(vehicle.getOwnerTel());
-//            etcOrderVehicleInfo.setTransportIdNum(vehicle.getTransportIdNum());
+            etcOrderVehicleInfo.setTransportIdNum(vehicle.getTransportIdNum());
 //            etcOrderVehicleInfo.setRoadTransCertUrl(vehicle.getRoadTransportPermitPicUrl());
         }
         etcOrderVehicleInfo.setCustomerType(order.getUserType().getCode());
         etcOrderUserInfo.setIdentNo(order.getCustomerIdNum());
         etcOrderUserInfo.setIdentType(order.getCustomerIdType().getCode());
         etcOrderUserInfo.setUserMobile(order.getCustomerTel());
-//        etcOrderUserInfo.setAddress(ext.getCustomerAddress());
-//        etcOrderUserInfo.setDepartment(ext.getCustomerDepartment());
+        etcOrderUserInfo.setAddress(ext.getCustomerAddress());
+        etcOrderUserInfo.setDepartment(ext.getCustomerDepartment());
         etcOrderUserInfo.setAgentName(order.getAgentName());
         etcOrderUserInfo.setAgentIdType(order.getAgentIdType().getCode());
         etcOrderUserInfo.setAgentIdNum(order.getAgentIdNum());
         etcApplyOrder.setOrgcode(order.getAccountId());
         if (order.getOrderStatus() == IssueOrderStatus.CANCEL) {
             //需要判断退货还是撤销
-            if (ShippingStatus.RECEIVED.name().equals(order.getShippingStatus())) {
+            if (ShippingStatus.RECEIVED.equals(order.getShippingStatus())) {
                 etcApplyOrder.setOrderstatus(-3);
             } else {
                 etcApplyOrder.setOrderstatus(-2);
             }
-        } else if (order.getOrderStep().equals("7")) {
+        } else if (order.getOrderStep().getCode().equals(7)) {
             etcApplyOrder.setOrderstatus(-1);
         } else {
             //判断审核之后
         etcApplyOrder.setReviewer(order.getAuditOpId());
         etcApplyOrder.setReviewopinion(ext.getAuditFailureCase());
         etcApplyOrder.setReviewstatus(order.getArtificialStatus() == 0?0:1);
-        etcApplyOrder.setDeliverystatus(ShippingStatus.RECEIVED.name().equals(order.getShippingStatus())?1:0);
+        etcApplyOrder.setDeliverystatus(ShippingStatus.RECEIVED.equals(order.getShippingStatus())?1:0);
         etcApplyOrder.setCardid(order.getCardId());
         etcApplyOrder.setObuid(order.getObuId());
         etcApplyOrder.setPromoterchannelnum(order.getAccountId());
         etcApplyOrder.setOpencardtime(order.getCardEnableTime());
         etcApplyOrder.setOpenobutime(order.getObuEnableTime());
         etcApplyOrder.setActivetime(order.getActivationTime());
-//        etcApplyOrder.setCanceltime(ext.getCancelTime());
+        etcApplyOrder.setCanceltime(order.getCancelTime());
         etcApplyOrder.setCancelreason(ext.getCancelReason());
         etcApplyOrder.setReturngoodstime(order.getReturnGoodsTime());
         etcApplyOrder.setDeliverytime(order.getDeliveryTime());
             etcApplyOrder.setApplysourcetype(6);
         } else if (SourceType.SERVICE_HALL.equals(order.getOrderSource())) {
             etcApplyOrder.setApplysourcetype(1);
+        }else if (SourceType.CHANNEL.equals(order.getOrderSource())) {
+            etcApplyOrder.setApplysourcetype(7);
         }
         etcApplyOrder.setCreatetime(order.getInsertTime());
         etcApplyOrder.setUpdatetime(order.getUpdateTime());