优化代码

nightFragrance-massage/src/main/java/com/ylx/point/service/impl/PointUserActivityTaskCompletionServiceImpl.java

@@ -16,10 +16,11 @@ import com.ylx.point.domain.PointActivity;
 import com.ylx.point.domain.PointActivityTask;
 import com.ylx.point.domain.PointUserActivityTaskCompletion;
 import com.ylx.point.domain.vo.PointActivityOverviewVO;
-import com.ylx.point.enums.ActivityNameEnum;
+import com.ylx.point.enums.TaskNameEnum;
 import com.ylx.point.enums.PointActivityStatusEnum;
 import com.ylx.point.enums.PointActivityTaskTypeEnum;
 import com.ylx.point.enums.PointActivityTypeEnum;
+import com.ylx.point.enums.TaskNameEnum;
 import com.ylx.point.mapper.PointUserActivityTaskCompletionMapper;
 import com.ylx.point.service.IPointAccountService;
 import com.ylx.point.service.IPointActivityService;
@@ -172,7 +173,7 @@ public class PointUserActivityTaskCompletionServiceImpl extends ServiceImpl<Poin
         // 4. 任务校验逻辑
         if (activityTypeEnum == PointActivityTypeEnum.SIGN_TASK) {
             // 签到任务：今日未完成才可领取
-            taskName = ActivityNameEnum.USER_SIGN_IN.getInfo();
+            taskName = TaskNameEnum.USER_SIGN_IN.getInfo();
             if (isTodayCompleted(openId, activityId, taskId, taskTypeEnum.getCode())) {
                 throw new ServiceException("今日已签到，请勿重复操作");
             }
@@ -216,15 +217,15 @@ public class PointUserActivityTaskCompletionServiceImpl extends ServiceImpl<Poin
      */
     private String getTaskNameByType(PointActivityTaskTypeEnum taskType) {
         if (taskType == PointActivityTaskTypeEnum.COMPLETE_ORDER) {
-            return ActivityNameEnum.COMPLETE_ORDER.getInfo();
+            return TaskNameEnum.COMPLETE_ORDER.getInfo();
         } else if (taskType == PointActivityTaskTypeEnum.RECHARGE_TASK) {
-            return ActivityNameEnum.RECHARGE_TASK.getInfo();
+            return TaskNameEnum.RECHARGE_TASK.getInfo();
         } else if (taskType == PointActivityTaskTypeEnum.SHARE_SERVICE) {
-            return ActivityNameEnum.SHARE_ACCOUNT.getInfo();
+            return TaskNameEnum.SHARE_ACCOUNT.getInfo();
         } else if (taskType == PointActivityTaskTypeEnum.BROWLE_NEWS) {
-            return ActivityNameEnum.BROWSE_DYNAMIC.getInfo();
+            return TaskNameEnum.BROWSE_DYNAMIC.getInfo();
         } else if (taskType == PointActivityTaskTypeEnum.BROWLE_MERCHANT) {
-            return ActivityNameEnum.BROWSE_MERCHANT.getInfo();
+            return TaskNameEnum.BROWSE_MERCHANT.getInfo();
         } else {
             throw new ServiceException("不支持的任务类型: " + taskType);
         }
@@ -291,7 +292,7 @@ public class PointUserActivityTaskCompletionServiceImpl extends ServiceImpl<Poin
     /**
      * 通用优先级任务完成方法
      */
-    private void completeTaskByPriority(String openId, ActivityNameEnum activityNameEnum,
+    private void completeTaskByPriority(String openId, TaskNameEnum activityNameEnum,
                                         PointActivityTaskTypeEnum taskTypeEnum,
                                         Function<Date, Integer> countFunction) {
         // 批量查询所有有效任务
@@ -362,7 +363,7 @@ public class PointUserActivityTaskCompletionServiceImpl extends ServiceImpl<Poin
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void completeOrderTaskByPriority(String openId) {
-        completeTaskByPriority(openId, ActivityNameEnum.COMPLETE_ORDER,
+        completeTaskByPriority(openId, TaskNameEnum.COMPLETE_ORDER,
                 PointActivityTaskTypeEnum.COMPLETE_ORDER,
                 new Function<Date, Integer>() {
                     @Override
@@ -375,7 +376,7 @@ public class PointUserActivityTaskCompletionServiceImpl extends ServiceImpl<Poin
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void completeRechargeTaskByPriority(String openId) {
-        completeTaskByPriority(openId, ActivityNameEnum.RECHARGE_TASK,
+        completeTaskByPriority(openId, TaskNameEnum.RECHARGE_TASK,
                 PointActivityTaskTypeEnum.RECHARGE_TASK,
                 new Function<Date, Integer>() {
                     @Override