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

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

@@ -37,12 +37,12 @@ import java.util.Arrays;
 @Slf4j
 public class UserPlanSubscriptionController
         extends JeecgController<UserPlanSubscription, IUserPlanSubscriptionService> {
-    @Autowired private IUserPlanSubscriptionService seoPlanSubscriptionService;
+    @Autowired private IUserPlanSubscriptionService userPlanSubscriptionService;
 
     /**
      * 分页列表查询
      *
-     * @param seoPlanSubscription
+     * @param userPlanSubscription
      * @param pageNo
      * @param pageSize
      * @param req
@@ -52,46 +52,46 @@ public class UserPlanSubscriptionController
     @Operation(summary = "AdWeb套餐订购-分页列表查询")
     @GetMapping(value = "/list")
     public Result<IPage<UserPlanSubscription>> queryPageList(
-            UserPlanSubscription seoPlanSubscription,
+            UserPlanSubscription userPlanSubscription,
             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
             HttpServletRequest req) {
         QueryWrapper<UserPlanSubscription> queryWrapper =
-                QueryGenerator.initQueryWrapper(seoPlanSubscription, req.getParameterMap());
+                QueryGenerator.initQueryWrapper(userPlanSubscription, req.getParameterMap());
         Page<UserPlanSubscription> page = new Page<UserPlanSubscription>(pageNo, pageSize);
-        IPage<UserPlanSubscription> pageList = seoPlanSubscriptionService.page(page, queryWrapper);
+        IPage<UserPlanSubscription> pageList = userPlanSubscriptionService.page(page, queryWrapper);
         return Result.OK(pageList);
     }
 
     /**
      * 添加
      *
-     * @param seoPlanSubscription
+     * @param userPlanSubscription
      * @return
      */
     @AutoLog(value = "AdWeb套餐订购-添加")
-    @Operation(summary = "seo套餐订购-添加")
+    @Operation(summary = "AdWeb套餐订购-添加")
     @PreAuthorize("@jps.requiresPermissions('serp:seo_plan_subscription:add')")
     @PostMapping(value = "/add")
-    public Result<String> add(@RequestBody UserPlanSubscription seoPlanSubscription) {
-        seoPlanSubscriptionService.save(seoPlanSubscription);
+    public Result<String> add(@RequestBody UserPlanSubscription userPlanSubscription) {
+        userPlanSubscriptionService.save(userPlanSubscription);
         return Result.OK("添加成功！");
     }
 
     /**
      * 编辑
      *
-     * @param seoPlanSubscription
+     * @param userPlanSubscription
      * @return
      */
     @AutoLog(value = "AdWeb套餐订购-编辑")
-    @Operation(summary = "seo套餐订购-编辑")
+    @Operation(summary = "AdWeb套餐订购-编辑")
     @PreAuthorize("@jps.requiresPermissions('serp:seo_plan_subscription:edit')")
     @RequestMapping(
             value = "/edit",
             method = {RequestMethod.PUT, RequestMethod.POST})
-    public Result<String> edit(@RequestBody UserPlanSubscription seoPlanSubscription) {
-        seoPlanSubscriptionService.updateById(seoPlanSubscription);
+    public Result<String> edit(@RequestBody UserPlanSubscription userPlanSubscription) {
+        userPlanSubscriptionService.updateById(userPlanSubscription);
         return Result.OK("编辑成功!");
     }
 
@@ -106,7 +106,7 @@ public class UserPlanSubscriptionController
     @PreAuthorize("@jps.requiresPermissions('serp:seo_plan_subscription:delete')")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
-        seoPlanSubscriptionService.removeById(id);
+        userPlanSubscriptionService.removeById(id);
         return Result.OK("删除成功!");
     }
 
@@ -121,7 +121,7 @@ public class UserPlanSubscriptionController
     @PreAuthorize("@jps.requiresPermissions('serp:seo_plan_subscription:deleteBatch')")
     @DeleteMapping(value = "/deleteBatch")
     public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        this.seoPlanSubscriptionService.removeByIds(Arrays.asList(ids.split(",")));
+        this.userPlanSubscriptionService.removeByIds(Arrays.asList(ids.split(",")));
         return Result.OK("批量删除成功!");
     }
 
@@ -136,24 +136,24 @@ public class UserPlanSubscriptionController
     @GetMapping(value = "/queryById")
     public Result<UserPlanSubscription> queryById(
             @RequestParam(name = "id", required = true) String id) {
-        UserPlanSubscription seoPlanSubscription = seoPlanSubscriptionService.getById(id);
-        if (seoPlanSubscription == null) {
+        UserPlanSubscription userPlanSubscription = userPlanSubscriptionService.getById(id);
+        if (userPlanSubscription == null) {
             return Result.error("未找到对应数据");
         }
-        return Result.OK(seoPlanSubscription);
+        return Result.OK(userPlanSubscription);
     }
 
     /**
      * 导出excel
      *
      * @param request
-     * @param seoPlanSubscription
+     * @param userPlanSubscription
      */
     @PreAuthorize("@jps.requiresPermissions('serp:seo_plan_subscription:exportXls')")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(
-            HttpServletRequest request, UserPlanSubscription seoPlanSubscription) {
-        return super.exportXls(request, seoPlanSubscription, UserPlanSubscription.class, "seo套餐订购");
+            HttpServletRequest request, UserPlanSubscription userPlanSubscription) {
+        return super.exportXls(request, userPlanSubscription, UserPlanSubscription.class, "AdWeb套餐订购");
     }
 
     /**

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscription/mapper/UserPlanSubscriptionMapper.java

@@ -1,6 +1,5 @@
 package org.jeecg.modules.adweb.subscription.mapper;
 
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import org.apache.ibatis.annotations.Select;
@@ -26,12 +25,11 @@ public interface UserPlanSubscriptionMapper extends BaseMapper<UserPlanSubscript
     /**
      * 根据站点id，查询站点的营销方案
      *
-     * @return:
-     * @Author: luxiaoxiao
-     * @Date: 2021/4/6
+     * @return: @Author: luxiaoxiao @Date: 2021/4/6
      */
-    @Select("select t1.plan_name planName, t1.keyword_count keywordCount, t1.service_time serviceTime, t1.price price,t2.plan_id planId " +
-            "from adweb_subscribe_plan t1 ,adweb_seo_plan_subscription t2 " +
-            "where t1.id = t2.plan_id AND t2.site_id = #{siteId} AND t2.status = 1")
+    @Select(
+            "select t1.plan_name planName, t1.keyword_count keywordCount, t1.service_time serviceTime, t1.price price,t2.plan_id planId "
+                    + "from adweb_subscribe_plan t1 ,adweb_sysuser_plan_subscription t2 "
+                    + "where t1.id = t2.plan_id AND t2.site_id = #{siteId} AND t2.status = 1")
     Map<String, String> getSubscribePlanBySiteId(Integer siteId);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscription/mapper/xml/UserPlanSubscriptionMapper.xml

@@ -3,16 +3,16 @@
 <mapper namespace="org.jeecg.modules.adweb.subscription.mapper.UserPlanSubscriptionMapper">
     <select id="getKeywordStandard" resultType="java.lang.Integer">
         SELECT
-            IF(COUNT(*) = 0 OR t1.target IS NULL, 10, t1.target)
+        IF(COUNT(*) = 0 OR t1.target IS NULL, 10, t1.target)
         FROM
-            adweb_subscribe_plan t1,
-            adweb_sysuser_plan_subscription t2,
-            adweb_site t3
+        adweb_subscribe_plan t1,
+        adweb_sysuser_plan_subscription t2,
+        adweb_site t3
         WHERE
-            t2.`status` = 1
-          AND t1.id = t2.plan_id
-          AND t2.site_id = t3.id
-          AND t3.`code` = #{siteCode}
+        t2.`status` = 1
+        AND t1.id = t2.plan_id
+        AND t2.site_id = t3.id
+        AND t3.`code` = #{siteCode}
         GROUP BY t1.target
     </select>
 </mapper>

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

@@ -18,21 +18,22 @@ public interface IUserPlanSubscriptionService extends IService<UserPlanSubscript
     /**
      * 绑定AdWeb套餐
      *
-     * @param seoPlanSubscription
+     * @param userPlanSubscription
      * @param sysUser
      * @return
      */
-    Result<?> addSeoPlanSubscription(UserPlanSubscription seoPlanSubscription, LoginUser sysUser);
+    Result<?> addUserPlanSubscription(UserPlanSubscription userPlanSubscription, LoginUser sysUser);
 
     /**
      * 新增套餐订阅记录
      *
-     * @param seoPlanSubscription
-     * @param marketPlan
+     * @param userPlanSubscription
+     * @param subscribePlan
      * @return
      */
-    boolean addNewSubscription(UserPlanSubscription seoPlanSubscription, SubscribePlan marketPlan);
+    boolean addNewSubscription(
+            UserPlanSubscription userPlanSubscription, SubscribePlan subscribePlan);
 
-    /** 获取正在使用中的SEO套餐，如果没有使用中的SEO和建站套餐，则查询过期的SEO和建站套餐 */
-    UserPlanSubscription getCurrentSeoAndSiteSubscription(Integer siteId);
+    /** 获取正在使用中的AdWeb套餐，如果没有使用中的SEO和建站套餐，则查询过期的套餐 */
+    UserPlanSubscription getCurrentSubscription(Integer siteId);
 }

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

@@ -36,49 +36,49 @@ public class UserPlanSubscriptionServiceImpl
     @Resource private ISubscribePlanService subscribePlanService;
 
     @Override
-    public Result<?> addSeoPlanSubscription(
-            UserPlanSubscription seoPurchaseHistory, LoginUser sysUser) {
+    public Result<?> addUserPlanSubscription(
+            UserPlanSubscription userPlanSubscription, LoginUser sysUser) {
         boolean result = false;
 
-        SubscribePlan marketPlan = subscribePlanService.getById(seoPurchaseHistory.getPlanId());
+        SubscribePlan marketPlan = subscribePlanService.getById(userPlanSubscription.getPlanId());
         if (marketPlan == null) {
             return Result.error("此套餐不存在");
         }
 
         if (sysUser != null) {
-            seoPurchaseHistory.setCreateBy(sysUser.getId());
+            userPlanSubscription.setCreateBy(sysUser.getId());
         } else {
-            seoPurchaseHistory.setCreateBy("system_auto");
+            userPlanSubscription.setCreateBy("system_auto");
         }
 
         // 如果不是续费客户(就是新客户)的话，直接入库，套餐开启时间即是现在
-        if (seoPurchaseHistory.getIsRenew() == null || seoPurchaseHistory.getIsRenew() == 0) {
+        if (userPlanSubscription.getIsRenew() == null || userPlanSubscription.getIsRenew() == 0) {
             LambdaQueryWrapper<UserPlanSubscription> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(UserPlanSubscription::getSiteId, seoPurchaseHistory.getSiteId());
+            queryWrapper.eq(UserPlanSubscription::getSiteId, userPlanSubscription.getSiteId());
             queryWrapper.eq(UserPlanSubscription::getStatus, 1);
-            List<UserPlanSubscription> seoPurchaseHistoryList = this.list(queryWrapper);
-            if (!CollectionUtils.isEmpty(seoPurchaseHistoryList)) {
+            List<UserPlanSubscription> userPlanSubscriptionList = this.list(queryWrapper);
+            if (!CollectionUtils.isEmpty(userPlanSubscriptionList)) {
                 return Result.error("站点存在使用中套餐，请到期后绑定！");
             }
-            result = this.addNewSubscription(seoPurchaseHistory, marketPlan);
+            result = this.addNewSubscription(userPlanSubscription, marketPlan);
         } else { // 续费
             // 判断是否有正在使用的套餐，如果没有，新建status为1的套餐
             LambdaQueryWrapper<UserPlanSubscription> oldQueryWrapper = new LambdaQueryWrapper<>();
-            oldQueryWrapper.eq(UserPlanSubscription::getSiteId, seoPurchaseHistory.getSiteId());
+            oldQueryWrapper.eq(UserPlanSubscription::getSiteId, userPlanSubscription.getSiteId());
             oldQueryWrapper.eq(UserPlanSubscription::getStatus, 1);
             List<UserPlanSubscription> oldHistoryList = this.list(oldQueryWrapper);
             if (CollectionUtils.isEmpty(oldHistoryList)) {
                 return Result.error("站点不存在使用中套餐，请先新增套餐");
             } else {
                 LambdaQueryWrapper<UserPlanSubscription> queryWrapper = new LambdaQueryWrapper<>();
-                queryWrapper.eq(UserPlanSubscription::getSiteId, seoPurchaseHistory.getSiteId());
+                queryWrapper.eq(UserPlanSubscription::getSiteId, userPlanSubscription.getSiteId());
                 queryWrapper.eq(UserPlanSubscription::getStatus, 2);
-                List<UserPlanSubscription> seoPurchaseHistoryList = this.list(queryWrapper);
-                if (!CollectionUtils.isEmpty(seoPurchaseHistoryList)) {
+                List<UserPlanSubscription> userPlanSubscriptionList = this.list(queryWrapper);
+                if (!CollectionUtils.isEmpty(userPlanSubscriptionList)) {
                     return Result.error("同一站点不能同时续费多个相同类型的套餐！");
                 }
 
-                if (seoPurchaseHistory.getIsCustom() == 0) {
+                if (userPlanSubscription.getIsCustom() == 0) {
                     // ->不是自定义服务开启时间 需找到多个套餐服务结束时间最大的那个
                     // 此站点所有对应的套餐的最大服务结束时间
                     UserPlanSubscription history =
@@ -86,7 +86,7 @@ public class UserPlanSubscriptionServiceImpl
                                     new LambdaQueryWrapper<UserPlanSubscription>()
                                             .eq(
                                                     UserPlanSubscription::getSiteId,
-                                                    seoPurchaseHistory.getSiteId())
+                                                    userPlanSubscription.getSiteId())
                                             .and(
                                                     wrapper ->
                                                             wrapper.eq(
@@ -106,25 +106,25 @@ public class UserPlanSubscriptionServiceImpl
                     } else {
                         maxEndTime = history.getServiceEndTime();
                     }
-                    seoPurchaseHistory.setCreateTime(new Date());
-                    seoPurchaseHistory.setPlanStartTime(maxEndTime);
-                    seoPurchaseHistory.setStatus(2);
-                    seoPurchaseHistory.setPlanName(marketPlan.getPlanName());
-                    seoPurchaseHistory.setPlanCode(marketPlan.getPlanCode());
-                    seoPurchaseHistory.setPlanPrice(marketPlan.getPrice());
-                    seoPurchaseHistory.setPlanType(marketPlan.getMarketType());
-                    seoPurchaseHistory.setServiceMonth(marketPlan.getServiceTime());
-                    result = this.save(seoPurchaseHistory);
-                } else if (seoPurchaseHistory.getIsCustom() == 1) { // 是自定义套餐开启时间
-                    seoPurchaseHistory.setCreateTime(new Date());
-                    seoPurchaseHistory.setPlanName(marketPlan.getPlanName());
-                    seoPurchaseHistory.setPlanCode(marketPlan.getPlanCode());
-                    seoPurchaseHistory.setPlanPrice(marketPlan.getPrice());
-                    seoPurchaseHistory.setPlanType(marketPlan.getMarketType());
+                    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());
+                    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());
                     DateTime today = cn.hutool.core.date.DateUtil.date();
                     long betweenTime =
                             cn.hutool.core.date.DateUtil.between(
-                                    seoPurchaseHistory.getPlanStartTime(),
+                                    userPlanSubscription.getPlanStartTime(),
                                     today,
                                     DateUnit.DAY,
                                     false);
@@ -132,10 +132,10 @@ public class UserPlanSubscriptionServiceImpl
                         return Result.error("自定义时间请选择于今天之后！");
                     } else {
                         // 如果有正在使用的套餐，才能设置为2，否则设置为1
-                        seoPurchaseHistory.setStatus(2);
+                        userPlanSubscription.setStatus(2);
                     }
-                    seoPurchaseHistory.setServiceMonth(marketPlan.getServiceTime());
-                    result = this.save(seoPurchaseHistory);
+                    userPlanSubscription.setServiceMonth(marketPlan.getServiceTime());
+                    result = this.save(userPlanSubscription);
                 }
             }
         }
@@ -150,28 +150,28 @@ public class UserPlanSubscriptionServiceImpl
 
     @Override
     public boolean addNewSubscription(
-            UserPlanSubscription seoPurchaseHistory, SubscribePlan marketPlan) {
+            UserPlanSubscription userPlanSubscription, SubscribePlan subscribePlan) {
         boolean result = false;
         try {
             Date startTime = new Date();
-            seoPurchaseHistory.setCreateTime(startTime);
-            seoPurchaseHistory.setPlanStartTime(startTime);
-            seoPurchaseHistory.setStatus(1); // 使用中
-            seoPurchaseHistory.setPlanName(marketPlan.getPlanName());
-            seoPurchaseHistory.setPlanCode(marketPlan.getPlanCode());
-            seoPurchaseHistory.setPlanPrice(marketPlan.getPrice());
-            seoPurchaseHistory.setPlanType(marketPlan.getMarketType());
-            seoPurchaseHistory.setServiceMonth(marketPlan.getServiceTime());
-            result = this.save(seoPurchaseHistory);
+            userPlanSubscription.setCreateTime(startTime);
+            userPlanSubscription.setPlanStartTime(startTime);
+            userPlanSubscription.setStatus(1); // 使用中
+            userPlanSubscription.setPlanName(subscribePlan.getPlanName());
+            userPlanSubscription.setPlanCode(subscribePlan.getPlanCode());
+            userPlanSubscription.setPlanPrice(subscribePlan.getPrice());
+            userPlanSubscription.setPlanType(subscribePlan.getMarketType());
+            userPlanSubscription.setServiceMonth(subscribePlan.getServiceTime());
+            result = this.save(userPlanSubscription);
         } catch (Exception e) {
             log.error("站点新绑定套餐失败", e);
         }
         return result;
     }
 
-    /** 获取正在使用中的SEO套餐，如果没有使用中的SEO和建站套餐，则查询过期的SEO和建站套餐 */
+    /** 获取正在使用中的AdWeb套餐，如果没有使用中的SEO和建站套餐，则查询过期的套餐 */
     @Override
-    public UserPlanSubscription getCurrentSeoAndSiteSubscription(Integer siteId) {
+    public UserPlanSubscription getCurrentSubscription(Integer siteId) {
         LambdaQueryWrapper<UserPlanSubscription> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(UserPlanSubscription::getSiteId, siteId);
         queryWrapper.and(