设备更换、增补OBU实体

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

@@ -1,7 +1,10 @@
 package cn.com.taiji.core.entity.ass;
 
 import cn.com.taiji.core.entity.AbstractStringPropertyUUIDEntity;
+import cn.com.taiji.core.entity.dict.basic.CardStatus;
+import cn.com.taiji.core.entity.dict.basic.CardType;
 import cn.com.taiji.core.entity.dict.basic.IdType;
+import cn.com.taiji.core.entity.dict.basic.ObuStatus;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -25,10 +28,6 @@ public class AssObuSupply extends AbstractStringPropertyUUIDEntity {
     @NotNull
     @Column(name = "NEED_POST")
     private Boolean needPost;// 需要邮寄
-    @Column(name = "CARD_WARRANTY_TIME")
-    private LocalDateTime cardWarrantyDate;//卡质保期;
-    @Column(name = "OBU_WARRANTY_TIME")
-    private LocalDateTime obuWarrantyTime;//签质保期;
     @NotNull
     @Column(name = "PAYEE")
     private Integer payee;// 收款方 1-黔通 2-渠道
@@ -36,6 +35,17 @@ public class AssObuSupply extends AbstractStringPropertyUUIDEntity {
     @Column(name = "FEE")
     private Integer fee;// 支付金额，无需支付时为0
 
+    /**新设备信息*/
+    @Column(name = "OBU_ID")
+    private String obuId;//签号
+    @Column(name = "OBU_STATUS")
+    @Enumerated(EnumType.STRING)
+    private ObuStatus obuStatus;//obu状态
+    @Column(name = "OBU_ENABLE_TIME")
+    private LocalDateTime obuEnableTime;//obu启用时间
+    @Column(name = "OBU_EXPIRE_TIME")
+    private LocalDateTime obuExpireTime;//obu到期时间
+
     @NotBlank
     @Column(name = "AGENT_NAME")
     private String agentName;// 办理人姓名

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/portal/ChangeMobileByCodeManager.java

@@ -37,7 +37,7 @@ public class ChangeMobileByCodeManager extends AbstractLoginManager implements L
             long begin = System.currentTimeMillis();
             AccountInfo newAccount = accountInfoRepo.findByAccount(request.getNewMobile());
             if (newAccount != null){
-                throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("新手机号已存在账户，不可使用新手机号更换");
+                throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("新手机号已存在账户，不可更换");
             }
             if (!Lists.newArrayList(SourceType.ALI, SourceType.WECHAT).contains(request.getLoginSource()))
                 throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("仅向小程序用户开放此功能");