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 | 21 +++++++++++++++++----
1 files changed, 17 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 b644304..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
@@ -14,6 +14,7 @@
import cc.mrbird.febs.mall.mapper.MallAgentRecordMapper;
import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cc.mrbird.febs.mall.service.IApiMallAgentService;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -23,6 +24,7 @@
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
+import java.util.List;
@Slf4j
@Service
@@ -46,16 +48,27 @@
if(ObjectUtil.isNotEmpty(mallAgentRecord)){
mallAgentRecordMapper.deleteByMemberIdAndState(memberId,MallAgentRecord.APPLY_ING);
}
+// String city = apiAgentApplyDto.getCity();
+// List<MallAgentRecord> cityMallAgents = mallAgentRecordMapper.selectByCity(city);
+// if(CollUtil.isEmpty(cityMallAgents)){
+// 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