diff --git a/src/main/java/com/sqx/modules/app/entity/UserVip.java b/src/main/java/com/sqx/modules/app/entity/UserVip.java index 2cb8569..031c651 100644 --- a/src/main/java/com/sqx/modules/app/entity/UserVip.java +++ b/src/main/java/com/sqx/modules/app/entity/UserVip.java @@ -38,5 +38,7 @@ public class UserVip implements Serializable { *是否是会员 */ private Long isVip; + + public UserVip() {} } diff --git a/src/main/java/com/sqx/modules/app/entity/VipDetails.java b/src/main/java/com/sqx/modules/app/entity/VipDetails.java index 6bb9220..2ecf817 100644 --- a/src/main/java/com/sqx/modules/app/entity/VipDetails.java +++ b/src/main/java/com/sqx/modules/app/entity/VipDetails.java @@ -27,6 +27,9 @@ public class VipDetails implements Serializable { @TableField("vip_name_type") private Integer vipNameType; + @ApiModelProperty("原价") + private BigDecimal oldMoney; + @ApiModelProperty("会员价格") private BigDecimal money; diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserVipServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserVipServiceImpl.java index cf2f5b3..6701ed9 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserVipServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserVipServiceImpl.java @@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.sqx.common.utils.Result; import com.sqx.modules.app.dao.UserVipDao; +import com.sqx.modules.app.dao.VipDetailsDao; import com.sqx.modules.app.entity.UserVip; +import com.sqx.modules.app.entity.VipDetails; import com.sqx.modules.app.service.UserVipService; import com.sqx.modules.common.service.CommonInfoService; import org.apache.commons.lang.StringUtils; @@ -19,13 +21,22 @@ public class UserVipServiceImpl extends ServiceImpl impleme @Autowired private CommonInfoService commonInfoService; - + @Autowired + private VipDetailsDao vipDetailsDao; @Override public UserVip selectUserVipByUserId(Long userId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("user_id", userId); - return baseMapper.selectOne(queryWrapper); + UserVip userVip = baseMapper.selectOne(queryWrapper); + + QueryWrapper queryWrapper2 = new QueryWrapper<>(); + queryWrapper2.eq("vip_name_type", userVip.getVipNameType()); + queryWrapper2.eq("vip_type", 0); + VipDetails vipDetails = vipDetailsDao.selectOne(queryWrapper2); + userVip.setVipDetails(vipDetails); + + return userVip; } @Override diff --git a/src/main/resources/mapper/app/VipDetailsDao.xml b/src/main/resources/mapper/app/VipDetailsDao.xml index 333efe2..c3b29dd 100644 --- a/src/main/resources/mapper/app/VipDetailsDao.xml +++ b/src/main/resources/mapper/app/VipDetailsDao.xml @@ -5,6 +5,7 @@