Merge remote-tracking branch 'origin/master'

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

@@ -140,21 +140,6 @@ public class AssVehicleInfoChange extends StringPropertyUUIDEntity {
     private String proxyUrl;//委托书照片
     //================================================
 
-
-//    @Column(name = "AGENT_ID_TYPE")
-//    @Enumerated(EnumType.STRING)
-//    private IdType agentIdType;//经办人证件类型
-//    @Column(name = "AGENT_ID_NUM")
-//    private String agentIdNum;//经办人证件号
-//    @Column(name = "AGENT_NAME")
-//    private String agentName;//经办人姓名
-//    @Column(name = "PROXY_URL")
-//    private String proxyUrl;//委托书照片
-//    @Column(name = "AGENT_POS_IMG_URL")
-//    private String agentPosImgUrl;//经办人正面照片
-//    @Column(name = "AGENT_NEG_IMG_URL")
-//    private String agentNegImgUrl;//经办人反面照片
-
     //申请人
     @Column(name = "USER_ID_TYPE")
     @Enumerated(EnumType.STRING)

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

@@ -70,6 +70,7 @@ public class VehicleChangeApllyRequest extends AbstractSignTypeRequest<VehicleCh
     @NotBlank
     private String vehicleDimensions;// 车辆尺寸
     @Min(value = 2)
+    @NotNull
     private Integer axleCount;// 车轴数
     @NotBlank
     private String issueDate;// 发证日期
@@ -89,14 +90,6 @@ public class VehicleChangeApllyRequest extends AbstractSignTypeRequest<VehicleCh
     private Integer feeVehicleType;//收费车型 后端自己计算
 
     /**以下是办理人信息，非小程序时必传*/
-//    private String agentName;// 经办人姓名
-//    @EnumInteger(enumClazz = IdType.class, message = "用户证件类型不合规")
-//    private Integer agentIdType;// 经办人证件类型
-//    private String agentIdNum;// 经办人证件号码
-//    private String agentTel;// 经办人手机号
-//    private String agentAddress;// 经办人证件地址
-//    private String agentPosImgUrl;// 经办人证件正面照片地址
-//    private String agentNegImgUrl;// 经办人证件反面照片地址
 //===================办理人信息================================
     @NotBlank
     @Pattern(regexp = "^1[3-9][0-9]{9}$", message = "手机号格式错误")
@@ -127,16 +120,24 @@ public class VehicleChangeApllyRequest extends AbstractSignTypeRequest<VehicleCh
     private String ownerName;//身份证上姓名
     private String proxyUrl;// 委托书地址
 
+    private String productId;//产品编号
+
     public void relatedValid(ErrorMsgBuilder validator) {
-        try {
-            if (vehicleDimensions.contains("X") || vehicleDimensions.contains("x") || vehicleDimensions.contains("×")) {
+        if (SourceType.WECHAT.equals(orderSource) || SourceType.ALI.equals(orderSource)) {
+            validator.validFieldNotBlank("openId", openId);
+        }else {
+            validator.validFieldNotBlank("staffNum", staffNum);
+        }
+        if (vehicleDimensions.contains("X") || vehicleDimensions.contains("x") || vehicleDimensions.contains("×")
+                || vehicleDimensions.contains("*")) {
+            try {
                 Integer.valueOf(vehicleDimensions.split("[Xx×*]")[0]);
-            }else {
-                validator.append("vehicleDimensionsError", "vehicleDimensions", vehicleDimensions,
+            } catch (Exception e) {
+                validator.validField("vehicleDimensionsError", "vehicleDimensions",true,vehicleDimensions,
                         String.format("车辆车辆外廓尺寸参数不合规，无法计算收费车型_[%s]", vehicleDimensions));
             }
-        } catch (Exception e) {
-            validator.append("vehicleDimensionsError", "vehicleDimensions", vehicleDimensions,
+        }else {
+            validator.validField("vehicleDimensionsError", "vehicleDimensions",true,vehicleDimensions,
                     String.format("车辆车辆外廓尺寸参数不合规，无法计算收费车型_[%s]", vehicleDimensions));
         }
         // 货车必填字段
@@ -152,25 +153,18 @@ public class VehicleChangeApllyRequest extends AbstractSignTypeRequest<VehicleCh
             validator.validFieldNotBlank("roadTransportPermitPicUrl", roadTransportPermitPicUrl);
             validator.validFieldNotBlank("licenseIdNum",licenseIdNum);
         }
-        if (SourceType.WECHAT.equals(orderSource) || SourceType.ALI.equals(orderSource)) {
-            validator.validFieldNotBlank("openId", openId);
-        }else {
-            validator.validFieldNotBlank("staffNum", staffNum);
+        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);
+            }
         }
 
     }
 
-    public void ownerValid(ErrorMsgBuilder validator) {
-        validator.validFieldNotBlank("ownerName",ownerName);
-        validator.validFieldNotNull("ownerIdType",ownerIdType);
-        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);
-        }
-    }
-
 }

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/issue/IssueProductPromotionRepo.java

@@ -25,4 +25,8 @@ public interface IssueProductPromotionRepo extends AbstractJpaRepo<IssueProductP
     @Query("select releaseId from IssueProductPromotion where status = 'ENABLE' and agencyId like ?1 and dateOfListing <= ?2 and dateOfDelist >= ?2 and orderType = ?3")
     List<String> findReleaseIds(String agencyId, LocalDateTime time, OrderType type);
 
+    //查询启用状态的产品编号(不分渠道)
+    @Query("select releaseId from IssueProductPromotion where status = 'ENABLE' and dateOfListing <= ?2 and dateOfDelist >= ?2 and orderType = ?3")
+    List<String> findReleaseIds(LocalDateTime time, OrderType type);
+
 }