Merge branch 'subscription' of wangfan/adweb3-server into master

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/service/SelfWebSiteServiceCommon.java

@@ -141,22 +141,22 @@ public class SelfWebSiteServiceCommon {
                 giveDay = 0;
                 compensateDay = 0;
             }
-            UserPlanSubscription history = new UserPlanSubscription();
-            history.setPlanId(planId);
-            history.setSiteId(adwebSite.getId() + "");
-            history.setIsRenew(0);
+            UserPlanSubscription subscription = new UserPlanSubscription();
+            subscription.setPlanId(planId);
+            subscription.setSiteId(adwebSite.getId() + "");
+            subscription.setIsRenew(0);
 
             if (giveDay != null) {
-                history.setGiveDay(giveDay);
+                subscription.setGiveDay(giveDay);
             } else {
-                history.setGiveDay(0);
+                subscription.setGiveDay(0);
             }
             if (compensateDay != null) {
-                history.setCompensateDay(compensateDay);
+                subscription.setCompensateDay(compensateDay);
             } else {
-                history.setCompensateDay(0);
+                subscription.setCompensateDay(0);
             }
-            userPlanSubscriptionService.addUserPlanSubscription(history, sysUser);
+            userPlanSubscriptionService.addUserPlanSubscription(subscription, sysUser);
         }
 
         log.info("================新站点授权===============");

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/service/SiteManageService.java

@@ -96,45 +96,45 @@ public class SiteManageService {
         siteBasicInfo.setPercentage(siteStatus * 100 / 6);
 
         // 获取绑定的套餐信息
-        UserPlanSubscription history =
+        UserPlanSubscription subscription =
                 userPlanSubscriptionService.getCurrentSubscription(adwebSite.getId());
         String defaultPlanName = sysDictMapper.getDefaultPlanName();
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
 
         // 绑定时间(提单时间)
         // 如果没有绑定套餐或绑定的为默认建站套餐
-        if (history == null
+        if (subscription == null
                 || (StringUtils.isNotEmpty(defaultPlanName)
-                        && defaultPlanName.equals(history.getPlanName()))) {
+                        && defaultPlanName.equals(subscription.getPlanName()))) {
             siteBasicInfo.setCreateTime(dateFormat.format(adwebSite.getCreateTime()));
         } else {
-            siteBasicInfo.setCreateTime(dateFormat.format(history.getCreateTime()));
+            siteBasicInfo.setCreateTime(dateFormat.format(subscription.getCreateTime()));
         }
 
         // 套餐名称及类型
-        if (history == null || StringUtils.isEmpty(history.getPlanName())) {
+        if (subscription == null || StringUtils.isEmpty(subscription.getPlanName())) {
             siteBasicInfo.setPlanName("暂无套餐");
         } else {
-            siteBasicInfo.setPlanName(history.getPlanName());
-            siteBasicInfo.setPlanType(history.getPlanType());
+            siteBasicInfo.setPlanName(subscription.getPlanName());
+            siteBasicInfo.setPlanType(subscription.getPlanType());
         }
 
         // 预计服务到期时间
-        if (history == null || history.getServiceMonth() == null) {
+        if (subscription == null || subscription.getServiceMonth() == null) {
             return siteBasicInfo;
         }
 
         // 获取到期时间，需要判断到期时间是否是指定时间
-        if (history.getServiceStatus() == 0) {
-            Integer serverMonth = history.getServiceMonth();
-            int remainServerDays = getRemainServerDays(serverMonth, userFlag, history.getId());
+        if (subscription.getServiceStatus() == 0) {
+            Integer serverMonth = subscription.getServiceMonth();
+            int remainServerDays = getRemainServerDays(serverMonth, userFlag, subscription.getId());
             if (remainServerDays > 0) {
-                int giveDay = history.getGiveDay();
-                int compensateDay = history.getCompensateDay();
+                int giveDay = subscription.getGiveDay();
+                int compensateDay = subscription.getCompensateDay();
                 int totalGiveAndCompensateDay = giveDay + compensateDay;
                 log.info(
                         "getSiteBasicInfo -- historyId:{},giveDay:{},compensateDay:{},totalGiveAndCompensateDay:{}",
-                        history.getId(),
+                        subscription.getId(),
                         giveDay,
                         compensateDay,
                         totalGiveAndCompensateDay);
@@ -152,13 +152,13 @@ public class SiteManageService {
                 siteBasicInfo.setEndTime("服务已到期");
             }
         } else {
-            Date serveEndTime = history.getServiceEndTime();
-            int giveDay = history.getGiveDay();
-            int compensateDay = history.getCompensateDay();
+            Date serveEndTime = subscription.getServiceEndTime();
+            int giveDay = subscription.getGiveDay();
+            int compensateDay = subscription.getCompensateDay();
             int totalGiveAndCompensateDay = giveDay + compensateDay;
             log.info(
                     "getSiteBasicInfo -- historyId:{},giveDay:{},compensateDay:{},totalGiveAndCompensateDay:{}",
-                    history.getId(),
+                    subscription.getId(),
                     giveDay,
                     compensateDay,
                     totalGiveAndCompensateDay);