release: 修改会员，是否永久会员

luoo_common/src/main/java/enums/PointEnums.java

@@ -31,6 +31,9 @@ public enum PointEnums {
   LOTTERY_RESULT_WIN(1, "中奖"),
   LOTTERY_RESULT_LOSE(2, "未中奖"),
 
+  MEMBERSHIP_LIFE(1, "永久会员"),
+  MEMBERSHIP_NOT_LIFE(2, "非永久会员"),
+
   ;
   private final Integer code;
   private final String description;

luoo_user/src/main/java/com/luoo/user/controller/MembershipController.java

@@ -8,7 +8,9 @@ import com.luoo.user.pojo.MembershipCode;
 import com.luoo.user.service.MembershipCodeService;
 import controller.BaseController;
 import io.swagger.annotations.*;
+
 import java.util.List;
+
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -36,12 +38,14 @@ public class MembershipController extends BaseController {
     @GetMapping("/code/generate")
     @GlobalInterceptor(checkAdminLogin = true)
     @ApiImplicitParams(value = {
-      @ApiImplicitParam(name = "duration", value = "会员时长（天）", required = true, dataType = "Integer", paramType = "query")
+            @ApiImplicitParam(name = "duration", value = "会员时长（天）", required = true, dataType = "Integer", paramType = "query"),
+            @ApiImplicitParam(name = "life", value = "是否永久会员 1-是 2-否", required = true, dataType = "Integer", paramType = "query")
     })
     public Result<String> generateMembershipCode(
             @RequestHeader(value = "Authorization", required = true) String authorization,
-      @NotNull Integer duration) {
-    return Result.success(membershipCodeService.generateMembershipCode(authorization, duration));
+            @NotNull Integer duration,
+            @NotNull Integer life) {
+        return Result.success(membershipCodeService.generateMembershipCode(authorization, duration, life));
     }
 
     @ApiOperation(value = "1.1 批量生成会员码", notes = "仅限admin权限用户调用")
@@ -49,14 +53,16 @@ public class MembershipController extends BaseController {
     @GlobalInterceptor(checkAdminLogin = true)
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "duration", value = "会员时长（天）", required = true, dataType = "Integer", paramType = "query"),
-      @ApiImplicitParam(name = "count", value = "生成数量", required = true, dataType = "Integer", paramType = "query")
+            @ApiImplicitParam(name = "count", value = "生成数量", required = true, dataType = "Integer", paramType = "query"),
+            @ApiImplicitParam(name = "life", value = "是否永久会员 1-是 2-否", required = true, dataType = "Integer", paramType = "query")
     })
     public Result<List<String>> generateMembershipCodeBatch(
             @RequestHeader(value = "Authorization", required = true) String authorization,
             @NotNull Integer duration,
-      @NotNull Integer count) {
+            @NotNull Integer count,
+            @NotNull Integer life) {
         List<String> list = membershipCodeService.generateMembershipCodeBatch(authorization,
-        duration, count);
+                duration, count, life);
         return Result.success(list);
     }
 
@@ -75,7 +81,7 @@ public class MembershipController extends BaseController {
     }
 
     @ApiOperation(value = "3.查询会员码", notes = "仅限admin权限用户调用")
-  @GetMapping("/code/list")
+    @GetMapping("/code/list{page}/{size}")
     @GlobalInterceptor(checkAdminLogin = true)
     public Result<PageResult<MembershipCode>> queryMembershipCode(
             @RequestHeader(value = "Authorization", required = true) String authorization,

luoo_user/src/main/java/com/luoo/user/pojo/MembershipCode.java

@@ -45,6 +45,10 @@ public class MembershipCode implements Serializable {
     @ApiModelProperty(value = "时长")
     private Integer duration;
 
+    @Column(name = "life")
+    @ApiModelProperty(value = "是否永久会员 1-是 2-否")
+    private Integer life;
+
     @Size(max = 20)
     @Column(name = "user_id", length = 20)
     @ApiModelProperty(value = "用户id")

luoo_user/src/main/java/com/luoo/user/service/MembershipCodeService.java

@@ -10,14 +10,17 @@ import com.luoo.user.pojo.UserInfo;
 import com.luoo.user.pojo.UserPointLog;
 import dto.UserLoginDto;
 import enums.MembershipEnums;
+import enums.PointEnums;
 import enums.UserVipStatusEnum;
 import exception.BizException;
+
 import java.util.ArrayList;
 import java.util.List;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
+
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.data.domain.Page;
@@ -68,10 +71,11 @@ public class MembershipCodeService {
      *
      * @param token    token
      * @param duration 会员时长（天）
+     * @param life     是否永久会员
      * @return 会员码
      */
     @Transactional(rollbackFor = Exception.class)
-  public String generateMembershipCode(String token, Integer duration) {
+    public String generateMembershipCode(String token, Integer duration, Integer life) {
         UserLoginDto userLoginDto = jwtUtil.getUserLoginDto(token);
 
         // UUID作为会员码
@@ -81,6 +85,7 @@ public class MembershipCodeService {
                 .code(code)
                 .status(MembershipEnums.CREATED.getCode())
                 .duration(duration)
+                .life(life)
                 .createUser(userLoginDto.getUserId())
                 .build();
         membershipCodeDao.save(build);
@@ -93,13 +98,14 @@ public class MembershipCodeService {
      * @param token    token
      * @param duration 会员时长（天）
      * @param count    生成会员码数量
+     * @param life     是否永久会员
      * @return 会员码list
      */
     @Transactional(rollbackFor = Exception.class)
-  public List<String> generateMembershipCodeBatch(String token, Integer duration, Integer count) {
+    public List<String> generateMembershipCodeBatch(String token, Integer duration, Integer count, Integer life) {
         List<String> result = new ArrayList<>();
         for (int i = 0; i < count; i++) {
-      String code = generateMembershipCode(token, duration);
+            String code = generateMembershipCode(token, duration, life);
             result.add(code);
         }
         return result;
@@ -127,6 +133,12 @@ public class MembershipCodeService {
 
         // 处理用户表
         UserInfo userInfo = userInfoDao.findById(userLoginDto.getUserId()).get();
+
+        // 永久会员码
+        if(Objects.equals(membershipCode.getLife(), PointEnums.MEMBERSHIP_LIFE.getCode())) {
+            userInfo.setVipStatus(UserVipStatusEnum.LIFE.getCode());
+        } else {
+            // 非永久会员码
             // 计算会员到期时间
             LocalDate vipExpireTime;
             if (Objects.equals(UserVipStatusEnum.INITIAL.getCode(), userInfo.getVipStatus())) {
@@ -139,6 +151,8 @@ public class MembershipCodeService {
             userInfo.setVipExpireTime(vipExpireTime);
             // 无论如何当即设置为会员生效状态
             userInfo.setVipStatus(UserVipStatusEnum.ACTIVE.getCode());
+        }
+
         userInfoDao.save(userInfo);
 
     }

luoo_user/src/main/resources/sql/20240719.sql

@@ -5,12 +5,14 @@ create table tb_membership_code
     code        varchar(50) null comment '会员码',
     status      tinyint     null comment '状态 1-已生成 2-已绑定 3-已退款 4-已废弃',
     duration    int         null comment '会员时长（天）',
+    life        tinyint     null comment '是否永久会员 1-是 2-否',
     user_id     varchar(20) null comment '使用用户',
     create_time datetime    null comment '创建时间',
     update_time datetime    null comment '修改时间',
     create_user varchar(20) null comment '创建人',
     update_user varchar(20) null comment '修改人'
-) comment '会员码';
+)
+    comment '会员码';
 
 create table tb_user_point_log
 (