From 626feb32d22db5762a63ab56b079ee6cbefa4d86 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 19 Dec 2024 15:49:04 +0800
Subject: [PATCH] refactor(mall): 优化会员信息接口返回内容
---
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java | 18 +++++-------------
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 31 ++-----------------------------
2 files changed, 7 insertions(+), 42 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 60be509..d401179 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -276,39 +276,12 @@
RunVip runVip = runVipMapper.selectOne(new LambdaQueryWrapper<RunVip>().eq(RunVip::getVipCode, mallMemberVo.getLevel()));
mallMemberVo.setLevelName(runVip.getVipName());
mallMemberVo.setLevelPng(runVip.getVipPng());
+ mallMemberVo.setChangeState(runVip.getChangeState());
+ mallMemberVo.setWithdrawState(runVip.getWithdrawState());
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId());
mallMemberVo.setBalance(wallet.getBalance());
mallMemberVo.setScore(wallet.getScore());
-
- mallMemberVo.setMinScore(
- new BigDecimal(
- dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
- RunVipDataDictionaryEnum.RUN_VIP_SCORE_MIN.getType(),
- RunVipDataDictionaryEnum.RUN_VIP_SCORE_MIN.getCode()).getValue()
- ).setScale(0,BigDecimal.ROUND_DOWN)
- );
- mallMemberVo.setScoreBalance(
- new BigDecimal(
- dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
- RunVipDataDictionaryEnum.RUN_VIP_SCORE_TO_BALANCE.getType(),
- RunVipDataDictionaryEnum.RUN_VIP_SCORE_TO_BALANCE.getCode()).getValue()
- ).setScale(2, BigDecimal.ROUND_DOWN)
- );
- mallMemberVo.setBalanceCoin(
- new BigDecimal(
- dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
- RunVipDataDictionaryEnum.RUN_VIP_BALANCE_TO_COIN.getType(),
- RunVipDataDictionaryEnum.RUN_VIP_BALANCE_TO_COIN.getCode()).getValue()
- ).setScale(2, BigDecimal.ROUND_DOWN)
- );
- mallMemberVo.setBalanceCoinPercent(
- new BigDecimal(
- dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
- RunVipDataDictionaryEnum.RUN_VIP_BALANCE_TO_COIN_PERCENT.getType(),
- RunVipDataDictionaryEnum.RUN_VIP_BALANCE_TO_COIN_PERCENT.getCode()).getValue()
- ).setScale(4, BigDecimal.ROUND_DOWN)
- );
return new FebsResponse().success().data(mallMemberVo);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
index ca5a3e8..4745bd3 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -30,26 +30,18 @@
@ApiModelProperty(value = "VIP等级编码")
private String level;
+ @ApiModelProperty(value = "是否允许碳积分兑换碳币 1是0否")
+ private Integer changeState;//是否允许碳积分兑换碳币 1是0否
+ @ApiModelProperty(value = "是否允许碳币提现 1是0否")
+ private Integer withdrawState;//是否允许碳币提现 1是0否
+
@ApiModelProperty(value = "碳币")
private BigDecimal balance;
@ApiModelProperty(value = "碳积分")
private BigDecimal score;
- @ApiModelProperty(value = "碳积分兑换碳币的最小值")
- private BigDecimal minScore;
-
- @ApiModelProperty(value = "碳积分兑换碳币的比值，如果为0.5，则表示1积分兑换0.5个碳币")
- private BigDecimal scoreBalance;
-
- @ApiModelProperty(value = "碳币兑换USDT的比值，如果为0.5，则表示1碳币兑换0.5个USDT")
- private BigDecimal balanceCoin;
-
- @ApiModelProperty(value = "碳币兑换USDT的手续费")
- private BigDecimal balanceCoinPercent;
-
@ApiModelProperty(value = "是否有支付密码 1:是 0：否")
private Integer tradeWord;
-
@ApiModelProperty(value = "会员到期时间")
@DateTimeFormat(pattern = "yyyy-MM-dd")
--
Gitblit v1.9.1