修复积分时效编辑接口

nightFragrance-massage/src/main/java/com/ylx/point/enums/PointActivityExpirePolicyEnum.java

@@ -5,9 +5,9 @@ import lombok.Getter;
 @Getter
 public enum PointActivityExpirePolicyEnum {
 
-    PERMANENT_VALID(0, "永久有效"),
-    TRANSACTION_EXPIRE(1, "逐笔过期"),
-    YEARLY_EXPIRE(2, "逐年过期");
+    PERMANENT_VALID(1, "永久有效"),
+    TRANSACTION_EXPIRE(2, "逐笔过期"),
+    YEARLY_EXPIRE(3, "逐年过期");
 
     private final Integer code;
     private final String info;

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

@@ -223,7 +223,7 @@ public class PointActivityServiceImpl extends ServiceImpl<PointActivityMapper, P
                 throw new ServiceException("存在进行中的活动，无法修改有效期");
             }
             // 更新积分活动过期策略表
-            this.saveOrUpdatePointActivityExpirePolicy(expirePolicy, dto);
+            expirePolicy = this.saveOrUpdatePointActivityExpirePolicy(expirePolicy, dto);
             // 批量更新活动的有效期策略
             batchUpdateExpirePolicy(activityList, expirePolicy.getId());
         }
@@ -669,7 +669,7 @@ public class PointActivityServiceImpl extends ServiceImpl<PointActivityMapper, P
         }
     }
 
-    private void saveOrUpdatePointActivityExpirePolicy(PointActivityExpirePolicy expirePolicy, PointActivityValidityDTO dto) {
+    private PointActivityExpirePolicy saveOrUpdatePointActivityExpirePolicy(PointActivityExpirePolicy expirePolicy, PointActivityValidityDTO dto) {
 
         // 参数校验
         if (ObjectUtil.isNull(dto)) {
@@ -694,7 +694,7 @@ public class PointActivityServiceImpl extends ServiceImpl<PointActivityMapper, P
         setExpireTimeByPolicyType(entity, dto, expirePolicyCode);
 
         // 保存或更新
-        saveOrUpdateExpirePolicy(entity, dto.getActivityType());
+        return saveOrUpdateExpirePolicy(entity, dto.getActivityType());
     }
 
     private void setExpireTimeByPolicyType(PointActivityExpirePolicy entity, PointActivityValidityDTO dto, Integer expirePolicyCode) {
@@ -724,15 +724,16 @@ public class PointActivityServiceImpl extends ServiceImpl<PointActivityMapper, P
         }
     }
 
-    private void saveOrUpdateExpirePolicy(PointActivityExpirePolicy entity, Integer activityType) {
+    private PointActivityExpirePolicy saveOrUpdateExpirePolicy(PointActivityExpirePolicy entity, Integer activityType) {
         try {
             entity.setUpdateBy(SecurityUtils.getUsername());
             entity.setUpdateTime(DateUtils.getNowDate());
-            boolean isSuccess = pointActivityExpirePolicyService.updateById(entity);
+            boolean isSuccess = pointActivityExpirePolicyService.saveOrUpdate(entity);
             if (!isSuccess) {
                 log.error("保存或更新积分活动过期策略失败, activityType: {}", activityType);
                 throw new ServiceException(UPDATE_FAILED_MESSAGE);
             }
+            return entity;
         } catch (Exception e) {
             log.error("保存或更新积分活动过期策略时发生异常, activityType: {}", activityType, e);
             throw new ServiceException(UPDATE_FAILED_MESSAGE);