ias解除车牌占用调整

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/releasePlate/ReleasePlateApplyManager.java

@@ -7,8 +7,6 @@ import cn.com.taiji.core.entity.basic.*;
 import cn.com.taiji.core.entity.dict.AuditStatus;
 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.AssVehicleRealseStep;
-import cn.com.taiji.core.entity.dict.ass.RelieveStatus;
 import cn.com.taiji.core.entity.dict.basic.*;
 import cn.com.taiji.core.model.comm.protocol.ias.ass.ReleasePlateApplyRequest;
 import cn.com.taiji.core.model.comm.protocol.ias.ass.ReleasePlateApplyResponse;
@@ -69,14 +67,8 @@ public class ReleasePlateApplyManager extends AbstractAssManager<ReleasePlateApp
         if (req.getOwnerIdType() == null && !req.getName().equals(req.getVehicleOwnerName())) {
             throw newBusinessException("行驶证和申请人信息不符，请重新申请");
         }else {
-            if (req.getOwnerIdType() == 101) {//个人
-                if (!req.getOwnerName().equals(req.getVehicleOwnerName())) {
-                    throw newBusinessException("车主信息不符，请重新申请");
-                }
-            }else {//单位
-                if (!req.getUnitName().equals(req.getVehicleOwnerName())) {
-                    throw newBusinessException("行驶证和营业执照车主不符，请重新申请");
-                }
+            if (!req.getOwnerName().equals(req.getVehicleOwnerName())) {
+                throw newBusinessException("车主信息不符，请重新申请");
             }
         }
         String vehicleId = req.getVehiclePlate() + "_" + req.getVehiclePlateColor();
@@ -121,7 +113,13 @@ public class ReleasePlateApplyManager extends AbstractAssManager<ReleasePlateApp
         QtkCustomerInfo customerInfo = queryCustomerInfo(qtkVehicleInfo.getCustomerId());
         dataStream.put(CUSTOMER, customerInfo);
         //占用用户和申请用户一致
-        if(req.getCustomerIdNum().equals(customerInfo.getCustomerIdNum())){
+        String idnum = "";
+        if (req.getOwnerIdType() == null) {
+            idnum = req.getUserIdNum();
+        }else {
+            idnum = req.getOwnerIdNum();
+        }
+        if(idnum.equals(customerInfo.getCustomerIdNum())){
             //校验卡
             validCard(dataStream);
             //校验签
@@ -186,8 +184,6 @@ public class ReleasePlateApplyManager extends AbstractAssManager<ReleasePlateApp
         QtkCardInfo qtkCardInfo = (QtkCardInfo) dataStream.get(CARD_INFO);
         QtkObuInfo qtkObuInfo = (QtkObuInfo) dataStream.get(OBU_INFO);
         QtkCustomerInfo customerInfo = (QtkCustomerInfo) dataStream.get(CUSTOMER);
-        //取customerId 前面已经校验，走到这里卡和签不可能全都为null
-        String customerId = qtkCardInfo == null ? qtkObuInfo.getCustomerId() : qtkCardInfo.getCustomerId();
         LocalDateTime now = LocalDateTime.now();
         //保存售后表
         AssOrderinfo assOrderinfo = new AssOrderinfo();
@@ -202,7 +198,7 @@ public class ReleasePlateApplyManager extends AbstractAssManager<ReleasePlateApp
         // FIXME: 业务员申请的单子，用户怎么查看
         if (SourceType.SERVICE_HALL == req.getSourceType() || SourceType.WEB == req.getSourceType()){
             assOrderinfo.setStaffOpenId(req.getOpenId());
-            String openId = accountInfoRepo.findByIdNum(req.getCustomerIdNum());
+            String openId = accountInfoRepo.findByIdNum(req.getUserIdNum());
             if (hasText(openId)) {
                 assOrderinfo.setOpenId(openId);
             }
@@ -222,33 +218,22 @@ public class ReleasePlateApplyManager extends AbstractAssManager<ReleasePlateApp
         assOrderinfo.setCustomerId(customerInfo.getCustomerId());//占用车辆人的customerId
         //保存解除车牌占用明细表
         AssVehicleRelieve assVehicleRelieve = new AssVehicleRelieve();
-        assVehicleRelieve.setStep(AssVehicleRealseStep.SUBMIT_AUDIT);
         assVehicleRelieve.setOrderNo(assOrderinfo.getOrderNo());
-        assVehicleRelieve.setUserIdNum(req.getCustomerIdNum());
+        assVehicleRelieve.setUserIdNum(req.getUserIdNum());
         assVehicleRelieve.setUserIdType(IdType.SFZ);
         assVehicleRelieve.setUserName(req.getName());
         assVehicleRelieve.setUserMobile(req.getMobile());
         assVehicleRelieve.setUserPosImagesUrl(req.getUserPosImagesUrl());//身份证人像图片地址
         assVehicleRelieve.setUserNegImagesUrl(req.getUserNegImagesUrl());
-        assVehicleRelieve.setUserType(IdType.SFZ);
         assVehicleRelieve.setVehPosImgUrl(req.getVehPosImgUrl());////行驶证正页图片地址
         assVehicleRelieve.setVehicleOwnerName(req.getVehicleOwnerName());
         assVehicleRelieve.setVehNegImgUrl(req.getVehNegImgUrl());
-        assVehicleRelieve.setRelieveStatus(RelieveStatus.UNHANDLED);
-        if (req.getOwnerIdType() != null) {
-            if (req.getOwnerIdType() == 101){
-                assVehicleRelieve.setOwnerName(req.getOwnerName());
-                assVehicleRelieve.setOwnerIdNum(req.getOwnerIdNum());
-                assVehicleRelieve.setOwnerPosImgUrl(req.getOwnerPosImgUrl());
-                assVehicleRelieve.setOwnerNegImgUrl(req.getOwnerNegImgUrl());
-            }else {
-                assVehicleRelieve.setUnitImagesUrl(req.getUnitImagesUrl());
-                assVehicleRelieve.setProxyUrl(req.getProxyUrl());
-                assVehicleRelieve.setUnitIdType(IdType.YYZZ);
-                assVehicleRelieve.setUnitName(req.getUnitName());
-                assVehicleRelieve.setUnitId(req.getUnitId());
-            }
-        }
+        assVehicleRelieve.setOwnerIdType(IdType.findByCode(req.getOwnerIdType()));
+        assVehicleRelieve.setOwnerName(req.getOwnerName());
+        assVehicleRelieve.setOwnerIdNum(req.getOwnerIdNum());
+        assVehicleRelieve.setOwnerPosImgUrl(req.getOwnerPosImgUrl());
+        assVehicleRelieve.setOwnerNegImgUrl(req.getOwnerNegImgUrl());
+        assVehicleRelieve.setProxyUrl(req.getProxyUrl());
         if (qtkCardInfo != null) {
             assVehicleRelieve.setRelieveCardId(qtkCardInfo.getCardId());
             assOrderinfo.setCardId(qtkCardInfo.getCardId());

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/releasePlate/ReleasePlateReviewManager.java

@@ -7,8 +7,6 @@ import cn.com.taiji.core.entity.basic.QtkBlackCard;
 import cn.com.taiji.core.entity.basic.QtkCardInfo;
 import cn.com.taiji.core.entity.basic.QtkObuInfo;
 import cn.com.taiji.core.entity.dict.AuditStatus;
-import cn.com.taiji.core.entity.dict.ass.AssVehicleRealseStep;
-import cn.com.taiji.core.entity.dict.ass.RelieveStatus;
 import cn.com.taiji.core.entity.dict.basic.CardBlackType;
 import cn.com.taiji.core.entity.dict.basic.CardStatus;
 import cn.com.taiji.core.entity.dict.basic.CardType;
@@ -88,9 +86,8 @@ public class ReleasePlateReviewManager extends AbstractAssManager<ReleasePlateRe
 
         AssOrderinfo assOrderinfo = assOrderinfoRepo.findByOrderNo(req.getOrderNo());
         if (assOrderinfo == null) throw newBusinessException("申请单不存在");
-
+        if (AuditStatus.AUDIT == assOrderinfo.getAuditStatus()) throw newBusinessException("当前申请单不是待审核状态");
         AssVehicleRelieve vehicleRelieve = assVehicleRelieveRepo.findByOrderNo(req.getOrderNo());
-        if (AssVehicleRealseStep.SUBMIT_AUDIT == vehicleRelieve.getStep()) throw newBusinessException("当前申请单不是待审核状态");
 
         if (req.getPass()==1) {
             // todo 存在欠费不可审核通过
@@ -127,9 +124,7 @@ public class ReleasePlateReviewManager extends AbstractAssManager<ReleasePlateRe
         AssOrderinfo assOrderinfo = (AssOrderinfo) dataStream.get(ASSINFO);
         LocalDateTime now = LocalDateTime.now();
         if (req.getPass() == 1){
-            vehicleRelieve.setStep(AssVehicleRealseStep.RELEASE_PLATE);////审核通过完毕
             assOrderinfo.setAuditStatus(AuditStatus.COMPLETE);
-            vehicleRelieve.setRelieveStatus(RelieveStatus.HANDLED_SUCCESS);
             //下黑-挂起卡
             if (hasText(vehicleRelieve.getRelieveCardId())){
                 //双系统查询卡
@@ -202,8 +197,6 @@ public class ReleasePlateReviewManager extends AbstractAssManager<ReleasePlateRe
             }
         }else {
             assOrderinfo.setAuditStatus(AuditStatus.FAIL);
-            vehicleRelieve.setStep(AssVehicleRealseStep.AUDIT_FAIL);;//审核通过完毕
-            vehicleRelieve.setRelieveStatus(RelieveStatus.HANDLED_FAIL);
         }
         //更新售后表
         assOrderinfo.setAuditOpenId(req.getOpenId());

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/releasePlate/ReleasePlateViewManager.java

@@ -63,7 +63,6 @@ public class ReleasePlateViewManager extends AbstractAssManager<ReleasePlateView
         ReleasePlateViewResponse viewResponse = new ReleasePlateViewResponse();
         viewResponse.setAssOrderinfo(assOrderinfo);
         AssVehicleRelieve vehicleRelieve = assVehicleRelieveRepo.findByOrderNo(req.getOrderNo());
-//        copyProperties(vehicleRelieve, viewResponse);
         viewResponse.setVehicleRelieve(vehicleRelieve);
         ArrayList<String> taps = new ArrayList<>();
         if (hasText(vehicleRelieve.getRelieveCardId())){