managew 订单详情激活信息补充

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 = "卡到期时间")