商户添加过期字段&观云台应用过期

gic-data-cloud-web/src/main/resources/dubbo-gic-data-cloud-web.xml

@@ -119,15 +119,15 @@
     <dubbo:reference interface="com.gic.mall.share.api.service.ShopApiService" id="shopApiService" timeout="6000"/>
     <dubbo:reference interface="com.gic.mall.api.service.MallActivityThemeApiService" id="mallActivityThemeApiService" timeout="6000"/>
     <dubbo:reference interface="com.gic.data.api.service.StoreStatisicsApiService" id="storeStatisicsApiService" timeout="6000"/>
-    <dubbo:reference interface="com.gic.auth.service.ResourceApiService" id="resourceApiService" timeout="6000"/>
+    <dubbo:reference interface="com.gic.auth.service.ResourceGroupApiService" id="resourceGroupApiService" timeout="6000"/>
     <dubbo:reference interface="com.gic.data.api.service.MemberDataApiService" id="memberDataApiService" timeout="6000"/>
     <dubbo:reference interface="com.gic.member.config.api.service.MemberCardApiService" id="memberCardApiService" timeout="6000"/>
 
-    <dubbo:reference interface="com.gic.weimob.api.service.WeimobStoreSiteService" id="weimobStoreSiteService" timeout="6000"/>
-    <dubbo:reference interface="com.gic.weimob.api.service.WeimobMerchantService" id="weimobMerchantService" timeout="6000"/>
-    <dubbo:reference interface="com.gic.weimob.api.service.WeimobOrderService" id="weimobOrderService" timeout="6000"/>
-    <dubbo:reference interface="com.gic.weimob.api.service.WeimobMemberService" id="weimobMemberService" timeout="6000"/>
-    <dubbo:reference interface="com.gic.weimob.api.service.WeimobBaseService" id="weimobBaseService" timeout="6000"/>
+    <dubbo:reference interface="com.gic.weimob.api.service.WeimobStoreSiteApiService" id="weimobStoreSiteService" timeout="6000"/>
+    <dubbo:reference interface="com.gic.weimob.api.service.WeimobMerchantApiService" id="weimobMerchantService" timeout="6000"/>
+    <dubbo:reference interface="com.gic.weimob.api.service.WeimobOrderApiService" id="weimobOrderService" timeout="6000"/>
+    <dubbo:reference interface="com.gic.weimob.api.service.WeimobMemberBaseApiService" id="weimobMemberService" timeout="6000"/>
+    <dubbo:reference interface="com.gic.weimob.api.service.WeimobBaseApiService" id="weimobBaseService" timeout="6000"/>
     <dubbo:reference interface="com.gic.marketing.api.service.coupon.MemberCouponApiService" id="memberCouponApiService" timeout="6000"/>
 
     <dubbo:reference interface="com.gic.store.service.ClerkApiService" id="clerkApiService" timeout="60000" />

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

+package com.gic.cloud.web.vo;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * 观云台服务相关数据
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/3/24 4:16 PM

+ */
+public class CloudDataServiceInfoVO implements Serializable{
+    private static final long serialVersionUID = -8954200150762286722L;
+
+    /**
+     * 服务版本名称
+     */
+    private String versionName;
+
+    /**
+     * 过期时间
+     */
+    private Date expireTime;
+
+    /**
+     * 过期时间 yyyy-MM-dd
+     */
+    private String expireDate;
+
+    public String getVersionName() {
+        return versionName;
+    }
+
+    public CloudDataServiceInfoVO setVersionName(String versionName) {
+        this.versionName = versionName;
+        return this;
+    }
+
+    public Date getExpireTime() {
+        return expireTime;
+    }
+
+    public CloudDataServiceInfoVO setExpireTime(Date expireTime) {
+        this.expireTime = expireTime;
+        return this;
+    }
+
+    public String getExpireDate() {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        if (expireTime != null) {
+            return sdf.format(expireTime);
+        }
+        return expireDate;
+    }
+
+    public CloudDataServiceInfoVO setExpireDate(String expireDate) {
+        this.expireDate = expireDate;
+        return this;
+    }
+}

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

 package com.gic.cloud.web.vo;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 /**
  * 信息
  * @ClassName: EnterpriseVo

@@ -21,6 +25,50 @@ public class EnterpriseVo {
     /***是否单域**/
     private Integer isSingle = 1;
 
