Merge branch 'master' of http://82.156.35.112:3000/qiubinghui/zhywpt-issuer

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/RealsePlateRequestDTO.java

@@ -43,7 +43,7 @@ public class RealsePlateRequestDTO extends AbstractBizRequestDTO {
     private Integer vehiclePlateColor;
     @ApiModelProperty(value = "手机号", required = true)
     @NotBlank
-    @Pattern(regexp = PatternFactory.mobileRegexp, message = "手机号格式错误")
+    @Pattern(regexp = "^1[3-9][0-9]{9}$", message = "手机号格式错误")
     private String mobile;
     @ApiModelProperty(value = "身份证姓名", required = true)
     @NotBlank

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/issueOrder/IssueOrderQueryManageImpl.java

@@ -379,7 +379,11 @@ public class IssueOrderQueryManageImpl extends AbstractManagewManager implements
         ActiveInfoModel activeInfoModel = new ActiveInfoModel();
         activeInfoModel.setActivationTime(issueOrderinfo.getActivationTime());
         activeInfoModel.setCardId(issueOrderinfo.getCardId());
+        activeInfoModel.setCardEnableTime(issueOrderinfo.getCardEnableTime());
+        activeInfoModel.setCardExpireTime(issueOrderinfo.getCardExpireTime());
         activeInfoModel.setObuId(issueOrderinfo.getObuId());
+        activeInfoModel.setObuEnableTime(issueOrderinfo.getObuEnableTime());
+        activeInfoModel.setObuExpireTime(issueOrderinfo.getObuExpireTime());
         QtkCardInfo cardInfo = qtkCardInfoRepo.findByCardId(issueOrderinfo.getCardId());
         activeInfoModel.setWarrantyDate(cardInfo.getWarrantyDate());
         return activeInfoModel;

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/issueOrder/ActiveInfoModel.java

@@ -26,10 +26,10 @@ public class ActiveInfoModel {
     private String cardId;
     @ApiModelProperty(value = "签号")
     private String obuId;
-    @ApiModelProperty(value = "开卡时间")
-    private String openTime;
-    @ApiModelProperty(value = "开签时间")
-    private String openObuTime;
+//    @ApiModelProperty(value = "开卡时间")
+//    private String openTime;
+//    @ApiModelProperty(value = "开签时间")
+//    private String openObuTime;
     @ApiModelProperty(value = "卡启用时间")
     private LocalDateTime cardEnableTime;//卡启用时间
     @ApiModelProperty(value = "卡到期时间")

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

@@ -31,6 +31,10 @@ public class ChangeMobileByCodeManager extends AbstractLoginManager implements L
     public ChangeMobileByCodeResponse serviceHandle(ChangeMobileByCodeRequest request) throws ServiceHandleException {
         try {
             long begin = System.currentTimeMillis();
+            AccountInfo newAccount = accountInfoRepo.findByAccount(request.getNewMobile());
+            if (newAccount != null){
+                throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("新手机号已存在账户，不可使用新手机号更换");
+            }
             if (!Lists.newArrayList(SourceType.ALI, SourceType.WECHAT).contains(request.getLoginSource()))
                 throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("仅向小程序用户开放此功能");
             String smsCode = redisManager.get(RedisKeyGenerator.getSmsCodeKey(request.getNewMobile(), request.getLoginSource().name(), 3));