From 545d3a5024f54976a6685a30c7c1a4107fd5d563 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Thu, 19 Dec 2024 17:50:05 +0800 Subject: [PATCH] fix(mall): 修复会员兑换碳币权限及数据展示问题- 修改会员兑换碳币权限判断逻辑,使用 withdrawState 替代 changeState - 调整 ApiRunDataVo 中 score 和 realScore 字段含义,确保数据展示正确 - 更新 buyVipList.html 中状态颜色,以更直观地显示不同状态 --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAgentServiceImpl.java | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAgentServiceImpl.java index d85c377..9e814ae 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAgentServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAgentServiceImpl.java @@ -54,15 +54,21 @@ // return new FebsResponse().fail().message("当前城市已经无法申请"); // } - MallAgentRecord mallAgentRecordNew = MallAgentRecordConversion.INSTANCE.dtoToEntity(apiAgentApplyDto); - mallAgentRecordNew.setMemberId(memberId); - mallAgentRecordNew.setState(MallAgentRecord.APPLY_ING); - mallAgentRecordMapper.insert(mallAgentRecordNew); DataDictionaryCustom agentAmountDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.PRICE_AMOUNT.getType() , DataDictionaryEnum.PRICE_AMOUNT.getCode()); String agentAmount = agentAmountDic.getValue(); BigDecimal bigDecimal = new BigDecimal(agentAmount); + + MallAgentRecord mallAgentRecordNew = MallAgentRecordConversion.INSTANCE.dtoToEntity(apiAgentApplyDto); + mallAgentRecordNew.setMemberId(memberId); + mallAgentRecordNew.setState(MallAgentRecord.APPLY_ING); + mallAgentRecordNew.setAgentLevel(apiAgentApplyDto.getType()); + if(apiAgentApplyDto.getType().equals(AgentLevelEnum.LEVEL_THREE.getName())){ + mallAgentRecordNew.setAmount(bigDecimal); + } + mallAgentRecordMapper.insert(mallAgentRecordNew); return new FebsResponse().success().data(bigDecimal); } + } -- Gitblit v1.9.1