产品续费时间显示

diagbotman-service/src/main/java/com/diagbot/entity/UserRenewals.java

@@ -89,6 +89,19 @@ public class UserRenewals implements Serializable {
      */
     private Integer cancelRenewals;
 
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
     public Integer getCancelRenewals() {
         return cancelRenewals;
     }

diagbotman-service/src/main/java/com/diagbot/facade/OpenedProductsFacade.java

@@ -289,6 +289,7 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
         userRenewals.setRenewalsStatus(RenewalsEnum.RENEWALS.getKey());
         userRenewals.setGmtModified(DateUtil.now());
         userRenewals.setModifier(UserUtils.getCurrentPrincipleID());
+        userRenewals.setEndTime(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.getLastTimeOfDay(DateUtil.parseDate(modifyOpeningTimeVO.getEndTime())))));
         userRenewals.setRenewalsNo(modifyOpeningTimeVO.getRenewalsNo());
        //修改续费时间
         boolean res = modifyOpeningTime(openedProducts);

diagbotman-service/src/main/java/com/diagbot/facade/UserRenewalsFacade.java

@@ -135,9 +135,11 @@ public class UserRenewalsFacade extends UserRenewalsServiceImpl {
 //                    bean.setProductName(productLineDTO.getName());
 //                }
 //            }
-            for (OpenedProducts openedProducts:opendList) {
-                if(openedProducts.getUserId().longValue() == bean.getUserId().longValue()&&openedProducts.getProductId().longValue() == bean.getProductId().longValue()){
-                    bean.setEndTime(openedProducts.getEndTime());
+            if(bean.getRenewalsStatus().intValue() == RenewalsEnum.NOT_RENEWALS.getKey()){
+                for (OpenedProducts openedProducts:opendList) {
+                    if(openedProducts.getUserId().longValue() == bean.getUserId().longValue()&&openedProducts.getProductId().longValue() == bean.getProductId().longValue()){
+                        bean.setEndTime(openedProducts.getEndTime());
+                    }
                 }
             }
             if (null != productMap && null != productMap.get(bean.getProductId())){

docs/003.20181024初始化脚本/init_diagbotcloud.sql

@@ -180,6 +180,7 @@ CREATE TABLE `diag_user_renewals` (
   `apply_time` datetime NOT NULL  COMMENT '申请时间',
   `renewals_no` varchar(100) NOT NULL DEFAULT '' COMMENT '续费单号',
   `cancel_renewals` int(10) NOT NULL DEFAULT '0' COMMENT '取消续费状态（0.未取消1.取消）',
+  `end_time` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='用户续费申请表';