diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java index 7849be3..e5f528f 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java @@ -79,7 +79,7 @@ public class PayController extends BaseController @RequestMapping("/generateCode") @ApiOperation(value = "生成兑换码", notes = "生成兑换码", httpMethod = "GET") - public String generateCode(Integer num,HttpServletResponse response){ + public String generateCode(Integer num,Integer level,HttpServletResponse response){ if(num>10000){ return "------num error------"; } @@ -93,6 +93,7 @@ public class PayController extends BaseController try { AppExchangeCode entity = new AppExchangeCode(); entity.setCode(code); + entity.setLevel(level); entity.setCreateTime(new Date()); appExchangeCodeMapper.insertAppExchangeCode(entity); codeFlag = true; @@ -199,7 +200,7 @@ public class PayController extends BaseController order.setPayStatus(2); order.setPaySoure(3); order.setCreateTime(new Date()); - order.setLevel(1); + order.setLevel(appExchangeCode.getLevel()); appOrderMapper.insertAppOrder(order); //修改用户信息 diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppExchangeCode.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppExchangeCode.java index d5f88de..883b6a7 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppExchangeCode.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppExchangeCode.java @@ -2,6 +2,7 @@ package com.ruoyi.app.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; @@ -13,6 +14,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity; * @author wyh * @date 2024-04-29 */ +@Data public class AppExchangeCode extends BaseEntity { private static final long serialVersionUID = 1L; @@ -33,6 +35,9 @@ public class AppExchangeCode extends BaseEntity @Excel(name = "使用时间", width = 30, dateFormat = "yyyy-MM-dd") private Date userTime; + @Excel(name = "会员等级,1-7天,2-一个月,3-一年") + private Integer level; + public void setId(Long id) { this.id = id; diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppExchangeCodeMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppExchangeCodeMapper.xml index 9dd6cff..0b06c09 100644 --- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppExchangeCodeMapper.xml +++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppExchangeCodeMapper.xml @@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -17,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, code, user_id, create_time, update_time, create_by, updateBy, remark, user_time from app_exchange_code + select id, code, user_id,level, create_time, update_time, create_by, updateBy, remark, user_time from app_exchange_code