Merge remote-tracking branch 'origin/master'

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

@@ -90,10 +90,10 @@ public class AssOrderinfo extends AbstractStringPropertyUUIDEntity {
 	private String remark;//备注
 	@NotNull
 	@Column(name = "INSERT_TIME")
-	private LocalDateTime insertTime;//入库时间
+	private LocalDateTime insertTime = LocalDateTime.now();//入库时间
 	@NotNull
 	@Column(name = "UPDATE_TIME")
-	private LocalDateTime updateTime;//更新时间
+	private LocalDateTime updateTime = LocalDateTime.now();//更新时间
 	@Column(name = "URGENT")
 	private Integer urgent = 0;//是否催单，1是，0否
 	@Column(name = "VEHICLE_ID")

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

@@ -36,7 +36,6 @@ public class AssVehicleRelieve extends AbstractStringPropertyUUIDEntity {
 	private String relieveObuId;//解除的签号;被解除的OBU签号
 	@Column(name = "RELIEVE_TIME")
 	private LocalDateTime relieveTime;//解除时间
-	@Size(max = 32)
 	@Column(name = "RELIEVE_STATUS")
 	@Enumerated(EnumType.STRING)
 	private RelieveStatus relieveStatus;//解除状态;未处理、已处理成功、已处理失败
@@ -46,7 +45,6 @@ public class AssVehicleRelieve extends AbstractStringPropertyUUIDEntity {
 	@Size(max = 255)
 	@Column(name = "USER_NEG_IMAGES_URL")
 	private String userNegImagesUrl;//身份证国徽图片地址(申请人)
-	@Size(max = 32)
 	@Column(name = "USER_TYPE")
 	@Enumerated(EnumType.STRING)
 	private IdType userType;//证件类型;身份证、
@@ -59,7 +57,6 @@ public class AssVehicleRelieve extends AbstractStringPropertyUUIDEntity {
 	private String unitImagesUrl;//营业执照图片地址
 	@Column(name = "PROXY_URL")
 	private String proxyUrl;//授权书图片地址
-	@Size(max = 32)
 	@Column(name = "UNIT_ID_TYPE")
 	@Enumerated(EnumType.STRING)
 	private IdType unitIdType;//单位证件类型
@@ -73,9 +70,9 @@ public class AssVehicleRelieve extends AbstractStringPropertyUUIDEntity {
 	@Column(name = "REMARK")
 	private String remark;//备注
 	@Column(name = "INSERT_TIME")
-	private LocalDateTime insertTime;//创建时间
+	private LocalDateTime insertTime = LocalDateTime.now();//创建时间
 	@Column(name = "UPDATE_TIME")
-	private LocalDateTime updateTime;//更新时间
+	private LocalDateTime updateTime = LocalDateTime.now();//更新时间
 	@Column(name = "OWNER_POS_IMGURL")
 	private String ownerPosImgUrl;//车主证件正面图片
 	@Column(name = "OWNER_NEG_IMGURL")

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/order/VehicleUploadManager.java

@@ -346,7 +346,12 @@ public class VehicleUploadManager extends AbstractOrderManager<VehicleUploadRequ
                 order.setOrderStep(IssueOrderStep.WAITING_AUDIT);
             }else {
                 if (!hasText(failReason)) {
-                    order.setOrderStep(IssueOrderStep.VEHICLE_UPLOAD);//待支付
+                    if (order.getPromotionModes().equals(1)) {// 线上
+                        order.setOrderStep(IssueOrderStep.ORDER_PAID);//待签约
+                    } else if (order.getPromotionModes().equals(2)) {//线下
+                        order.setOrderStep(IssueOrderStep.VEHICLE_UPLOAD);//线下待支付
+                    }
+//                    order.setOrderStep(IssueOrderStep.VEHICLE_UPLOAD);//待支付
                 } else {
                     order.setOrderStep(IssueOrderStep.WAITING_AUDIT);
                 }