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

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/service/impl/SeoKeywordsRankServiceImpl.java

@@ -149,7 +149,7 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
         if (subscribePlan != null) {
             // 添加套餐信息
             comprehensiveStatistics.setPlanName(subscribePlan.getPlanName());
-            comprehensiveStatistics.setPlanType(subscribePlan.getMarketType());
+            comprehensiveStatistics.setPlanType(subscribePlan.getPlanType());
 
             // 添加套餐数据
             comprehensiveStatistics.setPlanAppointKeywordNum(subscribePlan.getSpecifyKeyword());

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

@@ -137,7 +137,7 @@ public class SelfWebSiteServiceCommon {
         log.info(FastJsonUtil.toJSONString(adwebSite));
         if (StringUtils.isNotBlank(planId)) {
             SubscribePlan subscribePlan = subscribePlanService.getById(planId);
-            if (!"SEO".equals(subscribePlan.getMarketType())) {
+            if (!"SEO".equals(subscribePlan.getPlanType())) {
                 giveDay = 0;
                 compensateDay = 0;
             }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscription/controller/SubscribePlanController.java

@@ -84,7 +84,7 @@ public class SubscribePlanController extends JeecgController<SubscribePlan, ISub
 
         subscribePlan.setCreateTime(new Date());
         LambdaQueryWrapper<SubscribePlan> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(SubscribePlan::getMarketType, subscribePlan.getMarketType());
+        queryWrapper.eq(SubscribePlan::getPlanType, subscribePlan.getPlanType());
         queryWrapper.eq(SubscribePlan::getPlanName, subscribePlan.getPlanName());
         queryWrapper.ne(SubscribePlan::getStatus, 0);
         List<SubscribePlan> subscribePlans = subscribePlanService.list(queryWrapper);
@@ -92,7 +92,7 @@ public class SubscribePlanController extends JeecgController<SubscribePlan, ISub
             return Result.error("方案名称已存在！");
         }
         // 生成编码
-        subscribePlan.setPlanCode(subscribePlan.getMarketType() + getPlanCode());
+        subscribePlan.setPlanCode(subscribePlan.getPlanType() + getPlanCode());
         if (subscribePlan.getKeywordCount() == null) {
             subscribePlan.setKeywordCount(0);
         }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscription/service/impl/UserPlanSubscriptionServiceImpl.java

@@ -113,7 +113,7 @@ public class UserPlanSubscriptionServiceImpl
                     userPlanSubscription.setPlanName(subscribePlan.getPlanName());
                     userPlanSubscription.setPlanCode(subscribePlan.getPlanCode());
                     userPlanSubscription.setPlanPrice(subscribePlan.getPrice());
-                    userPlanSubscription.setPlanType(subscribePlan.getMarketType());
+                    userPlanSubscription.setPlanType(subscribePlan.getPlanType());
                     userPlanSubscription.setServiceMonth(subscribePlan.getServiceTime());
                     result = this.save(userPlanSubscription);
                 } else if (userPlanSubscription.getIsCustom() == 1) { // 是自定义套餐开启时间
@@ -121,7 +121,7 @@ public class UserPlanSubscriptionServiceImpl
                     userPlanSubscription.setPlanName(subscribePlan.getPlanName());
                     userPlanSubscription.setPlanCode(subscribePlan.getPlanCode());
                     userPlanSubscription.setPlanPrice(subscribePlan.getPrice());
-                    userPlanSubscription.setPlanType(subscribePlan.getMarketType());
+                    userPlanSubscription.setPlanType(subscribePlan.getPlanType());
                     DateTime today = cn.hutool.core.date.DateUtil.date();
                     long betweenTime =
                             cn.hutool.core.date.DateUtil.between(
@@ -161,7 +161,7 @@ public class UserPlanSubscriptionServiceImpl
             userPlanSubscription.setPlanName(subscribePlan.getPlanName());
             userPlanSubscription.setPlanCode(subscribePlan.getPlanCode());
             userPlanSubscription.setPlanPrice(subscribePlan.getPrice());
-            userPlanSubscription.setPlanType(subscribePlan.getMarketType());
+            userPlanSubscription.setPlanType(subscribePlan.getPlanType());
             userPlanSubscription.setServiceMonth(subscribePlan.getServiceTime());
             result = this.save(userPlanSubscription);
         } catch (Exception e) {