商户过期时间

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/LoginController.java

@@ -76,7 +76,6 @@ public class LoginController {
             List<EnterpriseDTO> enterpriseDTOList = this.enterpriseApiService.listEnterpriseByIds(enterpriseIdList).getResult();
             //随机取一个用户
             Integer enterpriseId = userDTOList.get(0).getEnterpriseId();
-            Date enterpriseCreateTime = userDTOList.get(0).getCreateTime();
             ServiceResponse<Void> smsSendResult = ServiceResponse.success();
             if(!tsPhone.equals(phoneNumber)){
                 code = CreateRandomUtils.generateNumberStr(4);
@@ -86,7 +85,6 @@ public class LoginController {
                 String key = "GYTCode:" + areaCode + ":" + phoneNumber;
                 LoginUserVo userVo = new LoginUserVo();
                 userVo.setEnterpriseId(enterpriseId);
-                userVo.setCreateTime(enterpriseCreateTime);
                 userVo.setAreaCode(areaCode);
                 userVo.setCode(code);
                 userVo.setPhoneNumber(phoneNumber);
@@ -95,6 +93,8 @@ public class LoginController {
 
                 enterpriseDTOList.stream().forEach(enterpriseDTO -> {
                     if(enterpriseDTO.getEnterpriseId().intValue() == enterpriseId.intValue()){
+                        userVo.setCreateTime(enterpriseDTO.getCreateTime());
+                        userVo.setAuditTime(enterpriseDTO.getAuditTime());
                         if(phoneNumber.equals(enterpriseDTO.getPhoneNumber())){
                             userVo.setIsAdmin(1);
                         }

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/vo/LoginUserVo.java

 package com.gic.cloud.web.vo;
 
 import java.io.Serializable;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 
 /**
@@ -26,6 +27,54 @@ public class LoginUserVo implements Serializable {
      */
     private Date createTime;
 
+    /**
+     * 基础服务过期时间
+     */
+    private Date auditTime;
+
+    private String expireDate;
+
+    /**
+     * 过期状态 1：过期 0：未过期
+     */
+    private Integer isExpire;
+
+    public String getExpireDate() {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        if (auditTime != null) {
+            return sdf.format(auditTime);
+        }
+        return expireDate;
+    }
+
+    public LoginUserVo setExpireDate(String expireDate) {
+        this.expireDate = expireDate;
+        return this;
+    }
+
+    public Integer getIsExpire() {
+        if (auditTime != null) {
+            if (new Date().compareTo(auditTime) > 0) {
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    public LoginUserVo setIsExpire(Integer isExpire) {
+        this.isExpire = isExpire;
+        return this;
+    }
+
+    public Date getAuditTime() {
+        return auditTime;
+    }
+
+    public LoginUserVo setAuditTime(Date auditTime) {
+        this.auditTime = auditTime;
+        return this;
+    }
+
     public Integer getUserId() {
         return userId;
     }