fengji 修复剩余天数

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TenantProductSumm.java

@@ -48,7 +48,7 @@ public class TenantProductSumm extends TenantInfo implements Serializable  {
     private Date expiryDateEnd;
 
     @ApiModelProperty(value = "剩余天数")
-    private String validRemaining;
+    private Integer validRemaining;
 
     @ApiModelProperty(value = "总余额")
     private BigDecimal sumBalance;
@@ -109,11 +109,11 @@ public class TenantProductSumm extends TenantInfo implements Serializable  {
         this.expiryDateEnd = expiryDateEnd;
     }
 
-    public String getValidRemaining() {
+    public Integer getValidRemaining() {
         return validRemaining;
     }
 
-    public void setValidRemaining(String validRemaining) {
+    public void setValidRemaining(Integer validRemaining) {
         this.validRemaining = validRemaining;
     }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantInfoServiceImpl.java

@@ -660,6 +660,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         } else {
             d1 = null;
         }
+        tps.setValidRemaining(DateUtil.daysBetween(new Date(), tps.getExpiryDateEnd()));
         tps.setSumBalance(tps.getBalance().add(tps.getFrozenAmount()));
         tps.setExpiryDateEnd(d1);