core

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

@@ -1,8 +1,6 @@
 package cn.com.taiji.core.entity.ass;
 
 import cn.com.taiji.core.entity.AbstractStringPropertyUUIDEntity;
-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 lombok.Getter;
 import lombok.Setter;
@@ -26,9 +24,9 @@ public class AssVehicleRelieve extends AbstractStringPropertyUUIDEntity {
 	@Size(max = 32)
 	@Column(name = "ORDER_NO")
 	private String orderNo;//售后表订单编号
-	@Size(max = 32)
-	@Column(name = "CUSTOMER_ID")
-	private String customerId;//解除卡所属用户编码
+//	@Size(max = 32)
+//	@Column(name = "CUSTOMER_ID")
+//	private String customerId;//解除卡所属用户编码
 	@Size(max = 20)
 	@Column(name = "RELIEVE_CARD_ID")
 	private String relieveCardId;//解除的卡号;被解除的ETC卡号
@@ -37,9 +35,9 @@ public class AssVehicleRelieve extends AbstractStringPropertyUUIDEntity {
 	private String relieveObuId;//解除的签号;被解除的OBU签号
 	@Column(name = "RELIEVE_TIME")
 	private LocalDateTime relieveTime;//解除时间
-	@Column(name = "RELIEVE_STATUS")
-	@Enumerated(EnumType.STRING)
-	private RelieveStatus relieveStatus;//解除状态;未处理、已处理成功、已处理失败
+//	@Column(name = "RELIEVE_STATUS")
+//	@Enumerated(EnumType.STRING)
+//	private RelieveStatus relieveStatus;//解除状态;未处理、已处理成功、已处理失败
 	@Size(max = 255)
 	@Column(name = "USER_POS_IMAGES_URL")
 	private String userPosImagesUrl;//身份证人像图片地址(申请人)
@@ -55,9 +53,9 @@ public class AssVehicleRelieve extends AbstractStringPropertyUUIDEntity {
 	private IdType userIdType;//证件类型;身份证、
 	@Column(name = "USER_MOBILE")
 	private String userMobile;//申请人手机号
-	@Column(name = "USER_TYPE")
-	@Enumerated(EnumType.STRING)
-	private IdType userType;//证件类型;身份证、
+//	@Column(name = "USER_TYPE")
+//	@Enumerated(EnumType.STRING)
+//	private IdType userType;//证件类型;身份证、
 	@Column(name = "VEH_POS_IMG_URL")
 	private String vehPosImgUrl;//行驶证正面照片
 	@Column(name = "VEH_NEG_IMG_URL")
@@ -65,20 +63,20 @@ public class AssVehicleRelieve extends AbstractStringPropertyUUIDEntity {
 	@NotBlank
 	@Column(name = "VEH_OWNER_NAME")
 	private String vehicleOwnerName;//行驶证上所有人
-	@Size(max = 255)
-	@Column(name = "UNIT_IMAGES_URL")
-	private String unitImagesUrl;//营业执照图片地址
+//	@Size(max = 255)
+//	@Column(name = "UNIT_IMAGES_URL")
+//	private String unitImagesUrl;//营业执照图片地址
 	@Column(name = "PROXY_URL")
 	private String proxyUrl;//授权书图片地址
-	@Column(name = "UNIT_ID_TYPE")
-	@Enumerated(EnumType.STRING)
-	private IdType unitIdType;//单位证件类型
-	@Size(max = 100)
-	@Column(name = "UNIT_NAME")
-	private String unitName;//单位名称车辆所有人
-	@Size(max = 50)
-	@Column(name = "UNIT_ID")
-	private String unitId;//单位证件编号
+//	@Column(name = "UNIT_ID_TYPE")
+//	@Enumerated(EnumType.STRING)
+//	private IdType unitIdType;//单位证件类型(车主）
+//	@Size(max = 100)
+//	@Column(name = "UNIT_NAME")
+//	private String unitName;//单位名称车辆所有人
+//	@Size(max = 50)
+//	@Column(name = "UNIT_ID")
+//	private String unitId;//单位证件编号
 	@Size(max = 400)
 	@Column(name = "REMARK")
 	private String remark;//备注
@@ -86,6 +84,9 @@ public class AssVehicleRelieve extends AbstractStringPropertyUUIDEntity {
 	private LocalDateTime insertTime = LocalDateTime.now();//创建时间
 	@Column(name = "UPDATE_TIME")
 	private LocalDateTime updateTime = LocalDateTime.now();//更新时间
+	@Column(name = "OWNER_ID_TYPE")
+	@Enumerated(EnumType.STRING)
+	private IdType ownerIdType;//车主证件类型
 	@Column(name = "OWNER_POS_IMGURL")
 	private String ownerPosImgUrl;//车主证件正面图片
 	@Column(name = "OWNER_NEG_IMGURL")
@@ -94,8 +95,8 @@ public class AssVehicleRelieve extends AbstractStringPropertyUUIDEntity {
 	private String ownerName;//车主身份证上名
 	@Column(name = "OWNER_ID_NUM")
 	private String ownerIdNum;//车主身份证证件号
-	@Column(name = "STEP")
-	private AssVehicleRealseStep step;
+//	@Column(name = "STEP")
+//	private AssVehicleRealseStep step;
 
 
 

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

@@ -1,24 +0,0 @@
-package cn.com.taiji.core.entity.dict.ass;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@AllArgsConstructor
-@Getter
-public enum AssVehicleRealseStep {
-
-    //已提交待审核
-    SUBMIT_AUDIT(1, "已提交待审核"),
-    //审核不通过
-    AUDIT_FAIL(2, "审核不通过"),
-    //解除车牌占用
-    RELEASE_PLATE(3, "审核通过-解除车牌占用"),
-    ;
-
-    private Integer code;
-    private String desc;
-
-
-
-}

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

@@ -1,22 +0,0 @@
-package cn.com.taiji.core.entity.dict.ass;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@AllArgsConstructor
-@Getter
-public enum RelieveStatus {
-
-    //未处理
-    UNHANDLED(0,"未处理"),
-
-    //已处理成功
-    HANDLED_SUCCESS(1,"已处理成功"),
-
-    //已处理失败
-    HANDLED_FAIL(2,"已处理失败"),
-    ;
-
-    private Integer code;
-    private String desc;
-}

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

@@ -4,6 +4,7 @@ import cn.com.taiji.common.pub.validation.PatternFactory;
 import cn.com.taiji.core.entity.dict.basic.IdType;
 import cn.com.taiji.core.entity.dict.basic.PlateColorType;
 import cn.com.taiji.core.entity.dict.basic.SourceType;
+import cn.com.taiji.core.entity.dict.basic.UserType;
 import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeRequest;
 import cn.com.taiji.core.model.comm.protocol.constraint.EnumInteger;
 import cn.com.taiji.core.model.comm.protocol.constraint.IntegerConstant;
@@ -45,10 +46,10 @@ public class ReleasePlateApplyRequest extends AbstractSignTypeRequest<ReleasePla
     @Pattern(regexp = "^1[3-9][0-9]{9}$", message = "手机号格式错误")
     private String mobile;//手机号
     @NotBlank
-    private String name;//身份证姓名
+    private String name;//身份证OCR姓名
     @NotBlank
     @Pattern(regexp = PatternFactory.idCodeRegexp, message = "身份证格式错误")
-    private String customerIdNum;//证件号码
+    private String userIdNum;//证件号码
     @NotBlank
     private String userPosImagesUrl;//身份证人像图片地址
     @NotBlank
@@ -58,13 +59,13 @@ public class ReleasePlateApplyRequest extends AbstractSignTypeRequest<ReleasePla
     @NotBlank
     private String vehNegImgUrl;//行驶证副页图片地址
     @NotBlank
-    private String vehicleOwnerName;
+    private String vehicleOwnerName;//行驶证OCR识别的姓名
 
-    //=============================单位车辆/个人授权==============================
-    private String unitName;//单位名称车辆所有人
-    @EnumInteger(enumClazz = IdType.class)
-    private Integer unitIdType;//单位证件类型
-    private String unitId;//单位证件编号
+    //=============================车主信息==============================
+//    private String unitName;//单位名称车辆所有人
+//    @EnumInteger(enumClazz = IdType.class)
+//    private Integer unitIdType;//单位证件类型
+//    private String unitId;//单位证件编号
 
     @EnumInteger(enumClazz = IdType.class, message = "用户证件类型不合规")
     @IntegerConstant(values = "101,203")
@@ -74,7 +75,7 @@ public class ReleasePlateApplyRequest extends AbstractSignTypeRequest<ReleasePla
     private String ownerIdNum;//非本人办理，车主证件号
     private String ownerPosImgUrl;//非本人办理，车主身份证件人面地址
     private String ownerNegImgUrl;//非本人办理，车主身份证件国徽地址
-    private String unitImagesUrl;//营业执照图片地址
+//    private String unitImagesUrl;//营业执照图片地址
     private String proxyUrl;//授权书图片地址
 
     @NotNull
@@ -88,35 +89,13 @@ public class ReleasePlateApplyRequest extends AbstractSignTypeRequest<ReleasePla
 
     public void relatedValid(ErrorMsgBuilder builder) {
         builder.validFieldTrue("sourceType", sourceType == SourceType.ALI || sourceType == SourceType.WECHAT || sourceType == SourceType.WEB || sourceType == SourceType.SERVICE_HALL, "申请来源不正确");
-//        if (applyType == 2){
-//            builder.validFieldNotBlank("unitName",unitName);
-//            builder.validFieldNotNull("unitIdType",unitIdType);
-//            builder.validFieldNotBlank("unitId",unitId);
-//            builder.validFieldNotBlank("unitImagesUrl",unitImagesUrl);
-//            builder.validFieldNotBlank("proxyUrl",proxyUrl);
-//        }
-//        //个人
-//        if (applyType == 1){
-//            builder.validFieldNotNull("isSelf",isSelf);
-//            if (isSelf == 2) {
-//                builder.validFieldNotBlank("ownerName", ownerName);
-//                builder.validFieldNotBlank("ownerIdNum", ownerIdNum);
-//                builder.validFieldNotBlank("ownerPosImgUrl", ownerPosImgUrl);
-//                builder.validFieldNotBlank("ownerNegImgUrl", ownerNegImgUrl);
-//            }
-//        }
         if (ownerIdType != null){
             builder.validFieldNotBlank("proxyUrl",proxyUrl);
-
-            if (ownerIdType == 101) {
-                builder.validFieldNotBlank("unitName", unitName);
-                builder.validFieldNotNull("unitIdType", unitIdType);
-                builder.validFieldNotBlank("unitId", unitId);
-                builder.validFieldNotBlank("unitImagesUrl", unitImagesUrl);
-            }else {
-                builder.validFieldNotBlank("ownerName", ownerName);
-                builder.validFieldNotBlank("ownerIdNum", ownerIdNum);
-                builder.validFieldNotBlank("ownerPosImgUrl", ownerPosImgUrl);
+            builder.validFieldNotBlank("ownerName", ownerName);
+            builder.validFieldNotBlank("ownerIdNum", ownerIdNum);
+            builder.validFieldNotBlank("ownerPosImgUrl", ownerPosImgUrl);
+            if (UserType.PERSONAL_USER == IdType.judgeUserType(ownerIdType)) {
+                //个人证件有国徽
                 builder.validFieldNotBlank("ownerNegImgUrl", ownerNegImgUrl);
             }
         }

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

@@ -6,13 +6,9 @@ import cn.com.taiji.core.entity.basic.QtkBlackCard;
 import cn.com.taiji.core.entity.basic.QtkBlackObu;
 import cn.com.taiji.core.entity.basic.QtkCardInfo;
 import cn.com.taiji.core.entity.basic.QtkObuInfo;
-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.core.model.comm.protocol.AbstractSignTypeResponse;
 import lombok.Getter;
 import lombok.Setter;
-import java.time.LocalDateTime;
 import java.util.List;
 /**
  * @Author：ChenChao
@@ -25,30 +21,6 @@ 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 AssVehicleRelieve vehicleRelieve;
     private QtkCardInfo cardInfo;
     private QtkObuInfo obuInfo;

gly-base-core/src/main/java/cn/com/taiji/core/repo/request/issue/OrderCouponRedeemCodePageRequest.java

@@ -1,34 +0,0 @@
-package cn.com.taiji.core.repo.request.issue;
-
-import java.time.LocalDateTime;
-
-import cn.com.taiji.common.pub.dao.HqlBuilder;
-import cn.com.taiji.common.repo.request.jpa.JpaDateTimePageableDataRequest;
-import cn.com.taiji.core.entity.issue.OrderCouponRedeemCode;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class OrderCouponRedeemCodePageRequest extends JpaDateTimePageableDataRequest<OrderCouponRedeemCode>{
-
-
-
-
-	public OrderCouponRedeemCodePageRequest() {
-		this.orderBy="id";
-		this.desc=true;
-	}
-
-	@Override
-	public HqlBuilder toSelectHql(){
-		HqlBuilder hql = new HqlBuilder("from OrderCouponRedeemCode where 1=1 ");
-
-		return hql;
-	}
-
-
-
-
-
-}