解除车牌占用

gly-base-core/src/main/java/cn/com/taiji/core/entity/ass/AssVehicleRelieve.java

@@ -46,6 +46,15 @@ public class AssVehicleRelieve extends AbstractStringPropertyUUIDEntity {
 	@Size(max = 255)
 	@Column(name = "USER_NEG_IMAGES_URL")
 	private String userNegImagesUrl;//身份证国徽图片地址(申请人)
+	@Column(name = "USER_NAME")
+	private String userName;//申请人姓名
+	@Column(name = "USER_ID_NUM")
+	private String userIdNum;//申请人证件号
+	@Column(name = "USER_ID_TYPE")
+	@Enumerated(EnumType.STRING)
+	private IdType userIdType;//证件类型;身份证、
+	@Column(name = "USER_MOBILE")
+	private String userMobile;//申请人手机号
 	@Column(name = "USER_TYPE")
 	@Enumerated(EnumType.STRING)
 	private IdType userType;//证件类型;身份证、

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/ass/ReleasePlateViewResponse.java

@@ -1,6 +1,7 @@
 package cn.com.taiji.core.model.comm.protocol.ias.ass;
 
 import cn.com.taiji.core.entity.ass.AssOrderinfo;
+import cn.com.taiji.core.entity.ass.AssVehicleRelieve;
 import cn.com.taiji.core.entity.basic.QtkBlackCard;
 import cn.com.taiji.core.entity.basic.QtkBlackObu;
 import cn.com.taiji.core.entity.basic.QtkCardInfo;
@@ -24,30 +25,31 @@ import java.util.List;
 public class ReleasePlateViewResponse extends AbstractSignTypeResponse {
 
     private AssOrderinfo assOrderinfo;//售后订单信息
-    private String orderNo;//售后表订单编号
-    private String customerId;//解除卡所属用户编码
-    private String relieveCardId;//解除的卡号;被解除的ETC卡号
-    private String relieveObuId;//解除的签号;被解除的OBU签号
-    private LocalDateTime relieveTime;//解除时间
-    private RelieveStatus relieveStatus;//解除状态;未处理、已处理成功、已处理失败
-    private String userPosImagesUrl;//身份证人像图片地址(申请人)
-    private String userNegImagesUrl;//身份证国徽图片地址(申请人)
-    private IdType userType;//证件类型;身份证、
-    private String vehPosImgUrl;//行驶证正面照片
-    private String vehNegImgUrl;//行驶证反面 照片
-    private String unitImagesUrl;//营业执照图片地址
-    private String proxyUrl;//授权书图片地址
-    private IdType unitIdType;//单位证件类型
-    private String unitName;//单位名称车辆所有人
-    private String unitId;//单位证件编号
-    private String remark;//备注
-    private LocalDateTime insertTime;//创建时间
-    private LocalDateTime updateTime;//更新时间
-    private String ownerPosImgUrl;//车主证件正面图片
-    private String ownerNegImgUrl;//车主证件反面图片
-    private String ownerName;//车主身份证上名
-    private String ownerIdNum;//车主身份证证件号
-    private AssVehicleRealseStep step;
+//    private String orderNo;//售后表订单编号
+//    private String customerId;//解除卡所属用户编码
+//    private String relieveCardId;//解除的卡号;被解除的ETC卡号
+//    private String relieveObuId;//解除的签号;被解除的OBU签号
+//    private LocalDateTime relieveTime;//解除时间
+//    private RelieveStatus relieveStatus;//解除状态;未处理、已处理成功、已处理失败
+//    private String userPosImagesUrl;//身份证人像图片地址(申请人)
+//    private String userNegImagesUrl;//身份证国徽图片地址(申请人)
+//    private IdType userType;//证件类型;身份证、
+//    private String vehPosImgUrl;//行驶证正面照片
+//    private String vehNegImgUrl;//行驶证反面 照片
+//    private String unitImagesUrl;//营业执照图片地址
+//    private String proxyUrl;//授权书图片地址
+//    private IdType unitIdType;//单位证件类型
+//    private String unitName;//单位名称车辆所有人
+//    private String unitId;//单位证件编号
+//    private String remark;//备注
+//    private LocalDateTime insertTime;//创建时间
+//    private LocalDateTime updateTime;//更新时间
+//    private String ownerPosImgUrl;//车主证件正面图片
+//    private String ownerNegImgUrl;//车主证件反面图片
+//    private String ownerName;//车主身份证上名
+//    private String ownerIdNum;//车主身份证证件号
+//    private AssVehicleRealseStep step;
+    private AssVehicleRelieve vehicleRelieve;
     private QtkCardInfo cardInfo;
     private QtkObuInfo obuInfo;
     private List<String> tap;

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/releasePlate/ReleasePlateViewResponseDTO.java

@@ -9,6 +9,7 @@ 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.IdType;
 import cn.com.taiji.iaw.dto.ass.AssOrderInfoResponseDTO;
+import cn.com.taiji.iaw.model.ass.releasePlate.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -20,56 +21,73 @@ import java.util.List;
 @ApiModel(description = "售后订单-解除车牌占用审核查询")
 public class ReleasePlateViewResponseDTO  {
 
-    @ApiModelProperty(value = "售后订单信息")
-    private AssOrderInfoResponseDTO assOrderInfo;
-    @ApiModelProperty(value = "售后表订单编号")
-    private String orderNo;//售后表订单编号
-    @ApiModelProperty(value = "解除卡所属用户编码")
-    private String customerId;//解除卡所属用户编码
-    @ApiModelProperty(value = "解除的卡号;被解除的ETC卡号")
-    private String relieveCardId;//解除的卡号;被解除的ETC卡号
-    @ApiModelProperty(value = "解除的签号;被解除的OBU签号")
-    private String relieveObuId;//解除的签号;被解除的OBU签号
-    @ApiModelProperty(value = "解除时间")
-    private LocalDateTime relieveTime;//解除时间
-    @ApiModelProperty(value = "解除状态;未处理、已处理成功、已处理失败")
-    private RelieveStatus relieveStatus;//解除状态;未处理、已处理成功、已处理失败
-    @ApiModelProperty(value = "身份证人像图片地址(申请人)")
-    private String userPosImagesUrl;//身份证人像图片地址(申请人)
-    @ApiModelProperty(value = "身份证国徽图片地址(申请人)")
-    private String userNegImagesUrl;//身份证国徽图片地址(申请人)
-    @ApiModelProperty(value = "证件类型;身份证、")
-    private IdType userType;//证件类型;身份证、
-    @ApiModelProperty(value = "行驶证正面照片")
-    private String vehPosImgUrl;//行驶证正面照片
-    @ApiModelProperty(value = "行驶证反面 照片")
-    private String vehNegImgUrl;//行驶证反面 照片
-    @ApiModelProperty(value = "营业执照图片地址")
-    private String unitImagesUrl;//营业执照图片地址
-    @ApiModelProperty(value = "授权书图片地址")
-    private String proxyUrl;//授权书图片地址
-    @ApiModelProperty(value = "单位证件类型")
-    private IdType unitIdType;//单位证件类型
-    @ApiModelProperty(value = "单位名称车辆所有人")
-    private String unitName;//单位名称车辆所有人
-    @ApiModelProperty(value = "单位证件编号")
-    private String unitId;//单位证件编号
-    @ApiModelProperty(value = "备注")
-    private String remark;//备注
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime insertTime;//创建时间
-    @ApiModelProperty(value = "更新时间")
-    private LocalDateTime updateTime;//更新时间
-    @ApiModelProperty(value = "车主证件正面图片")
-    private String ownerPosImgUrl;//车主证件正面图片
-    @ApiModelProperty(value = "车主证件反面图片")
-    private String ownerNegImgUrl;//车主证件反面图片
-    @ApiModelProperty(value = "车主身份证上名")
-    private String ownerName;//车主身份证上名
-    @ApiModelProperty(value = "车主身份证证件号")
-    private String ownerIdNum;//车主身份证证件号
+//    @ApiModelProperty(value = "售后订单信息")
+//    private AssOrderInfoResponseDTO assOrderInfo;
+//    @ApiModelProperty(value = "售后表订单编号")
+//    private String orderNo;//售后表订单编号
+//    @ApiModelProperty(value = "解除卡所属用户编码")
+//    private String customerId;//解除卡所属用户编码
+//    @ApiModelProperty(value = "解除的卡号;被解除的ETC卡号")
+//    private String relieveCardId;//解除的卡号;被解除的ETC卡号
+//    @ApiModelProperty(value = "解除的签号;被解除的OBU签号")
+//    private String relieveObuId;//解除的签号;被解除的OBU签号
+//    @ApiModelProperty(value = "解除时间")
+//    private LocalDateTime relieveTime;//解除时间
+//    @ApiModelProperty(value = "解除状态;未处理、已处理成功、已处理失败")
+//    private RelieveStatus relieveStatus;//解除状态;未处理、已处理成功、已处理失败
+//    @ApiModelProperty(value = "身份证人像图片地址(申请人)")
+//    private String userPosImagesUrl;//身份证人像图片地址(申请人)
+//    @ApiModelProperty(value = "身份证国徽图片地址(申请人)")
+//    private String userNegImagesUrl;//身份证国徽图片地址(申请人)
+//    @ApiModelProperty(value = "证件类型;身份证、")
+//    private IdType userType;//证件类型;身份证、
+//    @ApiModelProperty(value = "行驶证正面照片")
+//    private String vehPosImgUrl;//行驶证正面照片
+//    @ApiModelProperty(value = "行驶证反面 照片")
+//    private String vehNegImgUrl;//行驶证反面 照片
+//    @ApiModelProperty(value = "营业执照图片地址")
+//    private String unitImagesUrl;//营业执照图片地址
+//    @ApiModelProperty(value = "授权书图片地址")
+//    private String proxyUrl;//授权书图片地址
+//    @ApiModelProperty(value = "单位证件类型")
+//    private IdType unitIdType;//单位证件类型
+//    @ApiModelProperty(value = "单位名称车辆所有人")
+//    private String unitName;//单位名称车辆所有人
+//    @ApiModelProperty(value = "单位证件编号")
+//    private String unitId;//单位证件编号
+//    @ApiModelProperty(value = "备注")
+//    private String remark;//备注
+//    @ApiModelProperty(value = "创建时间")
+//    private LocalDateTime insertTime;//创建时间
+//    @ApiModelProperty(value = "更新时间")
+//    private LocalDateTime updateTime;//更新时间
+//    @ApiModelProperty(value = "车主证件正面图片")
+//    private String ownerPosImgUrl;//车主证件正面图片
+//    @ApiModelProperty(value = "车主证件反面图片")
+//    private String ownerNegImgUrl;//车主证件反面图片
+//    @ApiModelProperty(value = "车主身份证上名")
+//    private String ownerName;//车主身份证上名
+//    @ApiModelProperty(value = "车主身份证证件号")
+//    private String ownerIdNum;//车主身份证证件号
+
+    @ApiModelProperty(value = "下单申请时间")
+    private LocalDateTime applyTime;//下单申请时间
+    @ApiModelProperty(value = "售后订单编号")
+    private String orderNo;
     @ApiModelProperty(value = "审核步骤")
     private AssVehicleRealseStep step;
+
+    @ApiModelProperty(value = "身份证信息")
+    private ApplyInfo applyInfo;
+    @ApiModelProperty(value = "行驶证信息")
+    private DrivingInfo drivingInfo;
+    @ApiModelProperty(value = "车主信息")
+    private OwnerInfo ownerInfo;
+    @ApiModelProperty(value = "单位资料信息")
+    private UnitInfo unitInfo;
+    @ApiModelProperty(value = "占用用户信息")
+    private CustomerInfo customerInfo;
+
     @ApiModelProperty(value = "卡信息")
     private QtkCardInfo cardInfo;
     @ApiModelProperty(value = "签信息")

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/ass/ReleasePlateManagerImpl.java

@@ -16,10 +16,9 @@ import cn.com.taiji.iaw.dto.ass.AssOrderInfoResponseDTO;
 import cn.com.taiji.iaw.dto.ass.RealsePlateRequestDTO;
 import cn.com.taiji.iaw.dto.ass.releasePlate.*;
 import cn.com.taiji.iaw.manager.AbstractIawManager;
-import cn.com.taiji.iaw.model.ass.releasePlate.ApplyInfo;
-import cn.com.taiji.iaw.model.ass.releasePlate.DrivingInfo;
-import cn.com.taiji.iaw.model.ass.releasePlate.OwnerInfo;
-import cn.com.taiji.iaw.model.ass.releasePlate.UnitInfo;
+import cn.com.taiji.iaw.model.ass.releasePlate.*;
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.kafka.common.protocol.types.Field;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -87,14 +86,78 @@ public class ReleasePlateManagerImpl extends AbstractIawManager implements Relea
         response.setOrderNo(assOrderinfo.getOrderNo());
         response.setApplyTime(assOrderinfo.getApplyTime());//申请时间
         response.setStep(vehicleRelieve.getStep());//步骤
+        ResultInfo resultInfo = getInfo(vehicleRelieve, assOrderinfo);
+        response.setApplyInfo(resultInfo.getApplyInfo());
+        response.setDrivingInfo(resultInfo.getDrivingInfo());
+        response.setOwnerInfo(resultInfo.getOwnerInfo());
+        response.setUnitInfo(resultInfo.getUnitInfo());
+        return response;
+    }
+
+    @Override
+    public ReleasePlateListResponDTO relesePlateList(RelesePlateListkfRequestDTO req) {
+        String vehicleId = req.getVehiclePlate() + "_" + req.getVehiclePlateColor();
+        List<AssOrderinfo> assOrderinfoList = assOrderinfoRepo.findRelasePlateByVehicleId(vehicleId);
+        ReleasePlateListResponDTO responDTO = new ReleasePlateListResponDTO();
+        if (!isEmpty(assOrderinfoList)){
+            List<AssOrderInfoResponseDTO> dtoList = assOrderinfoList.stream().map(t -> {
+                AssOrderInfoResponseDTO dtoModel = copyProperties(t, new AssOrderInfoResponseDTO());
+                return dtoModel;
+            }).collect(Collectors.toList());
+            responDTO.setAssOrders(dtoList);
+        }
+        return responDTO;
+    }
+
+    @Override
+    public ReleasePlateViewResponseDTO view(ReleasePlateViewRequestDTO req) throws ManagerException {
+        ReleasePlateViewRequest request = copyProperties(req, new ReleasePlateViewRequest());
+        ReleasePlateViewResponse response = jsonPostRepeat(request);
+
+        ReleasePlateViewResponseDTO responseDTO = new ReleasePlateViewResponseDTO();
+        copyProperties(response, responseDTO);
+        AssOrderinfo assOrderinfo = response.getAssOrderinfo();
+        AssVehicleRelieve vehicleRelieve = response.getVehicleRelieve();
+        ResultInfo resultInfo = getInfo(vehicleRelieve, assOrderinfo);
+        responseDTO.setApplyTime(assOrderinfo.getApplyTime());
+        responseDTO.setOrderNo(assOrderinfo.getOrderNo());
+        responseDTO.setStep(vehicleRelieve.getStep());
+
+        responseDTO.setApplyInfo(resultInfo.getApplyInfo());
+        responseDTO.setDrivingInfo(resultInfo.getDrivingInfo());
+        responseDTO.setOwnerInfo(resultInfo.getOwnerInfo());
+        responseDTO.setUnitInfo(resultInfo.getUnitInfo());
+        //占用用户信息
+        CustomerInfo customerInfo = new CustomerInfo();
+        customerInfo.setCustomerName(assOrderinfo.getCustomerName());
+        customerInfo.setCustomerIdNum(assOrderinfo.getCustomerIdNum());
+        customerInfo.setCustomerIdType(assOrderinfo.getCustomerIdType());
+        customerInfo.setCustomerTel(assOrderinfo.getCustomerTel());
+        responseDTO.setCustomerInfo(customerInfo);
+
+        return responseDTO;
+    }
+
+    @Getter
+    @Setter
+    class ResultInfo {
+        private ApplyInfo applyInfo;
+        private DrivingInfo drivingInfo;
+        private OwnerInfo ownerInfo;
+        private UnitInfo unitInfo;
+    }
+
+    private ResultInfo getInfo(AssVehicleRelieve vehicleRelieve, AssOrderinfo assOrderinfo) {
+        ResultInfo resultInfo = new ResultInfo();
         //申请信息
         ApplyInfo applyInfo = new ApplyInfo();
-        applyInfo.setCustomerIdNum(assOrderinfo.getCustomerIdNum());
-        applyInfo.setName(assOrderinfo.getCustomerName());
-        applyInfo.setMobile(assOrderinfo.getCustomerTel());
+        applyInfo.setCustomerIdNum(vehicleRelieve.getUserIdNum());
+        applyInfo.setName(vehicleRelieve.getUserName());
+        applyInfo.setMobile(vehicleRelieve.getUserMobile());
+        applyInfo.setUserIdType(vehicleRelieve.getUserIdType());
         applyInfo.setUserPosImagesUrl(minioUtil.getOuterUrl(vehicleRelieve.getUserPosImagesUrl()));
         applyInfo.setUserNegImagesUrl(minioUtil.getOuterUrl(vehicleRelieve.getUserNegImagesUrl()));
-        response.setApplyInfo(applyInfo);
+        resultInfo.setApplyInfo(applyInfo);
 
         //行驶证信息
         DrivingInfo drivingInfo = new DrivingInfo();
@@ -104,7 +167,7 @@ public class ReleasePlateManagerImpl extends AbstractIawManager implements Relea
         drivingInfo.setVehicleOwnerName(vehicleRelieve.getVehicleOwnerName());
         drivingInfo.setVehPosImgUrl(minioUtil.getOuterUrl(vehicleRelieve.getVehPosImgUrl()));
         drivingInfo.setVehNegImgUrl(minioUtil.getOuterUrl(vehicleRelieve.getVehNegImgUrl()));
-        response.setDrivingInfo(drivingInfo);
+        resultInfo.setDrivingInfo(drivingInfo);
 
         //车主信息
         if (hasText(vehicleRelieve.getOwnerName())) {
@@ -114,7 +177,7 @@ public class ReleasePlateManagerImpl extends AbstractIawManager implements Relea
             ownerInfo.setOwnerPosImgUrl(minioUtil.getOuterUrl(vehicleRelieve.getOwnerPosImgUrl()));
             ownerInfo.setOwnerNegImgUrl(minioUtil.getOuterUrl(vehicleRelieve.getOwnerNegImgUrl()));
             ownerInfo.setProxyUrl(minioUtil.getOuterUrl(vehicleRelieve.getProxyUrl()));
-            response.setOwnerInfo(ownerInfo);
+            resultInfo.setOwnerInfo(ownerInfo);
         }
 
         //单位信息
@@ -125,34 +188,9 @@ public class ReleasePlateManagerImpl extends AbstractIawManager implements Relea
             unitInfo.setUnitImagesUrl(minioUtil.getOuterUrl(vehicleRelieve.getUnitImagesUrl()));
             unitInfo.setProxyUrl(minioUtil.getOuterUrl(vehicleRelieve.getProxyUrl()));
             unitInfo.setUnitIdType(vehicleRelieve.getUnitIdType());
-            response.setUnitInfo(unitInfo);
+            resultInfo.setUnitInfo(unitInfo);
         }
-        return response;
-    }
-
-    @Override
-    public ReleasePlateListResponDTO relesePlateList(RelesePlateListkfRequestDTO req) {
-        String vehicleId = req.getVehiclePlate() + "_" + req.getVehiclePlateColor();
-        List<AssOrderinfo> assOrderinfoList = assOrderinfoRepo.findRelasePlateByVehicleId(vehicleId);
-        ReleasePlateListResponDTO responDTO = new ReleasePlateListResponDTO();
-        if (!isEmpty(assOrderinfoList)){
-            List<AssOrderInfoResponseDTO> dtoList = assOrderinfoList.stream().map(t -> {
-                AssOrderInfoResponseDTO dtoModel = copyProperties(t, new AssOrderInfoResponseDTO());
-                return dtoModel;
-            }).collect(Collectors.toList());
-            responDTO.setAssOrders(dtoList);
-        }
-        return responDTO;
-    }
-
-    @Override
-    public ReleasePlateViewResponseDTO view(ReleasePlateViewRequestDTO req) throws ManagerException {
-        ReleasePlateViewRequest request = copyProperties(req, new ReleasePlateViewRequest());
-        ReleasePlateViewResponse response = jsonPostRepeat(request);
-        ReleasePlateViewResponseDTO viewResponseDTO = copyProperties(response, new ReleasePlateViewResponseDTO());
-        AssOrderInfoResponseDTO assOrderInfo = copyProperties(response.getAssOrderinfo(), new AssOrderInfoResponseDTO());
-        viewResponseDTO.setAssOrderInfo(assOrderInfo);
-        return viewResponseDTO;
+        return resultInfo;
     }
 
     @Override

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/model/ass/releasePlate/ApplyInfo.java

@@ -1,5 +1,6 @@
 package cn.com.taiji.iaw.model.ass.releasePlate;
 
+import cn.com.taiji.core.entity.dict.basic.IdType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -24,4 +25,6 @@ public class ApplyInfo {
     private String name;//身份证姓名
     @ApiModelProperty(value = "证件号码",required = true)
     private String customerIdNum;//证件号码
+    @ApiModelProperty(value = "证件类型",required = true)
+    private IdType userIdType;//证件类型;身份证
 }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/model/ass/releasePlate/CustomerInfo.java

@@ -0,0 +1,26 @@
+package cn.com.taiji.iaw.model.ass.releasePlate;
+
+import cn.com.taiji.core.entity.dict.basic.IdType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author：ChenChao
+ * @Date：2025/8/28 11:26
+ * @Filename：CustomerInfo
+ * @description:
+ */
+@ApiModel(description = "占用信息")
+@Data
+public class CustomerInfo {
+
+    @ApiModelProperty(value = "占用用户手机号")
+    private String customerTel;//客户手机号
+    @ApiModelProperty(value = "占用客户名称")
+    private String customerName;//客户名称
+    @ApiModelProperty(value = "占用客户名称")
+    private IdType customerIdType;//客户证件类型
+    @ApiModelProperty(value = "占用客户证件号")
+    private String customerIdNum;//客户证件号
+}

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

@@ -48,6 +48,7 @@ public class ReleasePlateApplyManager extends AbstractAssManager<ReleasePlateApp
 
     public static final String CARD_INFO = "cardInfo";
     public static final String OBU_INFO = "obuInfo";
+    public static final String CUSTOMER = "customer";
 
 
     @Autowired
@@ -116,13 +117,14 @@ public class ReleasePlateApplyManager extends AbstractAssManager<ReleasePlateApp
         QtkVehicleInfo qtkVehicleInfo = queryVehicleInfo(req.getVehiclePlate() + "_" + req.getVehiclePlateColor());
         //双系统查询ETC用户信息
         QtkCustomerInfo customerInfo = queryCustomerInfo(qtkVehicleInfo.getCustomerId());
+        dataStream.put(CUSTOMER, customerInfo);
         //占用用户和申请用户一致
-//        if(req.getCustomerIdNum().equals(customerInfo.getCustomerIdNum())){
-//            //校验卡
-//            validCard(dataStream);
-//            //校验签
-//            validObu(dataStream);
-//        }
+        if(req.getCustomerIdNum().equals(customerInfo.getCustomerIdNum())){
+            //校验卡
+            validCard(dataStream);
+            //校验签
+            validObu(dataStream);
+        }
     }
 
     private void validCard(Map<String, Object> dataStream) throws ServiceHandleException {
@@ -181,6 +183,7 @@ public class ReleasePlateApplyManager extends AbstractAssManager<ReleasePlateApp
     protected void persistInternal(ReleasePlateApplyRequest req, ServiceLogEvent event, Map<String, Object> dataStream) throws ServiceHandleException {
         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();
@@ -208,18 +211,21 @@ public class ReleasePlateApplyManager extends AbstractAssManager<ReleasePlateApp
 //            assOrderinfo.setAgencyId("52001106004");// 黔通智联（自营）
 //            assOrderinfo.setChannelId("5201010600401150002"); // 黔通智联售后服务
         }
-        assOrderinfo.setCustomerTel(req.getMobile());
-        assOrderinfo.setCustomerName(req.getName());
-        assOrderinfo.setCustomerIdType(IdType.SFZ);
-        assOrderinfo.setCustomerIdNum(req.getCustomerIdNum());
+        assOrderinfo.setCustomerTel(customerInfo.getCustomerTel());//占用车辆人的手机
+        assOrderinfo.setCustomerName(customerInfo.getCustomerName());//占用车辆人的姓名
+        assOrderinfo.setCustomerIdType(customerInfo.getCustomerIdType());//占用车辆人的证件类型
+        assOrderinfo.setCustomerIdNum(customerInfo.getCustomerIdNum());//占用车辆人的证件号码
         assOrderinfo.setAuditStatus(AuditStatus.AUDIT);
-        QtkCustomerInfo customerInfo = qtkCustomerInfoRepo.findByCustomerId(customerId);
         assOrderinfo.setUserType(customerInfo.getUserType());//占用车辆人的用户类型
-        assOrderinfo.setCustomerId(customerId);//占用车辆人的customerId
+        assOrderinfo.setCustomerId(customerInfo.getCustomerId());//占用车辆人的customerId
         //保存解除车牌占用明细表
         AssVehicleRelieve assVehicleRelieve = new AssVehicleRelieve();
         assVehicleRelieve.setStep(AssVehicleRealseStep.SUBMIT_AUDIT);
         assVehicleRelieve.setOrderNo(assOrderinfo.getOrderNo());
+        assVehicleRelieve.setUserIdNum(req.getCustomerIdNum());
+        assVehicleRelieve.setUserIdType(IdType.SFZ);
+        assVehicleRelieve.setUserName(req.getName());
+        assVehicleRelieve.setUserMobile(req.getMobile());
         assVehicleRelieve.setUserPosImagesUrl(req.getUserPosImagesUrl());//身份证人像图片地址
         assVehicleRelieve.setUserNegImagesUrl(req.getUserNegImagesUrl());
         assVehicleRelieve.setUserType(IdType.SFZ);

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

@@ -63,7 +63,8 @@ public class ReleasePlateViewManager extends AbstractAssManager<ReleasePlateView
         ReleasePlateViewResponse viewResponse = new ReleasePlateViewResponse();
         viewResponse.setAssOrderinfo(assOrderinfo);
         AssVehicleRelieve vehicleRelieve = assVehicleRelieveRepo.findByOrderNo(req.getOrderNo());
-        copyProperties(vehicleRelieve, viewResponse);
+//        copyProperties(vehicleRelieve, viewResponse);
+        viewResponse.setVehicleRelieve(vehicleRelieve);
         ArrayList<String> taps = new ArrayList<>();
         if (hasText(vehicleRelieve.getRelieveCardId())){
             //双系统卡黑名单查询