1115bug

alien-entity/src/main/java/shop/alien/entity/store/vo/StoreMainInfoVo.java

@@ -86,6 +86,9 @@ public class StoreMainInfoVo extends StoreInfo {
     @ApiModelProperty(value = "到期时间")
     private String expirationDate;
 
+    @ApiModelProperty(value = "合同是否到期 0已到期/1没到期")
+    private Integer expirationFlag;
+
     @ApiModelProperty(value = "门店注销中倒计时时间毫秒")
     private long countdown;
 

alien-store/src/main/java/shop/alien/store/service/impl/StoreInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package shop.alien.store.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.util.DateUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -158,6 +159,18 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
              return null;
         }
         StoreMainInfoVo storeMainInfoVo = storeInfoMapper.getStoreInfo(id);
+
+        //判断门店是否到期
+        if (ObjectUtils.isNotEmpty(storeMainInfoVo.getExpirationDate())) {
+            if (new Date().after(DateUtils.parseDate(storeMainInfoVo.getExpirationDate()))) {
+                storeMainInfoVo.setExpirationFlag(0);
+            }else {
+                storeMainInfoVo.setExpirationFlag(1);
+            }
+        }else {
+            storeMainInfoVo.setExpirationFlag(1);
+        }
+
         //存入门店地址、
         storeMainInfoVo.setStoreAddress(storeInfo.getStoreAddress());
         //入口图