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

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/mapper/xml/SeoKeywordsMapper.xml

@@ -78,7 +78,7 @@
         SELECT
         IF(COUNT(*) = 0 OR t1.target IS NULL, 10, t1.target)
         FROM
-        seo_market_plan t1,
+        adweb_subscribe_plan t1,
         adweb_sysuser_plan_subscription t2,
         adweb_site t3
         WHERE

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

@@ -3,9 +3,9 @@ package org.jeecg.modules.adweb.seo.service;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.jeecg.modules.adweb.seo.dto.ComprehensiveStatistics;
 import org.jeecg.modules.adweb.seo.entity.SeoKeywords;
-import org.jeecg.modules.adweb.subscription.entity.UserPlanSubscription;
 import org.jeecg.modules.adweb.seo.vo.SeoRankInfoVO;
 import org.jeecg.modules.adweb.site.entity.AdwebSite;
+import org.jeecg.modules.adweb.subscription.entity.UserPlanSubscription;
 
 import java.text.ParseException;
 import java.util.List;
@@ -25,13 +25,14 @@ public interface ISeoKeywordsRankService {
 
     Map getRankInfo(String siteCode) throws ParseException;
 
-    List<SeoRankInfoVO> getSeoRankInfo(String siteCode, String historyId) throws ParseException;
+    List<SeoRankInfoVO> getSeoRankInfo(String siteCode, String subscriptionId)
+            throws ParseException;
 
     void addRankInfoByIntervalTimeByType(
             List<SeoKeywords> keywordList,
             Integer keywordType,
             String siteCode,
-            String historyId,
+            String subscriptionId,
             List<String> dateList)
             throws Exception;
 

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

@@ -18,11 +18,12 @@ import java.util.List;
  */
 public interface ISeoKeywordsService extends IService<SeoKeywords> {
 
-    List<String> getKeywordsLastSevenDays(String userFlag, Integer keywordType, String historyId);
+    List<String> getKeywordsLastSevenDays(
+            String userFlag, Integer keywordType, String subscriptionId);
 
     RankInfoVO getSeoRankInfo(
             String siteCode,
-            String historyId,
+            String subscriptionId,
             Integer rankStart,
             Integer rankEnd,
             String dateStr,
@@ -36,7 +37,7 @@ public interface ISeoKeywordsService extends IService<SeoKeywords> {
             String siteCode,
             Integer keywordType,
             boolean reachStandard,
-            String historyId,
+            String subscriptionId,
             String column,
             String order,
             String buttonColumn,

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

@@ -33,15 +33,15 @@ public class SeoKeywordsServiceImpl extends ServiceImpl<SeoKeywordsMapper, SeoKe
      *
      * @param userFlag
      * @param keywordType
-     * @param historyId
+     * @param subscriptionId
      * @return
      */
     @Override
     public List<String> getKeywordsLastSevenDays(
-            String userFlag, Integer keywordType, String historyId) {
+            String userFlag, Integer keywordType, String subscriptionId) {
         // 获取对应站点最近七天
         List<String> dateList =
-                seoKeywordsMapper.getKeywordsLastSevenDays(userFlag, historyId, keywordType);
+                seoKeywordsMapper.getKeywordsLastSevenDays(userFlag, subscriptionId, keywordType);
         return dateList;
     }
 
@@ -54,14 +54,14 @@ public class SeoKeywordsServiceImpl extends ServiceImpl<SeoKeywordsMapper, SeoKe
     @Override
     public RankInfoVO getSeoRankInfo(
             String siteCode,
-            String historyId,
+            String subscriptionId,
             Integer rankStart,
             Integer rankEnd,
             String dateStr,
             String keywordType) {
         // 指定词
         return seoKeywordsMapper.queryKeywordNumByRankRange(
-                siteCode, historyId, rankStart, rankEnd, dateStr, keywordType);
+                siteCode, subscriptionId, rankStart, rankEnd, dateStr, keywordType);
     }
 
     /**
@@ -78,7 +78,7 @@ public class SeoKeywordsServiceImpl extends ServiceImpl<SeoKeywordsMapper, SeoKe
             String siteCode,
             Integer keywordType,
             boolean reachStandard,
-            String historyId,
+            String subscriptionId,
             String column,
             String order,
             String buttonColumn,
@@ -119,7 +119,7 @@ public class SeoKeywordsServiceImpl extends ServiceImpl<SeoKeywordsMapper, SeoKe
                 siteCode,
                 keywordType,
                 datesStr,
-                historyId,
+                subscriptionId,
                 column,
                 order,
                 buttonColumn,
@@ -132,7 +132,7 @@ public class SeoKeywordsServiceImpl extends ServiceImpl<SeoKeywordsMapper, SeoKe
      * @param page
      * @param siteCode
      * @param keywords
-     * @param historyId
+     * @param subscriptionId
      * @param lastSearchTime
      * @param createTime
      * @param keywordType
@@ -146,7 +146,7 @@ public class SeoKeywordsServiceImpl extends ServiceImpl<SeoKeywordsMapper, SeoKe
             Page<SeoKeywords> page,
             String siteCode,
             String keywords,
-            String historyId,
+            String subscriptionId,
             String lastSearchTime,
             String createTime,
             Integer keywordType,
@@ -159,7 +159,7 @@ public class SeoKeywordsServiceImpl extends ServiceImpl<SeoKeywordsMapper, SeoKe
                     page,
                     siteCode,
                     keywords,
-                    historyId,
+                    subscriptionId,
                     lastSearchTime,
                     createTime,
                     keywordType,
@@ -172,7 +172,7 @@ public class SeoKeywordsServiceImpl extends ServiceImpl<SeoKeywordsMapper, SeoKe
                     page,
                     siteCode,
                     keywords,
-                    historyId,
+                    subscriptionId,
                     lastSearchTime,
                     createTime,
                     keywordType,
@@ -188,7 +188,7 @@ public class SeoKeywordsServiceImpl extends ServiceImpl<SeoKeywordsMapper, SeoKe
                 page,
                 siteCode,
                 keywords,
-                historyId,
+                subscriptionId,
                 lastSearchTime,
                 createTime,
                 keywordType,

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/controller/AdwebSiteController.java

@@ -103,11 +103,11 @@ public class AdwebSiteController extends JeecgController<AdwebSite, IAdwebSiteSe
         // 给站点增加营销计划信息
         List<AdwebSite> siteList = pageList.getRecords();
         for (AdwebSite site : siteList) {
-            Map<String, String> marketPlan =
+            Map<String, String> subscribePlan =
                     userPlanSubscriptionMapper.getSubscribePlanBySiteId(site.getId());
             JSONObject object =
                     FastJsonUtil.parseObject(
-                            FastJsonUtil.toJSONString(marketPlan), JSONObject.class);
+                            FastJsonUtil.toJSONString(subscribePlan), JSONObject.class);
             site.setSubscribePlan(object);
 
             // 设置建站进度

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

@@ -136,8 +136,8 @@ public class SelfWebSiteServiceCommon {
         log.info("===================绑定套餐，套餐id：{}==========================", planId);
         log.info(FastJsonUtil.toJSONString(adwebSite));
         if (StringUtils.isNotBlank(planId)) {
-            SubscribePlan seoMarketPlan = subscribePlanService.getById(planId);
-            if (!"SEO".equals(seoMarketPlan.getMarketType())) {
+            SubscribePlan subscribePlan = subscribePlanService.getById(planId);
+            if (!"SEO".equals(subscribePlan.getMarketType())) {
                 giveDay = 0;
                 compensateDay = 0;
             }

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

@@ -133,7 +133,7 @@ public class SiteManageService {
                 int compensateDay = subscription.getCompensateDay();
                 int totalGiveAndCompensateDay = giveDay + compensateDay;
                 log.info(
-                        "getSiteBasicInfo -- historyId:{},giveDay:{},compensateDay:{},totalGiveAndCompensateDay:{}",
+                        "getSiteBasicInfo -- subscriptionId:{},giveDay:{},compensateDay:{},totalGiveAndCompensateDay:{}",
                         subscription.getId(),
                         giveDay,
                         compensateDay,
@@ -157,7 +157,7 @@ public class SiteManageService {
             int compensateDay = subscription.getCompensateDay();
             int totalGiveAndCompensateDay = giveDay + compensateDay;
             log.info(
-                    "getSiteBasicInfo -- historyId:{},giveDay:{},compensateDay:{},totalGiveAndCompensateDay:{}",
+                    "getSiteBasicInfo -- subscriptionId:{},giveDay:{},compensateDay:{},totalGiveAndCompensateDay:{}",
                     subscription.getId(),
                     giveDay,
                     compensateDay,
@@ -188,9 +188,9 @@ public class SiteManageService {
      * @param siteCode 站点的code
      * @return
      */
-    public int getRemainServerDays(int serverMonth, String siteCode, String historyId) {
+    public int getRemainServerDays(int serverMonth, String siteCode, String subscriptionId) {
         int serverDay = (serverMonth * 30) + (serverMonth / 2);
-        int reachStandardDays = this.getReachStandardDays(siteCode, historyId);
+        int reachStandardDays = this.getReachStandardDays(siteCode, subscriptionId);
         return serverDay - reachStandardDays;
     }
 
@@ -198,10 +198,11 @@ public class SiteManageService {
      * 查询关键词达标天数
      *
      * @param siteCode 站点code
-     * @param historyId 绑定的套餐
+     * @param subscriptionId 绑定的套餐
      * @return 关键词达标天数
      */
-    public int getReachStandardDays(String siteCode, String historyId) {
+    @Deprecated
+    public int getReachStandardDays(String siteCode, String subscriptionId) {
         // 查询关键词达标天数
         //        int specifyKeywordNum = 0;
         //        int longTailKeywordNum = 0;

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

@@ -1,15 +1,20 @@
 package org.jeecg.modules.adweb.subscription.controller;
 
 import cn.hutool.core.util.RandomUtil;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+
 import lombok.extern.slf4j.Slf4j;
+
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
@@ -36,7 +41,7 @@ import java.util.List;
 @RequestMapping("/adweb/subscribePlan")
 @Slf4j
 public class SubscribePlanController extends JeecgController<SubscribePlan, ISubscribePlanService> {
-    @Autowired private ISubscribePlanService seoMarketPlanService;
+    @Autowired private ISubscribePlanService subscribePlanService;
 
     //    @Autowired
     //	private IAdwebMaterialCheckService checkService;
@@ -61,7 +66,7 @@ public class SubscribePlanController extends JeecgController<SubscribePlan, ISub
         QueryWrapper<SubscribePlan> queryWrapper =
                 QueryGenerator.initQueryWrapper(subscribePlan, req.getParameterMap());
         Page<SubscribePlan> page = new Page<SubscribePlan>(pageNo, pageSize);
-        IPage<SubscribePlan> pageList = seoMarketPlanService.page(page, queryWrapper);
+        IPage<SubscribePlan> pageList = subscribePlanService.page(page, queryWrapper);
         return Result.OK(pageList);
     }
 
@@ -82,8 +87,8 @@ public class SubscribePlanController extends JeecgController<SubscribePlan, ISub
         queryWrapper.eq(SubscribePlan::getMarketType, subscribePlan.getMarketType());
         queryWrapper.eq(SubscribePlan::getPlanName, subscribePlan.getPlanName());
         queryWrapper.ne(SubscribePlan::getStatus, 0);
-        List<SubscribePlan> seoMarketPlans = seoMarketPlanService.list(queryWrapper);
-        if (!seoMarketPlans.isEmpty()) {
+        List<SubscribePlan> subscribePlans = subscribePlanService.list(queryWrapper);
+        if (!subscribePlans.isEmpty()) {
             return Result.error("方案名称已存在！");
         }
         // 生成编码
@@ -92,7 +97,7 @@ public class SubscribePlanController extends JeecgController<SubscribePlan, ISub
             subscribePlan.setKeywordCount(0);
         }
 
-        seoMarketPlanService.save(subscribePlan);
+        subscribePlanService.save(subscribePlan);
         return Result.OK("添加成功！");
     }
 
@@ -109,7 +114,7 @@ public class SubscribePlanController extends JeecgController<SubscribePlan, ISub
             value = "/edit",
             method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> edit(@RequestBody SubscribePlan subscribePlan) {
-        seoMarketPlanService.updateById(subscribePlan);
+        subscribePlanService.updateById(subscribePlan);
         return Result.OK("编辑成功!");
     }
 
@@ -124,7 +129,7 @@ public class SubscribePlanController extends JeecgController<SubscribePlan, ISub
     @PreAuthorize("@jps.requiresPermissions('adweb:seo_market_plan:delete')")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
-        seoMarketPlanService.removeById(id);
+        subscribePlanService.removeById(id);
         return Result.OK("删除成功!");
     }
 
@@ -139,7 +144,7 @@ public class SubscribePlanController extends JeecgController<SubscribePlan, ISub
     @PreAuthorize("@jps.requiresPermissions('adweb:seo_market_plan:deleteBatch')")
     @DeleteMapping(value = "/deleteBatch")
     public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        this.seoMarketPlanService.removeByIds(Arrays.asList(ids.split(",")));
+        this.subscribePlanService.removeByIds(Arrays.asList(ids.split(",")));
         return Result.OK("批量删除成功!");
     }
 
@@ -153,7 +158,7 @@ public class SubscribePlanController extends JeecgController<SubscribePlan, ISub
     @Operation(summary = "网站营销方案套餐表-通过id查询")
     @GetMapping(value = "/queryById")
     public Result<SubscribePlan> queryById(@RequestParam(name = "id", required = true) String id) {
-        SubscribePlan subscribePlan = seoMarketPlanService.getById(id);
+        SubscribePlan subscribePlan = subscribePlanService.getById(id);
         if (subscribePlan == null) {
             return Result.error("未找到对应数据");
         }
@@ -191,7 +196,7 @@ public class SubscribePlanController extends JeecgController<SubscribePlan, ISub
         planCode = planCode.toUpperCase();
         LambdaQueryWrapper<SubscribePlan> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SubscribePlan::getPlanCode, planCode);
-        int count = (int) seoMarketPlanService.count(queryWrapper);
+        int count = (int) subscribePlanService.count(queryWrapper);
         return count > 0 ? getPlanCode() : planCode;
     }
 

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

@@ -153,7 +153,8 @@ public class UserPlanSubscriptionController
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(
             HttpServletRequest request, UserPlanSubscription userPlanSubscription) {
-        return super.exportXls(request, userPlanSubscription, UserPlanSubscription.class, "AdWeb套餐订购");
+        return super.exportXls(
+                request, userPlanSubscription, UserPlanSubscription.class, "AdWeb套餐订购");
     }
 
     /**

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscription/entity/SubscribePlan.java

@@ -4,10 +4,13 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+
 import io.swagger.v3.oas.annotations.media.Schema;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -15,7 +18,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.io.Serializable;
 
 /**
- * @Description: 网站营销方案套餐表
+ * @Description: AdWeb套餐表
  * @Author: jeecg-boot
  * @Date: 2024-09-27
  * @Version: V1.0
@@ -24,129 +27,103 @@ import java.io.Serializable;
 @TableName("adweb_subscribe_plan")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@Schema(description = "网站营销方案套餐表")
+@Schema(description = "AdWeb套餐表")
 public class SubscribePlan implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 主键
-     */
+    /** 主键 */
     @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "主键")
     private java.lang.String id;
-    /**
-     * 创建人
-     */
+
+    /** 创建人 */
     @Schema(description = "创建人")
     private java.lang.String createBy;
-    /**
-     * 更新人
-     */
+
+    /** 更新人 */
     @Schema(description = "更新人")
     private java.lang.String updateBy;
-    /**
-     * 创建日期
-     */
+
+    /** 创建日期 */
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建日期")
     private java.util.Date createTime;
-    /**
-     * 更新日期
-     */
+
+    /** 更新日期 */
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新日期")
     private java.util.Date updateTime;
-    /**
-     * 营销方案编码
-     */
-    @Excel(name = "营销方案编码", width = 15)
-    @Schema(description = "营销方案编码")
+
+    /** 套餐编码 */
+    @Excel(name = "套餐编码", width = 15)
+    @Schema(description = "套餐编码")
     private java.lang.String planCode;
-    /**
-     * 套餐类型
-     */
-    @Excel(name = "套餐类型", width = 15)
-    @Schema(description = "套餐类型")
-    @Dict(dicCode = "dict_market_type")
-    private java.lang.String marketType;
-    /**
-     * 套餐名称
-     */
+
+    /** 套餐名称 */
     @Excel(name = "套餐名称", width = 15)
     @Schema(description = "套餐名称")
     private java.lang.String planName;
-    /**
-     * 关键词数量
-     */
+
+    /** 套餐类型 */
+    @Excel(name = "套餐类型", width = 15)
+    @Schema(description = "套餐类型")
+    @Dict(dicCode = "dict_plan_type")
+    private java.lang.String planType;
+
+    /** 关键词数量 */
     @Excel(name = "关键词数量", width = 15)
     @Schema(description = "关键词数量")
     private java.lang.Integer keywordCount;
-    /**
-     * 关键词达标目标
-     */
-    @Excel(name = "关键词达标目标", width = 15)
-    @Schema(description = "关键词达标目标")
+
+    /** 关键词达标目标排名 */
+    @Excel(name = "关键词达标目标排名", width = 15)
+    @Schema(description = "关键词达标目标排名")
     private java.lang.Integer target;
-    /**
-     * 服务时间
-     */
+
+    /** 服务时间 */
     @Excel(name = "服务时间", width = 15)
     @Schema(description = "服务时间")
     private java.lang.Integer serviceTime;
-    /**
-     * 状态
-     */
+
+    /** 状态 */
     @Excel(name = "状态", width = 15)
     @Schema(description = "状态")
     private java.lang.Integer status;
-    /**
-     * 价格
-     */
+
+    /** 价格 */
     @Excel(name = "价格", width = 15)
     @Schema(description = "价格")
     private java.lang.Double price;
 
-    /**
-     * 文章数量
-     */
-    @Excel(name = "文章数量", width = 15)
-    @Schema(description = "文章数量")
-    private java.lang.Integer article;
+    /** 指定词数量 */
+    @Excel(name = "指定词数量", width = 15)
+    @Schema(description = "指定词数量")
+    private java.lang.Integer specifyKeyword;
+
+    /** 长尾词数量 */
+    @Excel(name = "长尾词数量", width = 15)
+    @Schema(description = "长尾词数量")
+    private java.lang.Integer longTailKeyword;
 
-    /**
-     * 博客数量
-     */
+    /** 博客数量 */
     @Excel(name = "博客数量", width = 15)
     @Schema(description = "博客数量")
     private java.lang.Integer blog;
 
-    /**
-     * 外链数量
-     */
+    /** 文章数量 */
+    @Excel(name = "文章数量", width = 15)
+    @Schema(description = "文章数量")
+    private java.lang.Integer article;
+
+    /** 外链数量 */
     @Excel(name = "外链数量", width = 15)
     @Schema(description = "外链数量")
     private java.lang.Integer externalLinks;
 
-    /**
-     * 长尾词数量
-     */
-    @Excel(name = "长尾词数量", width = 15)
-    @Schema(description = "长尾词数量")
-    private java.lang.Integer longTailKeyword;
-
-    /**
-     * 访问数量
-     */
+    /** 访问数量 */
     @Excel(name = "访问数量", width = 15)
     @Schema(description = "访问数量")
     private java.lang.Integer pageView;
-
-    /**
-     * 指定词数量
-     */
-    @Excel(name = "指定词数量", width = 15)
-    @Schema(description = "指定词数量")
-    private java.lang.Integer specifyKeyword;
 }

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

@@ -40,8 +40,9 @@ public class UserPlanSubscriptionServiceImpl
             UserPlanSubscription userPlanSubscription, LoginUser sysUser) {
         boolean result = false;
 
-        SubscribePlan marketPlan = subscribePlanService.getById(userPlanSubscription.getPlanId());
-        if (marketPlan == null) {
+        SubscribePlan subscribePlan =
+                subscribePlanService.getById(userPlanSubscription.getPlanId());
+        if (subscribePlan == null) {
             return Result.error("此套餐不存在");
         }
 
@@ -60,14 +61,14 @@ public class UserPlanSubscriptionServiceImpl
             if (!CollectionUtils.isEmpty(userPlanSubscriptionList)) {
                 return Result.error("站点存在使用中套餐，请到期后绑定！");
             }
-            result = this.addNewSubscription(userPlanSubscription, marketPlan);
+            result = this.addNewSubscription(userPlanSubscription, subscribePlan);
         } else { // 续费
             // 判断是否有正在使用的套餐，如果没有，新建status为1的套餐
             LambdaQueryWrapper<UserPlanSubscription> oldQueryWrapper = new LambdaQueryWrapper<>();
             oldQueryWrapper.eq(UserPlanSubscription::getSiteId, userPlanSubscription.getSiteId());
             oldQueryWrapper.eq(UserPlanSubscription::getStatus, 1);
-            List<UserPlanSubscription> oldHistoryList = this.list(oldQueryWrapper);
-            if (CollectionUtils.isEmpty(oldHistoryList)) {
+            List<UserPlanSubscription> oldSubscriptionList = this.list(oldQueryWrapper);
+            if (CollectionUtils.isEmpty(oldSubscriptionList)) {
                 return Result.error("站点不存在使用中套餐，请先新增套餐");
             } else {
                 LambdaQueryWrapper<UserPlanSubscription> queryWrapper = new LambdaQueryWrapper<>();
@@ -81,7 +82,7 @@ public class UserPlanSubscriptionServiceImpl
                 if (userPlanSubscription.getIsCustom() == 0) {
                     // ->不是自定义服务开启时间 需找到多个套餐服务结束时间最大的那个
                     // 此站点所有对应的套餐的最大服务结束时间
-                    UserPlanSubscription history =
+                    UserPlanSubscription subscription =
                             this.getOne(
                                     new LambdaQueryWrapper<UserPlanSubscription>()
                                             .eq(
@@ -101,26 +102,26 @@ public class UserPlanSubscriptionServiceImpl
                                             .orderByDesc(UserPlanSubscription::getServiceEndTime)
                                             .last("limit 1"));
                     Date maxEndTime = null;
-                    if (history == null || history.getServiceEndTime() == null) {
+                    if (subscription == null || subscription.getServiceEndTime() == null) {
                         maxEndTime = new Date();
                     } else {
-                        maxEndTime = history.getServiceEndTime();
+                        maxEndTime = subscription.getServiceEndTime();
                     }
                     userPlanSubscription.setCreateTime(new Date());
                     userPlanSubscription.setPlanStartTime(maxEndTime);
                     userPlanSubscription.setStatus(2);
-                    userPlanSubscription.setPlanName(marketPlan.getPlanName());
-                    userPlanSubscription.setPlanCode(marketPlan.getPlanCode());
-                    userPlanSubscription.setPlanPrice(marketPlan.getPrice());
-                    userPlanSubscription.setPlanType(marketPlan.getMarketType());
-                    userPlanSubscription.setServiceMonth(marketPlan.getServiceTime());
+                    userPlanSubscription.setPlanName(subscribePlan.getPlanName());
+                    userPlanSubscription.setPlanCode(subscribePlan.getPlanCode());
+                    userPlanSubscription.setPlanPrice(subscribePlan.getPrice());
+                    userPlanSubscription.setPlanType(subscribePlan.getMarketType());
+                    userPlanSubscription.setServiceMonth(subscribePlan.getServiceTime());
                     result = this.save(userPlanSubscription);
                 } else if (userPlanSubscription.getIsCustom() == 1) { // 是自定义套餐开启时间
                     userPlanSubscription.setCreateTime(new Date());
-                    userPlanSubscription.setPlanName(marketPlan.getPlanName());
-                    userPlanSubscription.setPlanCode(marketPlan.getPlanCode());
-                    userPlanSubscription.setPlanPrice(marketPlan.getPrice());
-                    userPlanSubscription.setPlanType(marketPlan.getMarketType());
+                    userPlanSubscription.setPlanName(subscribePlan.getPlanName());
+                    userPlanSubscription.setPlanCode(subscribePlan.getPlanCode());
+                    userPlanSubscription.setPlanPrice(subscribePlan.getPrice());
+                    userPlanSubscription.setPlanType(subscribePlan.getMarketType());
                     DateTime today = cn.hutool.core.date.DateUtil.date();
                     long betweenTime =
                             cn.hutool.core.date.DateUtil.between(
@@ -134,7 +135,7 @@ public class UserPlanSubscriptionServiceImpl
                         // 如果有正在使用的套餐，才能设置为2，否则设置为1
                         userPlanSubscription.setStatus(2);
                     }
-                    userPlanSubscription.setServiceMonth(marketPlan.getServiceTime());
+                    userPlanSubscription.setServiceMonth(subscribePlan.getServiceTime());
                     result = this.save(userPlanSubscription);
                 }
             }
@@ -182,9 +183,9 @@ public class UserPlanSubscriptionServiceImpl
         queryWrapper.in(UserPlanSubscription::getStatus, Arrays.asList(1, -1));
         queryWrapper.orderByDesc(
                 UserPlanSubscription::getStatus, UserPlanSubscription::getCreateTime);
-        List<UserPlanSubscription> histories = this.list(queryWrapper);
-        if (CollectionUtils.isNotEmpty(histories)) {
-            return histories.get(0);
+        List<UserPlanSubscription> userPlanSubscriptions = this.list(queryWrapper);
+        if (CollectionUtils.isNotEmpty(userPlanSubscriptions)) {
+            return userPlanSubscriptions.get(0);
         }
         return null;
     }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml

@@ -247,10 +247,10 @@
         FROM sys_dict t1,
              sys_dict_item t2
         WHERE t1.id = t2.dict_id
-          AND t1.dict_code = 'default_market_plan'
+          AND t1.dict_code = 'default_subscribe_plan'
           AND t1.del_flag = 0
           AND t2.`status` = 1
-          AND t2.item_text = 'default_market_plan' LIMIT 1
+          AND t2.item_text = 'default_subscribe_plan' LIMIT 1
     </select>
 
 </mapper>