~

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/order/OrderInitManager.java

@@ -79,9 +79,9 @@ public class OrderInitManager extends AbstractOrderManager<OrderInitRequest> {
     protected void businessValidateInternal(ErrorMsgBuilder builder, OrderInitRequest request, ServiceLogEvent event,
                                             Map<String, Object> dataStream) throws ServiceHandleException {
         //黄牌车暂不办理
-        if (PlateColorType.YELLOW.getCode() == request.getVehiclePlateColor()){
-            throw newBusinessException("黄牌车辆暂不可办理，敬请期待");
-        }
+//        if (PlateColorType.YELLOW.getCode() == request.getVehiclePlateColor()){
+//            throw newBusinessException("黄牌车辆暂不可办理，敬请期待");
+//        }
 
         String lockKey = MyFinals.VEHICLE_LOCK_KEY + request.getVehiclePlate();
         lock = redissonClient.getLock(lockKey);

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/vehicleInfoChange/VehicleInfoChangeManager.java

@@ -1,17 +1,5 @@
 package cn.com.taiji.ias.manager.vehicleInfoChange;
 
-import static cn.com.taiji.core.entity.dict.issue.TransactionBizType.ISSUE_VEHICLE_SYNC;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Objects;
-
-import cn.com.taiji.ias.dict.AgencyConfigType;
-import cn.com.taiji.ias.manager.agencyConfig.AgencyConfigManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.pub.BeanTools;
@@ -28,7 +16,10 @@ import cn.com.taiji.core.entity.dict.ass.AssOrderStatus;
 import cn.com.taiji.core.entity.dict.ass.AssOrderType;
 import cn.com.taiji.core.entity.dict.ass.ReSignStatus;
 import cn.com.taiji.core.entity.dict.ass.UpgradeStatus;
-import cn.com.taiji.core.entity.dict.basic.*;
+import cn.com.taiji.core.entity.dict.basic.CardStatus;
+import cn.com.taiji.core.entity.dict.basic.ObuStatus;
+import cn.com.taiji.core.entity.dict.basic.SourceType;
+import cn.com.taiji.core.entity.dict.basic.UserType;
 import cn.com.taiji.core.entity.dict.ygz.DataSourceEnum;
 import cn.com.taiji.core.entity.dict.ygz.Operation;
 import cn.com.taiji.core.entity.issue.TransactionStatus;
@@ -51,11 +42,22 @@ import cn.com.taiji.core.repo.jpa.basic.QtkCustomerInfoRepo;
 import cn.com.taiji.core.repo.jpa.basic.QtkObuInfoRepo;
 import cn.com.taiji.core.repo.jpa.basic.QtkVehicleInfoRepo;
 import cn.com.taiji.core.repo.jpa.log.IasInterfaceLogRepo;
+import cn.com.taiji.ias.dict.AgencyConfigType;
 import cn.com.taiji.ias.manager.AbstractCommManager;
 import cn.com.taiji.ias.manager.GlobalTransactionManager;
+import cn.com.taiji.ias.manager.agencyConfig.AgencyConfigManager;
 import cn.com.taiji.ias.manager.audit.VerificationRuleManager;
 import cn.com.taiji.ias.manager.ygz.YgzVehicleUploadManager;
 import cn.com.taiji.ias.model.issue.CarOcrCheck;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Objects;
+
+import static cn.com.taiji.core.entity.dict.issue.TransactionBizType.ISSUE_VEHICLE_SYNC;
 
 @Service
 public class VehicleInfoChangeManager extends AbstractCommManager
@@ -229,33 +231,33 @@ public class VehicleInfoChangeManager extends AbstractCommManager
         apply.setOrderNo(assOrderinfo.getId());
         apply.setChangeType(changeType);
         // 旧车辆数据
-        apply.setOldVehicleId(oldVehicleInfo.getVehicleId());
-        apply.setOldVehiclePlate(oldVehicleInfo.getVehiclePlate());
-        apply.setOldVehiclePlateColor(oldVehicleInfo.getVehiclePlateColor());
-        apply.setOldUseCharacter(oldVehicleInfo.getUseCharacter());
-        apply.setOldEngineNum(oldVehicleInfo.getEngineNum());
-        apply.setOldRegisterDate(oldVehicleInfo.getRegisterDate());
-        apply.setOldIssueDate(oldVehicleInfo.getIssueDate());
-        apply.setOldApprovedCount(oldVehicleInfo.getApprovedCount());
-        apply.setOldTotalMass(oldVehicleInfo.getTotalMass());
-        apply.setOldMaintenaceMass(oldVehicleInfo.getMaintenaceMass());
-        apply.setOldVehicleDimensions(oldVehicleInfo.getVehicleDimensions());
-        apply.setOldAxleCount(oldVehicleInfo.getAxleCount());
-        apply.setOldUseUserType(oldVehicleInfo.getUseUserType());
-        apply.setOldType(oldVehicleInfo.getType());
-        apply.setOldVehPosImgUrl(oldVehicleInfo.getVehPosImgUrl());
-        apply.setOldVehNegImgUrl(oldVehicleInfo.getVehNegImgUrl());
-        apply.setOldOwnerName(oldVehicleInfo.getOwnerName());
-        apply.setOldOwnerIdType(oldVehicleInfo.getOwnerIdType());
-        apply.setOldOwnerIdNum(oldVehicleInfo.getOwnerIdNum());
-        apply.setOldOwnerPosImgUrl(oldVehicleInfo.getOwnerPosImgUrl());
-        apply.setOldOwnerNegImgUrl(oldVehicleInfo.getOwnerNegImgUrl());
-        apply.setOldTransportIdNum(oldVehicleInfo.getTransportIdNum());
-        apply.setOldLicenseIdNum(oldVehicleInfo.getLicenseIdNum());
-        apply.setOldVehBodyUrl(oldVehicleInfo.getVehBodyUrl());
-        apply.setOldTractorSign(oldVehicleInfo.getTractorSign());
-        apply.setOldRoadTransportPermitPicUrl(oldVehicleInfo.getRoadTransportPermitPicUrl());
-        apply.setVehicleId(req.getVehiclePlate() + "_" + req.getVehiclePlateColor());
+//        apply.setOldVehicleId(oldVehicleInfo.getVehicleId());
+//        apply.setOldVehiclePlate(oldVehicleInfo.getVehiclePlate());
+//        apply.setOldVehiclePlateColor(oldVehicleInfo.getVehiclePlateColor());
+//        apply.setOldUseCharacter(oldVehicleInfo.getUseCharacter());
+//        apply.setOldEngineNum(oldVehicleInfo.getEngineNum());
+//        apply.setOldRegisterDate(oldVehicleInfo.getRegisterDate());
+//        apply.setOldIssueDate(oldVehicleInfo.getIssueDate());
+//        apply.setOldApprovedCount(oldVehicleInfo.getApprovedCount());
+//        apply.setOldTotalMass(oldVehicleInfo.getTotalMass());
+//        apply.setOldMaintenaceMass(oldVehicleInfo.getMaintenaceMass());
+//        apply.setOldVehicleDimensions(oldVehicleInfo.getVehicleDimensions());
+//        apply.setOldAxleCount(oldVehicleInfo.getAxleCount());
+//        apply.setOldUseUserType(oldVehicleInfo.getUseUserType());
+//        apply.setOldType(oldVehicleInfo.getType());
+//        apply.setOldVehPosImgUrl(oldVehicleInfo.getVehPosImgUrl());
+//        apply.setOldVehNegImgUrl(oldVehicleInfo.getVehNegImgUrl());
+//        apply.setOldOwnerName(oldVehicleInfo.getOwnerName());
+//        apply.setOldOwnerIdType(oldVehicleInfo.getOwnerIdType());
+//        apply.setOldOwnerIdNum(oldVehicleInfo.getOwnerIdNum());
+//        apply.setOldOwnerPosImgUrl(oldVehicleInfo.getOwnerPosImgUrl());
+//        apply.setOldOwnerNegImgUrl(oldVehicleInfo.getOwnerNegImgUrl());
+//        apply.setOldTransportIdNum(oldVehicleInfo.getTransportIdNum());
+//        apply.setOldLicenseIdNum(oldVehicleInfo.getLicenseIdNum());
+//        apply.setOldVehBodyUrl(oldVehicleInfo.getVehBodyUrl());
+//        apply.setOldTractorSign(oldVehicleInfo.getTractorSign());
+//        apply.setOldRoadTransportPermitPicUrl(oldVehicleInfo.getRoadTransportPermitPicUrl());
+//        apply.setVehicleId(req.getVehiclePlate() + "_" + req.getVehiclePlateColor());
         apply.setInsertTime(LocalDateTime.now());
         apply.setSignStatus(ReSignStatus.WAIT_SIGH);
         apply.setUpgradeStatus(UpgradeStatus.WAIT_UPGRADE);
@@ -391,7 +393,7 @@ public class VehicleInfoChangeManager extends AbstractCommManager
         if (StringUtils.hasText(infoChange.getVehiclePlate()) && infoChange.getVehiclePlateColor() != null) {
             vehicleId = infoChange.getVehiclePlate() + "_" + infoChange.getVehiclePlateColor();
         } else {
-            vehicleId = infoChange.getOldVehiclePlate() + "_" + infoChange.getOldVehiclePlateColor();
+//            vehicleId = infoChange.getOldVehiclePlate() + "_" + infoChange.getOldVehiclePlateColor();
         }
         if (syncVehicleTrans != null) {
             OisVehicleSaveRequest vehicleSaveRequest = new OisVehicleSaveRequest();