经纪人

src/main/java/com/sqx/modules/app/entity/UserVip.java

@@ -38,5 +38,7 @@ public class UserVip implements Serializable {
      *是否是会员
      */
     private Long  isVip;
+
+
     public UserVip() {}
 }

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;
 

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<UserVipDao, UserVip> impleme
 
     @Autowired
     private CommonInfoService commonInfoService;
-
+    @Autowired
+    private VipDetailsDao vipDetailsDao;
 
     @Override
     public UserVip selectUserVipByUserId(Long userId) {
         QueryWrapper<UserVip> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id", userId);
-        return baseMapper.selectOne(queryWrapper);
+        UserVip userVip =  baseMapper.selectOne(queryWrapper);
+
+        QueryWrapper<VipDetails> 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

src/main/resources/mapper/app/VipDetailsDao.xml

@@ -5,6 +5,7 @@
 	<select id="getVipDetailByUser" resultType="com.sqx.modules.app.entity.VipDetails">
 		SELECT a.id,
 			a.vip_name_type,
+			a.old_money,
 			a.money,
 			a.vip_name,
 			a.rate,