core,managew

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

@@ -116,5 +116,13 @@ public class AssOrderinfo extends AbstractStringPropertyUUIDEntity {
 	private CardType cardType;// 卡类型
 	@Column(name = "OBU_ID")
 	private String obuId;//OBU编号
+	@Size(max = 32)
+	@Column(name = "CANCEL_OPEN_ID")
+	private String cancelOpenId;//取消人
+	@Column(name = "CANCEL_TIME")
+	private LocalDateTime cancelTime;//取消时间
+	@Size(max = 255)
+	@Column(name = "CANCEL_REASON")
+	private String cancelReason;//取消原因
 
 }

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

@@ -31,7 +31,7 @@ public class AssVehicleInfoChange extends StringPropertyUUIDEntity {
     @Column(name = "ORDER_NO")
     private String orderNo;//订单编号
     @Column(name = "CHANGE_TYPE")
-    private Integer changeType;// 类型 1-改车牌 2-改车辆信息
+    private Boolean changeType;// 是否变更车牌
     @NotBlank
     @Size(max = 64)
     @Column(name = "VEHICLE_PLATE")
@@ -47,7 +47,6 @@ public class AssVehicleInfoChange extends StringPropertyUUIDEntity {
     @Size(max = 255)
     @Column(name = "ENGINE_NUM")
     private String engineNum;//发动机编号;
-    @NotNull
     @Column(name = "REGISTER_DATE")
     private String registerDate;//注册日期-行驶证;
     @NotBlank
@@ -84,7 +83,6 @@ public class AssVehicleInfoChange extends StringPropertyUUIDEntity {
     @Size(max = 512)
     @Column(name = "OWNER_NAME")
     private String ownerName;//车主姓名;
-    @NotNull
     @Column(name = "OWNER_IDTYPE")
     @Enumerated(EnumType.STRING)
     private IdType ownerIdType;//车主证件类型;
@@ -175,22 +173,6 @@ public class AssVehicleInfoChange extends StringPropertyUUIDEntity {
     @Column(name = "AGREE_TIME")
     private LocalDateTime agreeTime;//签约协议时间
 
-    @Size(max = 32)
-    @Column(name = "CANCEL_OPEN_ID")
-    private String cancelOpenId;//取消人
-    @Column(name = "CANCEL_TIME")
-    private LocalDateTime cancelTime;//取消时间
-    @Size(max = 255)
-    @Column(name = "CANCEL_REASON")
-    private String cancelReason;//取消原因
-    @Size(max = 50)
-    @Column(name = "CLOSE_OPEN_ID")
-    private String closeOpenId;//关闭人id
-    @Size(max = 255)
-    @Column(name = "CLOSE_REASON")
-    private String closeReason;//关闭原因
-    @Column(name = "CLOSE_TIME")
-    private LocalDateTime closeTime;//关闭时间
     @NotNull
     @Column(name = "UPGRADE_STATUS")
     @Enumerated(EnumType.STRING)
@@ -202,5 +184,8 @@ public class AssVehicleInfoChange extends StringPropertyUUIDEntity {
     @NotNull
     @Column(name = "INSERT_TIME")
     private LocalDateTime insertTime;//创建时间
+    @NotNull
+    @Column(name = "UPDATE_TIME")
+    private LocalDateTime updateTime;//修改时间
 
 }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/api/product/ProductController.java

@@ -3,10 +3,7 @@ package cn.com.taiji.managew.api.product;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.common.web.ApiResponse;
-import cn.com.taiji.core.entity.issue.IssueAgreement;
-import cn.com.taiji.core.entity.issue.IssueProduct;
 import cn.com.taiji.managew.api.MyValidController;
-import cn.com.taiji.managew.dto.product.agreement.*;
 import cn.com.taiji.managew.dto.product.product.*;
 import cn.com.taiji.managew.manager.product.ProductManager;
 import io.swagger.annotations.Api;

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/product/product/ProductAddRequestDto.java

@@ -143,6 +143,6 @@ public class ProductAddRequestDto extends AbstractStaffBizRequestDTO {
                         (ObjectUtil.isEmpty(processingFeeList) && ObjectUtil.isEmpty(useFeeList)),
                 "使用费或办理费必填，并且只能填写一种");
         validator.validField("releaseId",!releaseId.matches("\\d+"),"请输入数字类型");
-        validator.validField("",promotionMode==2 && !needPay,"线下推广模式需要支付");
+//        validator.validField("",promotionMode==2 && !needPay,"线下推广模式需要支付");
     }
 }