From c3f2f93821ac8d351fe7c9d1f0f28c39b36cfef1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 01 Mar 2023 18:01:06 +0800
Subject: [PATCH] 增加活动公告

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAgentServiceImpl.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 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 94ab94b..b644304 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
@@ -2,20 +2,27 @@
 
 import cc.mrbird.febs.common.entity.FebsResponse;
 import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
+import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
 import cc.mrbird.febs.common.utils.LoginUserUtil;
 import cc.mrbird.febs.mall.conversion.MallAgentRecordConversion;
 import cc.mrbird.febs.mall.conversion.MallGoodsConversion;
 import cc.mrbird.febs.mall.dto.ApiAgentApplyDto;
+import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
 import cc.mrbird.febs.mall.entity.MallAgentRecord;
 import cc.mrbird.febs.mall.entity.MallMember;
+import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
 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.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
 
 @Slf4j
 @Service
@@ -24,6 +31,7 @@
 
     private final MallAgentRecordMapper mallAgentRecordMapper;
     private final MallMemberMapper mallMemberMapper;
+    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
 
     @Override
     public FebsResponse agentApply(ApiAgentApplyDto apiAgentApplyDto) {
@@ -36,7 +44,7 @@
         //判断用户是否正在申请
         MallAgentRecord mallAgentRecord = mallAgentRecordMapper.selectByMemberIdAndState(memberId,MallAgentRecord.APPLY_ING);
         if(ObjectUtil.isNotEmpty(mallAgentRecord)){
-            return new FebsResponse().fail().message("用户已申请");
+            mallAgentRecordMapper.deleteByMemberIdAndState(memberId,MallAgentRecord.APPLY_ING);
         }
 
         MallAgentRecord mallAgentRecordNew = MallAgentRecordConversion.INSTANCE.dtoToEntity(apiAgentApplyDto);
@@ -44,6 +52,10 @@
         mallAgentRecordNew.setState(MallAgentRecord.APPLY_ING);
         mallAgentRecordMapper.insert(mallAgentRecordNew);
 
-        return new FebsResponse().success().message("申请成功");
+        DataDictionaryCustom agentAmountDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.PRICE_AMOUNT.getType()
+                , DataDictionaryEnum.PRICE_AMOUNT.getCode());
+        String agentAmount = agentAmountDic.getValue();
+        BigDecimal bigDecimal = new BigDecimal(agentAmount);
+        return new FebsResponse().success().data(bigDecimal);
     }
 }

--
Gitblit v1.9.1