瀏覽代碼

1、优化事件异步确认逻辑
2、增加用户会员套餐
3、增加用户权益

rayson 9 月之前
父節點
當前提交
b0eb9e7774
共有 19 個文件被更改,包括 138 次插入52 次删除
  1. 13 1
      menduner/menduner-common/src/main/java/com/citu/module/menduner/common/enums/EventAsyncUrlEnum.java
  2. 3 0
      menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/controller/base/event/EventRecordPageReqVO.java
  3. 4 0
      menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/controller/base/event/EventRecordRespVO.java
  4. 4 0
      menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/dal/dataobject/event/EventRecordDO.java
  5. 1 3
      menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/dal/mysql/config/PointRuleConfigMapper.java
  6. 2 1
      menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/dal/mysql/event/EventRecordMapper.java
  7. 2 2
      menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/dal/redis/RedisKeyConstants.java
  8. 1 1
      menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/service/config/PointRuleConfigService.java
  9. 2 2
      menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/service/config/PointRuleConfigServiceImpl.java
  10. 2 1
      menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/service/event/EventRecordService.java
  11. 4 3
      menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/service/event/EventRecordServiceImpl.java
  12. 6 11
      menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/service/event/EventTrackServiceImpl.java
  13. 11 0
      menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/ErrorCodeConstants.java
  14. 0 9
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/user/vip/UserEntitlementSaveReqVO.java
  15. 12 12
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/user/vip/UserPackageSaveReqVO.java
  16. 37 4
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/mq/consumer/UserMemberConsumer.java
  17. 2 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/register/EnterpriseRegisterServiceImpl.java
  18. 16 1
      menduner/menduner-system-biz/src/main/resources/i18n/messages_en_US.properties
  19. 16 1
      menduner/menduner-system-biz/src/main/resources/i18n/messages_zh_CN.properties

+ 13 - 1
menduner/menduner-common/src/main/java/com/citu/module/menduner/common/enums/EventAsyncUrlEnum.java

