iaw 车辆信息变更调整

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

@@ -42,9 +42,9 @@ public class AssSignChange extends StringPropertyUUIDEntity {
     private String vehNegImgUrl;//行驶证反面图片地址;
     @Column(name = "VEHICLE_NAME")
     private String vehicleName;//行驶证姓名
-    @Column(name = "USE_USER_TYPE")
-    @Enumerated(EnumType.STRING)
-    private UseUserType useUserType;//车辆使用类型;
+//    @Column(name = "USE_USER_TYPE")
+//    @Enumerated(EnumType.STRING)
+//    private UseUserType useUserType;//车辆使用类型;
     @Pattern(message = "VIN格式不正确", regexp = RegexConstant.vinRegexp)
     @Size(message = "VIN码最大长度为50字符", max = 50)
     @Column(name = "VIN")

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

@@ -35,9 +35,9 @@ public class SignChangeCollectRequest extends AbstractSignTypeRequest<SignChange
     private String vehNegImgUrl;// 行驶证副页照片
     @NotBlank
     private String vehicleName;//行驶证姓名
-    @NotNull
-    @EnumInteger(enumClazz = UseUserType.class)
-    private Integer useUserType;//车辆使用类型
+//    @NotNull
+//    @EnumInteger(enumClazz = UseUserType.class)
+//    private Integer useUserType;//车辆使用类型
     //    @NotNull
 //    @IntegerConstant(values = "1,2,3")
 //    @ApiModelProperty(value = "客货类型 1客车 2货车 3专项作业；用户选择", required = true)

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/signChange/SignChangeCollectReqDTO.java

@@ -38,10 +38,10 @@ public class SignChangeCollectReqDTO extends AbstractBizRequestDTO {
     @NotBlank
     @ApiModelProperty(value = "行驶证姓名", required = true)
     private String vehicleName;//行驶证姓名
-    @NotNull
-    @EnumInteger(enumClazz = UseUserType.class)
-    @ApiModelProperty(value = "车辆使用类型", required = true)
-    private Integer useUserType;//车辆使用类型
+//    @NotNull
+//    @EnumInteger(enumClazz = UseUserType.class)
+//    @ApiModelProperty(value = "车辆使用类型", required = true)
+//    private Integer useUserType;//车辆使用类型
 //    @NotNull
 //    @IntegerConstant(values = "1,2,3")
 //    @ApiModelProperty(value = "客货类型 1客车 2货车 3专项作业；用户选择", required = true)

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/vehicleChange/VehicleChangeApplyReqDTO.java

@@ -24,7 +24,6 @@ import javax.validation.constraints.Pattern;
 @ApiModel(description = "车辆信息变更申请请求")
 public class VehicleChangeApplyReqDTO extends AbstractBizRequestDTO {
     private String staffId;
-    private String openId;
 //    @NotBlank
 //    private String agencyId;
 //    @NotBlank
@@ -144,41 +143,10 @@ public class VehicleChangeApplyReqDTO extends AbstractBizRequestDTO {
     @ApiModelProperty(value = "申请人地址")
     private String userAdress;//地址
 
-    //========================车主信息===========================
-//    @EnumInteger(enumClazz = IdType.class, message = "用户证件类型不合规")
-//    @ApiModelProperty(value = "车主证件类型，不需要上传车主信息，不要传值")
-//    private Integer ownerIdType;// 车主证件类型
-//    @ApiModelProperty(value = "车主证件号码")
-//    private String ownerIdNum;// 车主证件号码
-//    @ApiModelProperty(value = "车主证件ocr地址")
-//    private String ownerIdAddress;// 车主证件ocr地址
-//    @ApiModelProperty(value = "车主证件正面图片地址")
-//    private String ownerPosImgUrl;//车主证件正面照片地址
-//    @ApiModelProperty(value = "车主证件反面图片地址,单位的填不上,个人必填")
-//    private String ownerNegImgUrl;//车主证件反面照片地址， 单位的填不上,个人必填
-//    @ApiModelProperty(value = "车主手机号，单位的填不上,个人必填")
-//    private String ownerTel;//车主手机号，单位的填不上,个人必填
-//    @ApiModelProperty(value = "车主身份证上姓名")
-//    private String ownerName;//身份证上姓名
-//    @ApiModelProperty(value = "委托书图片地址")
-//    private String proxyUrl;// 委托书地址
 
     @ApiModelProperty(value = "产品编号")
     private String productId;
 
-    //==========================收货信息==========================
-//    @ApiModelProperty(value = "收货人")
-//    private String consignee;// 收货人
-//    @ApiModelProperty(value = "收货人电话")
-//    private String consigneeTel;// 收货人电话
-//    @ApiModelProperty(value = "收货人手机号")
-//    private String region;// 收货所在地区（省、市、区、街道）
-//    @ApiModelProperty(value = "收货人地址")
-//    private String address;// 收货详细地址
-//    @ApiModelProperty(value = "收货人邮编")
-//    private String postalCode;// 收货邮政编码
-//    @ApiModelProperty(value = "收货人详细地址")
-//    private String detailedAddress;// 办理时的详细地址
 
     @Override
     protected void validate(ViolationValidator validator) {
@@ -210,23 +178,6 @@ public class VehicleChangeApplyReqDTO extends AbstractBizRequestDTO {
             validator.validFieldNotBlank("roadTransportPermitPicUrl", roadTransportPermitPicUrl);
             validator.validFieldNotBlank("licenseIdNum",licenseIdNum);
         }
-//        if (whetherToMail) {
-//            validator.validFieldNotBlank("consignee", consignee);
-//            validator.validFieldNotBlank("consigneeTel", consigneeTel);
-//            validator.validFieldNotBlank("region", region);
-//            validator.validFieldNotBlank("address", address);
-//        }
-//        if (ownerIdType != null){
-//            //有车主信息
-//            validator.validFieldNotBlank("ownerName",ownerName);
-//            validator.validFieldNotBlank("ownerIdNum",ownerIdNum);
-//            validator.validFieldNotBlank("ownerIdAddress",ownerIdAddress);
-//            validator.validFieldNotBlank("ownerPosImgUrl",ownerPosImgUrl);
-//            if (ownerIdType != null && IdType.SFZ.getCode()== ownerIdType){
-//                validator.validFieldNotBlank("ownerNegImgUrl",ownerNegImgUrl);// 单位的填不上,个人必填
-//                validator.validFieldNotBlank("ownerTel",ownerTel);
-//            }
-//        }
     }
 
 }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/vehicleChange/VehicleChangeApplyResDTO.java

@@ -13,6 +13,9 @@ import lombok.Data;
 @ApiModel(description = "车辆信息变更申请响应")
 @Data
 public class VehicleChangeApplyResDTO {
-    @ApiModelProperty(value = "上传车主身份标识，1需要，2不需要")
-    private Integer flag;
+//    @ApiModelProperty(value = "上传车主身份标识，1需要，2不需要")
+//    private Integer flag;
+
+    @ApiModelProperty(value = "售后订单号")
+    private String orderNo;
 }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/vehicleChange/VehicleChangeViewResDTO.java

@@ -23,8 +23,8 @@ public class VehicleChangeViewResDTO {
     private ApplyInfo applyInfo;
     @ApiModelProperty(value = "新车辆信息")
     private DrivingInfo drivingInfo;
-    @ApiModelProperty(value = "新车主信息")
-    private OwnerInfo ownerInfo;
+//    @ApiModelProperty(value = "新车主信息")
+//    private OwnerInfo ownerInfo;
     @ApiModelProperty(value = "旧车辆信息")
     private DrivingInfo oldDrivingInfo;
     @ApiModelProperty(value = "订单状态")

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

@@ -94,7 +94,7 @@ public class VehicleChangeMangerImpl extends AbstractIawManager implements Vehic
             throw new ManagerException("待修改车辆，无正常卡信息，不可修改");
         }
         QtkCardInfo cardInfo = qtkCardInfos.get(0);
-        //只有几张卡才需判断渠道是否支持，其它必须支持(邱说：直接修改）
+        //只有记账卡才需判断渠道是否支持，其它必须支持(邱说：直接修改）
         if (CardType.CHARGE_CARD == cardInfo.getCardTypeNew()){
             if (!dto.getOldVehicleId().equals(dto.getNewVehicleId())){
                 AssAgencyConfig agencyConfig = assAgencyConfigRepo.findByAgencyId(cardInfo.getAgencyId());
@@ -111,79 +111,65 @@ public class VehicleChangeMangerImpl extends AbstractIawManager implements Vehic
 
     @Override
     public VehicleChangeApplyResDTO apply(VehicleChangeApplyReqDTO req) throws ManagerException {
-//        req.validate();
-//        VehicleChangeApplyResDTO responseDTO = new VehicleChangeApplyResDTO();
-//        if (!req.getVehicleName().equals(req.getName()) && req.getOwnerIdType() == null){
-//            responseDTO.setFlag(1);
-//            return responseDTO;
-//        }
-//        VehicleChangeApllyRequest request = copyProperties(req, new VehicleChangeApllyRequest());
-//        request.setOrderSource(req.getOrderSource());
-//        String openId = findOpenIdByToken(req.getAccessToken());
-//        request.setOpenId(openId);
-//        if (SourceType.ALI == req.getOrderSource() || SourceType.WECHAT == req.getOrderSource()){
-//            // 自营工具 和 管理端
-//            request.setAgencyId(MyFinals.QTZL_AGENCY_ID);//// 黔通智联（自营）
-//            request.setChannelId("5201010600401150002");//// 黔通智联售后服务
-//        }
-//        if (SourceType.SERVICE_HALL == req.getOrderSource()){
-//            Staff staff = staffRepo.findByStaffId(req.getStaffId());
-//            request.setAgencyId(staff.getAgencyId());
-//            request.setChannelId(staff.getServiceHallId());
-//        }
-//        VehicleChangeAplyResponse response = jsonPostRepeat(request);
-//        sysPersistOperateLog(OperateType.CHANGE_VEHICLE_APPLY, response.getId(), req.getOrderSource(), openId,"车辆信息变更申请");
-//        responseDTO.setFlag(2);
-//        return responseDTO;
-        return null;
+        req.validate();
+        VehicleChangeApllyRequest request = copyProperties(req, new VehicleChangeApllyRequest());
+        request.setOrderSource(req.getOrderSource());
+        String openId = findOpenIdByToken(req.getAccessToken());
+        request.setOpenId(openId);
+        if (SourceType.ALI == req.getOrderSource() || SourceType.WECHAT == req.getOrderSource()){
+            // 自营工具 和 管理端
+            request.setAgencyId(MyFinals.QTZL_AGENCY_ID);//// 黔通智联（自营）
+            request.setChannelId("5201010600401150002");//// 黔通智联售后服务
+        }
+        if (SourceType.SERVICE_HALL == req.getOrderSource()){
+            Staff staff = staffRepo.findByStaffId(req.getStaffId());
+            request.setAgencyId(staff.getAgencyId());
+            request.setChannelId(staff.getServiceHallId());
+            request.setStaffNum(req.getStaffId());
+        }
+        VehicleChangeAplyResponse response = jsonPostRepeat(request);
+        sysPersistOperateLog(OperateType.CHANGE_VEHICLE_APPLY, response.getId(), req.getOrderSource(), openId,"车辆信息变更申请");
+        VehicleChangeApplyResDTO responseDTO = new VehicleChangeApplyResDTO();
+        responseDTO.setOrderNo(response.getOrderNo());
+        return responseDTO;
     }
 
     @Override
     public VehicleChangeViewResDTO beforeReview(VehicleChangeViewReqDTO dto) throws ManagerException {
-//        AssOrderinfo assOrderinfo = checkAssOrder(dto.getOrderNo());
-//        AssVehicleInfoChange vehicleInfoChange = assVehicleInfoChangeRepo.findByOrderNo(dto.getOrderNo());
+        AssOrderinfo assOrderinfo = checkAssOrder(dto.getOrderNo());
+        AssVehicleInfoChange vehicleInfoChange = assVehicleInfoChangeRepo.findByOrderNo(dto.getOrderNo());
         VehicleChangeViewResDTO resDTO = new VehicleChangeViewResDTO();
-//        //申请人信息
-//        ApplyInfo applyInfo = new ApplyInfo();
-//        applyInfo.setUserPosImagesUrl(minioUtil.getOuterUrl(vehicleInfoChange.getUserPosImagesUrl()));
-//        applyInfo.setUserNegImagesUrl(minioUtil.getOuterUrl(vehicleInfoChange.getUserNegImagesUrl()));
-//        applyInfo.setMobile(vehicleInfoChange.getUserMobile());
-//        applyInfo.setName(vehicleInfoChange.getUserName());
-//        applyInfo.setCustomerIdNum(vehicleInfoChange.getUserIdNum());
-//        applyInfo.setUserIdType(vehicleInfoChange.getUserIdType().getCode());
-//        resDTO.setApplyInfo(applyInfo);
-//        //新车辆信息
-//        DrivingInfo newDrivingInfo = new DrivingInfo();
-//        newDrivingInfo.setPlateNum(vehicleInfoChange.getVehiclePlate());
-//        newDrivingInfo.setPlateColor(vehicleInfoChange.getVehiclePlateColor());
-//        newDrivingInfo.setVehicleOwnerName(vehicleInfoChange.getVehicleName());
-//        newDrivingInfo.setVehPosImgUrl(minioUtil.getOuterUrl(vehicleInfoChange.getVehPosImgUrl()));
-//        newDrivingInfo.setVehNegImgUrl(minioUtil.getOuterUrl(vehicleInfoChange.getVehNegImgUrl()));
-//        newDrivingInfo.setType(vehicleInfoChange.getType());
-//        resDTO.setDrivingInfo(newDrivingInfo);
-//        //新车主信息
-//        if (vehicleInfoChange.getOwnerIdType() != null) {
-//            OwnerInfo ownerInfo = new OwnerInfo();
-//            ownerInfo.setOwnerIdType(vehicleInfoChange.getOwnerIdType().getCode());
-//            ownerInfo.setOwnerName(vehicleInfoChange.getOwnerName());
-//            ownerInfo.setOwnerIdNum(vehicleInfoChange.getOwnerIdNum());
-//            ownerInfo.setOwnerPosImgUrl(minioUtil.getOuterUrl(vehicleInfoChange.getOwnerPosImgUrl()));
-//            ownerInfo.setOwnerNegImgUrl(minioUtil.getOuterUrl(vehicleInfoChange.getOwnerNegImgUrl()));
-//            ownerInfo.setProxyUrl(minioUtil.getOuterUrl(vehicleInfoChange.getProxyUrl()));
-//            resDTO.setOwnerInfo(ownerInfo);
-//        }
-//        //旧车辆信息
-//        QtkVehicleInfo vehicleInfo = qtkVehicleInfoRepo.findByVehicleId(assOrderinfo.getVehicleId());
-//        DrivingInfo oldDrivingInfo = new DrivingInfo();
-//        oldDrivingInfo.setPlateNum(assOrderinfo.getVehiclePlate());
-//        oldDrivingInfo.setPlateColor(assOrderinfo.getVehiclePlateColor());
-//        oldDrivingInfo.setVehicleOwnerName(vehicleInfoChange.getOwnerName());
-//        oldDrivingInfo.setVehPosImgUrl(minioUtil.getOuterUrl(vehicleInfo.getVehPosImgUrl()));
-//        oldDrivingInfo.setVehNegImgUrl(minioUtil.getOuterUrl(vehicleInfo.getVehNegImgUrl()));
-//        oldDrivingInfo.setType(vehicleInfo.getType());
-//        resDTO.setOldDrivingInfo(oldDrivingInfo);
-//        resDTO.setOrderStep(assOrderinfo.getOrderStep());
-//        resDTO.setOrderStatus(assOrderinfo.getOrderStatus());
+        //申请人信息
+        ApplyInfo applyInfo = new ApplyInfo();
+        applyInfo.setUserPosImagesUrl(minioUtil.getOuterUrl(vehicleInfoChange.getUserPosImagesUrl()));
+        applyInfo.setUserNegImagesUrl(minioUtil.getOuterUrl(vehicleInfoChange.getUserNegImagesUrl()));
+        applyInfo.setMobile(vehicleInfoChange.getUserMobile());
+        applyInfo.setName(vehicleInfoChange.getUserName());
+        applyInfo.setCustomerIdNum(vehicleInfoChange.getUserIdNum());
+        applyInfo.setUserIdType(vehicleInfoChange.getUserIdType().getCode());
+        resDTO.setApplyInfo(applyInfo);
+        //新车辆信息
+        DrivingInfo newDrivingInfo = new DrivingInfo();
+        newDrivingInfo.setPlateNum(vehicleInfoChange.getVehiclePlate());
+        newDrivingInfo.setPlateColor(vehicleInfoChange.getVehiclePlateColor());
+        newDrivingInfo.setVehicleOwnerName(vehicleInfoChange.getVehicleName());
+        newDrivingInfo.setVehPosImgUrl(minioUtil.getOuterUrl(vehicleInfoChange.getVehPosImgUrl()));
+        newDrivingInfo.setVehNegImgUrl(minioUtil.getOuterUrl(vehicleInfoChange.getVehNegImgUrl()));
+        newDrivingInfo.setType(vehicleInfoChange.getType());
+        resDTO.setDrivingInfo(newDrivingInfo);
+
+        //旧车辆信息
+        QtkVehicleInfo vehicleInfo = qtkVehicleInfoRepo.findByVehicleId(assOrderinfo.getVehicleId());
+        DrivingInfo oldDrivingInfo = new DrivingInfo();
+        oldDrivingInfo.setPlateNum(vehicleInfo.getVehiclePlate());
+        oldDrivingInfo.setPlateColor(vehicleInfo.getVehiclePlateColor());
+        oldDrivingInfo.setVehicleOwnerName(vehicleInfo.getOwnerName());
+        oldDrivingInfo.setVehPosImgUrl(minioUtil.getOuterUrl(vehicleInfo.getVehPosImgUrl()));
+        oldDrivingInfo.setVehNegImgUrl(minioUtil.getOuterUrl(vehicleInfo.getVehNegImgUrl()));
+        oldDrivingInfo.setType(vehicleInfo.getType());
+        resDTO.setOldDrivingInfo(oldDrivingInfo);
+        resDTO.setOrderStep(assOrderinfo.getOrderStep());
+        resDTO.setOrderStatus(assOrderinfo.getOrderStatus());
         return resDTO;
     }
     @Override