main
parent
abc35681f7
commit
b44ace0a92
|
|
@ -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);
|
||||
|
||||
//修改用户信息
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="id" column="id" />
|
||||
<result property="code" column="code" />
|
||||
<result property="userId" column="user_id" />
|
||||
<result property="level" column="level" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="createBy" column="create_by" />
|
||||
|
|
@ -17,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</resultMap>
|
||||
|
||||
<sql id="selectAppExchangeCodeVo">
|
||||
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
|
||||
</sql>
|
||||
|
||||
<select id="selectAppExchangeCodeList" parameterType="AppExchangeCode" resultMap="AppExchangeCodeResult">
|
||||
|
|
@ -27,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<where>
|
||||
<if test="code != null and code != ''"> and code = #{code}</if>
|
||||
<if test="userId != null "> and user_id = #{userId}</if>
|
||||
<if test="level != null "> and level = #{level}</if>
|
||||
<if test="updateBy != null and updateBy != ''"> and updateBy = #{updateBy}</if>
|
||||
<if test="userTime != null "> and DATE_FORMAT(user_time,'%Y-%m-%d') = DATE_FORMAT(#{userTime},'%Y-%m-%d') </if>
|
||||
</where>
|
||||
|
|
@ -48,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="code != null">code,</if>
|
||||
<if test="userId != null">user_id,</if>
|
||||
<if test="level != null">level,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
|
|
@ -58,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="code != null">#{code},</if>
|
||||
<if test="userId != null">#{userId},</if>
|
||||
<if test="level != null">#{level},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
|
|
@ -72,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="code != null">code = #{code},</if>
|
||||
<if test="userId != null">user_id = #{userId},</if>
|
||||
<if test="level != null">level = #{level},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
|
|
|
|||
Loading…
Reference in New Issue