@@ -13,7 +13,19 @@ import lombok.Getter;
 public enum EventAsyncUrlEnum {
 
     INVITE_USER("/event/async/invite/user", "邀请用户注册", true,"?userId="),
-    REGISTER_ENTERPRISE("/event/async/enterprise/register", "企业注册申请操作人帮忙注册个人用户", false,null),
+    REGISTER_ENTERPRISE("/event/async/enterprise/register", "企业注册申请操作人帮忙注册个人用户", true,"?userId="),
+    // 购买14天用户会员
+    USER_MEMBER_BUY_14_DAYS("/event/async/user/member/buy/14/day", "购买14天用户会员", false,null),
+    // 购买30天用户会员
+    USER_MEMBER_BUY_30_DAYS("/event/async/user/member/buy/30/day", "购买30天用户会员", false,null),
+    // 购买60天用户会员
+    USER_MEMBER_BUY_60_DAYS("/event/async/user/member/buy/60/day", "购买60天用户会员", false,null),
+    // 购买90天用户会员
+    USER_MEMBER_BUY_90_DAYS("/event/async/user/member/buy/90/day", "购买90天用户会员", false,null),
+    // 购买180天用户会员
+    USER_MEMBER_BUY_180_DAYS("/event/async/user/member/buy/180/day", "购买180天用户会员", false,null),
+    // 购买365天用户会员
+    USER_MEMBER_BUY_365_DAYS("/event/async/user/member/buy/365/day", "购买365天用户会员", false,null),
 
     ;
 

+ 3 - 0
menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/controller/base/event/EventRecordPageReqVO.java

@@ -23,6 +23,9 @@ public class EventRecordPageReqVO extends PageParam {
     @Schema(description = "事件地址", example = "https://www.iocoder.cn")
     private String url;
 
+    @Schema(description = "场景")
+    private String scene;
+
     @Schema(description = "日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] date;

+ 4 - 0
menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/controller/base/event/EventRecordRespVO.java

@@ -25,6 +25,10 @@ public class EventRecordRespVO {
     @ExcelProperty("事件地址")
     private String url;
 
+    @Schema(description = "场景")
+    @ExcelProperty("场景")
+    private String scene;
+
     @Schema(description = "日期", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("日期")
     private LocalDateTime date;

+ 4 - 0
menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/dal/dataobject/event/EventRecordDO.java

@@ -36,6 +36,10 @@ public class EventRecordDO extends BaseDO {
      * 事件地址
      */
     private String url;
+    /**
+     * 场景
+     */
+    private String scene;
     /**
      * 日期
      */

+ 1 - 3
menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/dal/mysql/config/PointRuleConfigMapper.java

@@ -68,10 +68,9 @@ public interface PointRuleConfigMapper extends BaseMapperX<PointRuleConfigDO> {
      * 查询任务
      *
      * @param userId 用户id
-     * @param type   事件类型
      * @param mark   标记
      */
-    default List<TaskRespVO> selectTask(Long userId, String type, String mark, LocalDateTime startTime, LocalDateTime endTime) {
+    default List<TaskRespVO> selectTask(Long userId,  String mark, LocalDateTime startTime, LocalDateTime endTime) {
         MPJLambdaWrapperX<PointRuleConfigDO> query = new MPJLambdaWrapperX<>();
         query.selectAs(PointRuleConfigDO::getTitle, TaskRespVO::getTitle);
         query.selectAs(PointRuleConfigDO::getUrl, TaskRespVO::getUrl);
@@ -91,7 +90,6 @@ public interface PointRuleConfigMapper extends BaseMapperX<PointRuleConfigDO> {
 
         // 增加条件
         query.eq(PointRuleConfigDO::getStatus, PointRuleConfigStatusEnum.ENABLE.getStatus());
-        query.eq(PointRuleConfigDO::getType, type);
         query.eqIfPresent(PointRuleConfigDO::getMark, mark);
 
         query.orderByAsc(PointRuleConfigDO::getSort);

+ 2 - 1
menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/dal/mysql/event/EventRecordMapper.java

@@ -70,10 +70,11 @@ public interface EventRecordMapper extends BaseMapperX<EventRecordDO> {
     }
 
     // 根据用户ID、地址、指标ID、当天时间查询事件记录
-    default EventRecordDO get(Long userId, String url, LocalDateTime date) {
+    default EventRecordDO get(Long userId, String url, String scene, LocalDateTime date) {
         LambdaQueryWrapperX<EventRecordDO> wrapperX = new LambdaQueryWrapperX<EventRecordDO>();
         wrapperX.eq(EventRecordDO::getUserId, userId)
                 .eq(EventRecordDO::getUrl, url)
+                .eqIfPresent(EventRecordDO::getScene, scene)
                 .eq(EventRecordDO::getDate, date);
         return selectOne(wrapperX);
     }

+ 2 - 2
menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/dal/redis/RedisKeyConstants.java

@@ -35,9 +35,9 @@ public interface RedisKeyConstants {
     /**
      * 事件记录锁
      * <p>
-     * KEY 格式:event_record_lock:  userId : url  : time
+     * KEY 格式:event_record_lock:  userId : url : scene  : time
      */
-    String EVENT_RECORD_LOCK = "event_record_lock:{}:{}:{}";
+    String EVENT_RECORD_LOCK = "event_record_lock:{}:{}:{}:{}";
 
 
 }

+ 1 - 1
menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/service/config/PointRuleConfigService.java

@@ -83,5 +83,5 @@ public interface PointRuleConfigService {
     /**
      * 获取任务
      **/
-    List<TaskRespVO> selectTask(Long userId, String type, String mark, LocalDateTime startTime, LocalDateTime endTime);
+    List<TaskRespVO> selectTask(Long userId, String mark, LocalDateTime startTime, LocalDateTime endTime);
 }

+ 2 - 2
menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/service/config/PointRuleConfigServiceImpl.java

@@ -179,7 +179,7 @@ public class PointRuleConfigServiceImpl implements PointRuleConfigService {
     }
 
     @Override
-    public List<TaskRespVO> selectTask(Long userId, String type, String mark, LocalDateTime startTime, LocalDateTime endTime) {
-        return mapper.selectTask(userId, type, mark,  startTime,  endTime);
+    public List<TaskRespVO> selectTask(Long userId,String mark, LocalDateTime startTime, LocalDateTime endTime) {
+        return mapper.selectTask(userId,mark,  startTime,  endTime);
     }
 }

+ 2 - 1
menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/service/event/EventRecordService.java

@@ -69,7 +69,8 @@ public interface EventRecordService {
      *
      * @param userId 用户id
      * @param url    事件地址
+     * @param scene    场景
      */
-    void createEventRecord(Long userId, String url);
+    void createEventRecord(Long userId, String url, String scene);
 
 }

+ 4 - 3
menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/service/event/EventRecordServiceImpl.java

@@ -145,12 +145,12 @@ public class EventRecordServiceImpl implements EventRecordService {
 
     @Override
     @DSTransactional
-    public void createEventRecord(Long userId, String url) {
+    public void createEventRecord(Long userId, String url, String scene) {
         //TODO 读多写多场景,读写分离,不好使用缓存,暂时直接写库
 
         // 尝试加锁
         LocalDateTime time = LocalDate.now().atStartOfDay();
-        String lockKey = StrUtil.format(EVENT_RECORD_LOCK, userId, url, time);
+        String lockKey = StrUtil.format(EVENT_RECORD_LOCK, userId, url, scene, time);
         RLock lock = redissonClient.getLock(lockKey);
         try {
             // 尝试获取锁,等待时间为30秒,锁自动续期时间为10分钟
@@ -158,13 +158,14 @@ public class EventRecordServiceImpl implements EventRecordService {
 
                 // 查询今天记录
                 EventRecordDO record =
-                        eventRecordMapper.get(userId, url, time);
+                        eventRecordMapper.get(userId, url, scene, time);
                 if (null == record) {
                     // 没有今天的记录
                     //新增
                     eventRecordMapper.insert(EventRecordDO.builder()
                             .userId(userId)
                             .url(url)
+                            .scene(scene)
                             .date(time)
                             .count(1)
                             .build());

+ 6 - 11
menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/service/event/EventTrackServiceImpl.java

@@ -125,7 +125,6 @@ public class EventTrackServiceImpl implements EventTrackService {
         }
         // TODO 两个相同url的任务但是不同配置不同数据,只要该url触发过了都会显示true?怎么解决?
         return ruleConfigService.selectTask(LoginUserContext.getUserId(),
-                PointRuleConfigTypeEnum.MARK.getType(),
                 reqVO.getMark(),
                 timeRange[0],
                 timeRange[1]
@@ -145,7 +144,7 @@ public class EventTrackServiceImpl implements EventTrackService {
 
         Long userId = loginUser.getId();
 
-        return trigger(userId, url, null,null);
+        return trigger(userId, url, null, null);
 
     }
 
@@ -160,29 +159,25 @@ public class EventTrackServiceImpl implements EventTrackService {
             // 若未找到该URL的配置规则,同样返回一个空的响应对象
             return Collections.singletonList(EventTrackPointRespVO.builder().build());
         }
-        // 搜索出配置后,带入场景去判断处理
-        if(StringUtils.hasText(scene)) {
-            url = url + scene;
-        }
 
         // 遍历处理每个积分规则配置
         for (PointRuleConfigDO config : configList) {
             // 处理单个积分规则
-            EventTrackPointRespVO respVO = processPointRule(config, userId, url,bizType);
+            EventTrackPointRespVO respVO = processPointRule(config, userId, url, bizType);
             // 将处理结果添加到响应列表中
             respVOList.add(respVO);
         }
         // 调用服务记录事件访问
-        eventRecordService.createEventRecord(userId, url);
+        eventRecordService.createEventRecord(userId, url, scene);
         return respVOList;
     }
 
     /**
      * 处理单个积分规则
      *
-     * @param config 规则配置
-     * @param userId 操作用户
-     * @param url    事件地址
+     * @param config  规则配置
+     * @param userId  操作用户
+     * @param url     事件地址
      * @param bizType 事件类型
      * @return EventTrackPointRespVO
      **/

+ 11 - 0
menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/ErrorCodeConstants.java

@@ -506,6 +506,17 @@ public interface ErrorCodeConstants {
 
     // ========== 用户套餐 1_100_051_000 ==========
     ErrorCode USER_PACKAGE_NOT_EXISTS = new ErrorCode(1_100_051_001, "用户套餐不存在");
+    ErrorCode USER_PACKAGE_NAME_NOT_NULL = new ErrorCode(1_100_051_002, "套餐名称不能为空");
+    ErrorCode USER_PACKAGE_PRICE_NOT_NULL = new ErrorCode(1_100_051_003, "套餐价格不能为空");
+    ErrorCode USER_PACKAGE_DAY_NOT_NULL = new ErrorCode(1_100_051_004, "天数不能为空");
+    ErrorCode USER_PACKAGE_RECOMMEND_NOT_NULL = new ErrorCode(1_100_051_005, "是否推荐不能为空");
+    ErrorCode USER_PACKAGE_TEXT_NOT_NULL = new ErrorCode(1_100_051_006, "说明文本不能为空");
+    ErrorCode USER_PACKAGE_RESUME_REFRESH_COUNT_NOT_NULL = new ErrorCode(1_100_051_007, "简历刷新次数不能为空");
+    ErrorCode USER_PACKAGE_RESUME_PRIVACY_NOT_NULL = new ErrorCode(1_100_051_008, "是否开启简历屏蔽不能为空");
+    ErrorCode USER_PACKAGE_PRIORITY_RECOMMEND_NOT_NULL = new ErrorCode(1_100_051_009, "是否开启优先推荐不能为空");
+    ErrorCode USER_PACKAGE_RESUME_TEMPLATE_NOT_NULL = new ErrorCode(1_100_051_010, "是否开启简历模板下载不能为空");
+    ErrorCode USER_PACKAGE_VIEWERS_LIST_NOT_NULL = new ErrorCode(1_100_051_011, "是否开启谁看过我不能为空");
+    ErrorCode USER_PACKAGE_SALARY_REPORT_NOT_NULL = new ErrorCode(1_100_051_012, "是否开启薪酬报告不能为空");
 
     // ========== 用户权益记录 1_100_052_000 ==========
     ErrorCode USER_ENTITLEMENT_NOT_EXISTS = new ErrorCode(1_100_052_001, "用户权益记录不存在");

+ 0 - 9
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/user/vip/UserEntitlementSaveReqVO.java

@@ -7,8 +7,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotNull;
-
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
@@ -20,31 +18,24 @@ public class UserEntitlementSaveReqVO {
     private Long id;
 
     @Schema(description = "用户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "12958")
-    @NotNull(message = "用户id不能为空")
     private Long userId;
 
     @Schema(description = "简历刷新次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "24045")
-    @NotNull(message = "简历刷新次数不能为空")
     private Integer resumeRefreshCount;
 
     @Schema(description = "简历屏蔽", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "简历屏蔽不能为空")
     private Boolean resumePrivacy;
 
     @Schema(description = "优先推荐", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "优先推荐不能为空")
     private Boolean priorityRecommend;
 
     @Schema(description = "简历模板下载", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "简历模板下载不能为空")
     private Boolean resumeTemplate;
 
     @Schema(description = "谁看过我", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "谁看过我不能为空")
     private Boolean viewersList;
 
     @Schema(description = "薪酬报告", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "薪酬报告不能为空")
     private Boolean salaryReport;
 
 }

+ 12 - 12
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/user/vip/UserPackageSaveReqVO.java

@@ -15,54 +15,54 @@ public class UserPackageSaveReqVO {
     private Long id;
 
     @Schema(description = "套餐名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
-    @NotEmpty(message = "套餐名称不能为空")
+    @NotEmpty(message = "{1_100_051_002}")
     private String name;
 
     @Schema(description = "套餐价格", requiredMode = Schema.RequiredMode.REQUIRED, example = "26437")
-    @NotNull(message = "套餐价格不能为空")
+    @NotNull(message = "{1_100_051_003}")
     private Long price;
 
     @Schema(description = "天数", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "天数不能为空")
+    @NotNull(message = "{1_100_051_004}")
     private Integer day;
 
     @Schema(description = "是否推荐", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "是否推荐不能为空")
+    @NotNull(message = "{1_100_051_005}")
     private Boolean recommend;
 
     @Schema(description = "说明文本", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "说明文本不能为空")
+    @NotEmpty(message = "{1_100_051_006}")
     private String text;
 
     @Schema(description = "简历刷新次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "17350")
-    @NotNull(message = "简历刷新次数不能为空")
+    @NotNull(message = "{1_100_051_007}")
     private Integer resumeRefreshCount;
 
     @Schema(description = "简历屏蔽", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "简历屏蔽不能为空")
+    @NotNull(message = "{1_100_051_008}")
     private Boolean resumePrivacy;
 
     @Schema(description = "优先推荐", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "优先推荐不能为空")
+    @NotNull(message = "{1_100_051_009}")
     private Boolean priorityRecommend;
 
     @Schema(description = "简历模板下载", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "简历模板下载不能为空")
+    @NotNull(message = "{1_100_051_010}")
     private Boolean resumeTemplate;
 
     @Schema(description = "谁看过我", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "谁看过我不能为空")
+    @NotNull(message = "{1_100_051_011}")
     private Boolean viewersList;
 
     @Schema(description = "薪酬报告", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "薪酬报告不能为空")
+    @NotNull(message = "{1_100_051_012}")
     private Boolean salaryReport;
 
     @Schema(description = "排序")
     private Integer sort;
 
     @Schema(description = "状态(0正常 1停用 2隐藏)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotEmpty(message = "状态(0正常 1停用 2隐藏)不能为空")
+    @NotEmpty(message = "{1_099_000_001}")
     private String status;
 
 }

+ 37 - 4
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/mq/consumer/UserMemberConsumer.java

@@ -1,12 +1,16 @@
 package com.citu.module.menduner.system.mq.consumer;
 
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
+import com.citu.module.menduner.common.enums.EventAsyncUrlEnum;
+import com.citu.module.menduner.common.message.EventAsyncConfirmMessage;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import com.citu.module.menduner.system.controller.base.user.vip.UserEntitlementSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.order.TradeOrderDO;
 import com.citu.module.menduner.system.dal.dataobject.user.MdeUserDO;
 import com.citu.module.menduner.system.dal.dataobject.user.UserEntitlementDO;
 import com.citu.module.menduner.system.dal.dataobject.user.UserPackageDO;
 import com.citu.module.menduner.system.enums.TradeOrderTypeMq;
+import com.citu.module.menduner.system.mq.producer.PointOperateProducer;
 import com.citu.module.menduner.system.service.order.TradeOrderService;
 import com.citu.module.menduner.system.service.user.MdeUserService;
 import com.citu.module.menduner.system.service.user.UserEntitlementService;
@@ -34,15 +38,14 @@ import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_USER_
 )
 public class UserMemberConsumer implements RocketMQListener<Long> {
 
+    @Resource
+    protected PointOperateProducer pointOperateProducer;
     @Resource
     private TradeOrderService tradeOrderService;
-
     @Resource
     private MdeUserService mdeUserService;
-
     @Resource
     private UserPackageService userPackageService;
-
     @Resource
     private UserEntitlementService userEntitleService;
 
@@ -62,7 +65,6 @@ public class UserMemberConsumer implements RocketMQListener<Long> {
     public void onMessage(Long orderId) {
         log.info("接收到队列消息[{}]", orderId);
         TradeOrderDO order = tradeOrderService.getOrder(orderId);
-//        UserVipFlagEnum vipFlagEnum = UserVipFlagEnum.from(order.getType());
         // 查询用户
         MdeUserDO user = mdeUserService.getMdeUser(order.getUserId());
         UserPackageDO packageDO = userPackageService.getUserPackage(order.getSpuId());
@@ -133,5 +135,36 @@ public class UserMemberConsumer implements RocketMQListener<Long> {
             );
         }
 
+        // 加积分
+        EventAsyncUrlEnum urlEnum = getEventAsyncUrlEnum(packageDO.getDay());
+        // 表示  userDO.getId() 因为企业用户注册, 所以加积分
+        pointOperateProducer.send(EventAsyncConfirmMessage.builder()
+                // 给谁加,谁申请给谁加
+                .userId(LoginUserContext.getUserId())
+                // 加的是什么
+                .url(urlEnum.getUrl())
+                .scene(null)
+                .build()
+        );
+
+    }
+
+    private EventAsyncUrlEnum getEventAsyncUrlEnum(Integer day) {
+        if (day <= 14) {
+            return EventAsyncUrlEnum.USER_MEMBER_BUY_14_DAYS;
+        }
+        if (day <= 30) {
+            return EventAsyncUrlEnum.USER_MEMBER_BUY_30_DAYS;
+        }
+        if (day <= 60) {
+            return EventAsyncUrlEnum.USER_MEMBER_BUY_60_DAYS;
+        }
+        if (day <= 90) {
+            return EventAsyncUrlEnum.USER_MEMBER_BUY_90_DAYS;
+        }
+        if (day <= 180) {
+            return EventAsyncUrlEnum.USER_MEMBER_BUY_180_DAYS;
+        }
+        return EventAsyncUrlEnum.USER_MEMBER_BUY_365_DAYS;
     }
 }

+ 2 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/register/EnterpriseRegisterServiceImpl.java

@@ -270,6 +270,8 @@ public class EnterpriseRegisterServiceImpl implements EnterpriseRegisterService
                         .userId(LoginUserContext.getUserId())
                         // 加的是什么
                         .url(EventAsyncUrlEnum.REGISTER_ENTERPRISE.getUrl())
+                        .scene(EventAsyncUrlEnum.REGISTER_ENTERPRISE.isScene() ?
+                                (EventAsyncUrlEnum.REGISTER_ENTERPRISE.getSceneStr() + userDO.getId()) : null)
                         .build()
                 );
             }

+ 16 - 1
menduner/menduner-system-biz/src/main/resources/i18n/messages_en_US.properties

@@ -359,4 +359,19 @@
 1_100_049_007=Product type cannot be empty
 # ========== 人才屏蔽企业关系 1_100_050_000 ==========
 1_100_050_001=Talent blocking enterprise relationship does not exist
-1_100_050_002=Enterprise blocked, please do not click again
+1_100_050_002=Enterprise blocked, please do not click again
+# ========== 用户套餐 1_100_051_000 ==========
+1_100_051_001=User package does not exist
+1_100_051_002=Package name cannot be empty
+1_100_051_003=Package price cannot be empty
+1_100_051_004=Days cannot be empty
+1_100_051_005=Recommended cannot be empty
+1_100_051_006=Instruction text cannot be empty
+1_100_051_007=Resume refresh count cannot be empty
+1_100_051_008=Whether to enable resume blocking cannot be empty
+1_100_051_009=Whether to enable priority recommendation cannot be empty
+1_100_051_010=Whether to enable resume template download cannot be empty
+1_100_051_011=Is it enabled? Who has seen it? I cannot leave it blank
+1_100_051_012=Whether to enable salary report cannot be empty
+# ========== 用户权益记录 1_100_052_000 ==========
+1_100_052_001=User rights record does not exist

+ 16 - 1
menduner/menduner-system-biz/src/main/resources/i18n/messages_zh_CN.properties

@@ -362,4 +362,19 @@
 1_100_049_007=商品类型不能为空
 # ========== 人才屏蔽企业关系 1_100_050_000 ==========
 1_100_050_001=人才屏蔽企业关系不存在
-1_100_050_002=企业已屏蔽,请勿重复点击
+1_100_050_002=企业已屏蔽,请勿重复点击
+# ========== 用户套餐 1_100_051_000 ==========
+1_100_051_001=用户套餐不存在
+1_100_051_002=套餐名称不能为空
+1_100_051_003=套餐价格不能为空
+1_100_051_004=天数不能为空
+1_100_051_005=是否推荐不能为空
+1_100_051_006=说明文本不能为空
+1_100_051_007=简历刷新次数不能为空
+1_100_051_008=是否开启简历屏蔽不能为空
+1_100_051_009=是否开启优先推荐不能为空
+1_100_051_010=是否开启简历模板下载不能为空
+1_100_051_011=是否开启谁看过我不能为空
+1_100_051_012=是否开启薪酬报告不能为空
+# ========== 用户权益记录 1_100_052_000 ==========
+1_100_052_001=用户权益记录不存在