+    /**
+     * 基础服务过期时间
+     */
+    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 EnterpriseVo 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 EnterpriseVo setIsExpire(Integer isExpire) {
+        this.isExpire = isExpire;
+        return this;
+    }
+
+    public EnterpriseVo setAuditTime(Date auditTime) {
+        this.auditTime = auditTime;
+        return this;
+    }
+
     public Integer getEnterpriseId() {
         return enterpriseId;
     }

gic-data-cloud-wxapp/src/main/resources/dubbo-gic-data-cloud-wxapp.xml

@@ -121,15 +121,15 @@
     <dubbo:reference interface="com.gic.mall.share.api.service.ShopApiService" id="shopApiService" timeout="6000"/>
     <dubbo:reference interface="com.gic.mall.api.service.MallActivityThemeApiService" id="mallActivityThemeApiService" timeout="6000"/>
     <dubbo:reference interface="com.gic.data.api.service.StoreStatisicsApiService" id="storeStatisicsApiService" timeout="6000"/>
-    <dubbo:reference interface="com.gic.auth.service.ResourceApiService" id="resourceApiService" timeout="6000"/>
+    <dubbo:reference interface="com.gic.auth.service.ResourceGroupApiService" id="resourceGroupApiService" timeout="6000"/>
     <dubbo:reference interface="com.gic.data.api.service.MemberDataApiService" id="memberDataApiService" timeout="6000"/>
     <dubbo:reference interface="com.gic.member.config.api.service.MemberCardApiService" id="memberCardApiService" timeout="6000"/>
 
-    <dubbo:reference interface="com.gic.weimob.api.service.WeimobStoreSiteService" id="weimobStoreSiteService" timeout="6000"/>
-    <dubbo:reference interface="com.gic.weimob.api.service.WeimobMerchantService" id="weimobMerchantService" timeout="6000"/>
-    <dubbo:reference interface="com.gic.weimob.api.service.WeimobOrderService" id="weimobOrderService" timeout="6000"/>
-    <dubbo:reference interface="com.gic.weimob.api.service.WeimobMemberService" id="weimobMemberService" timeout="6000"/>
-    <dubbo:reference interface="com.gic.weimob.api.service.WeimobBaseService" id="weimobBaseService" timeout="6000"/>
+    <dubbo:reference interface="com.gic.weimob.api.service.WeimobStoreSiteApiService" id="weimobStoreSiteService" timeout="6000"/>
+    <dubbo:reference interface="com.gic.weimob.api.service.WeimobMerchantApiService" id="weimobMerchantService" timeout="6000"/>
+    <dubbo:reference interface="com.gic.weimob.api.service.WeimobOrderApiService" id="weimobOrderService" timeout="6000"/>
+    <dubbo:reference interface="com.gic.weimob.api.service.WeimobMemberBaseApiService" id="weimobMemberService" timeout="6000"/>
+    <dubbo:reference interface="com.gic.weimob.api.service.WeimobBaseApiService" id="weimobBaseService" timeout="6000"/>
     <dubbo:reference interface="com.gic.marketing.api.service.coupon.MemberCouponApiService" id="memberCouponApiService" timeout="6000"/>
 
     <dubbo:reference interface="com.gic.store.service.ClerkApiService" id="clerkApiService" timeout="60000" />
@@ -153,4 +153,6 @@
     <dubbo:reference interface="com.gic.data.api.service.consumestructure.ConsumeStructureApiService" id="consumeStructureApiService" timeout="60000" retries="0"/>
     <dubbo:reference interface="com.gic.data.api.service.BaseSalesApiService" id="baseSalesApiService" timeout="6000" retries="0"/>
     <dubbo:reference interface="com.gic.data.api.service.member.MemberCloudDataApiService" id="memberCloudDataApiService" timeout="6000" retries="0"/>
+
+    <dubbo:reference interface="com.gic.open.api.service.EnterpriseLicenseApiService" id="enterpriseLicenseApiService" timeout="6000" retries="0"/>
 </beans>