From 44300720085ec4ed5f97810f383973d088ba711f Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 08 Jan 2025 14:00:38 +0800
Subject: [PATCH] refactor(mall): 重构活动详情接口返回值

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java |   46 ++++++++++++----------------------------------
 1 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java
index 137e07b..4e54820 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java
@@ -5,6 +5,7 @@
 import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
 import cc.mrbird.febs.common.exception.FebsException;
 import cc.mrbird.febs.common.utils.LoginUserUtil;
+import cc.mrbird.febs.mall.conversion.MallActivityConversion;
 import cc.mrbird.febs.mall.dto.ApiMallActListDto;
 import cc.mrbird.febs.mall.dto.ApiMallActWinDetailsDto;
 import cc.mrbird.febs.mall.entity.*;
@@ -12,9 +13,13 @@
 import cc.mrbird.febs.mall.service.IApiMallActService;
 import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
 import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
-import cc.mrbird.febs.mall.vo.*;
-import cn.hutool.core.util.*;
+import cc.mrbird.febs.mall.vo.ApiActivityVo;
+import cc.mrbird.febs.mall.vo.ApiMallActListVo;
+import cc.mrbird.febs.mall.vo.ApiMallActWinDetailsVo;
+import cc.mrbird.febs.mall.vo.ApiMallAwardDetailsVo;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -40,6 +45,7 @@
     private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
     private final IMallMoneyFlowService mallMoneyFlowService;
     private final IApiMallMemberWalletService mallMemberWalletService;
+    private final MallActivityMapper mallActivityMapper;
 
     @Override
     public IPage<ApiMallActListVo> findApiMallActListInPage(ApiMallActListDto apiMallActListDto) {
@@ -48,38 +54,10 @@
     }
 
     @Override
-    public ApiMallActDetailsVo findApiMallActDetailsById(Long id) {
-        MallActSet mallActSet = this.baseMapper.selectById(id);
-        if(ObjectUtil.isEmpty(mallActSet)){
-            throw new FebsException("活动不存在");
-        }
-        ApiMallActDetailsVo apiMallActDetailsVo = new ApiMallActDetailsVo();
-        apiMallActDetailsVo.setId(mallActSet.getId());
-        apiMallActDetailsVo.setActName(mallActSet.getActName());
-        apiMallActDetailsVo.setActCode(mallActSet.getActCode());
-        apiMallActDetailsVo.setActImage(mallActSet.getActImage());
-        apiMallActDetailsVo.setActStartTime(mallActSet.getActStartTime());
-        apiMallActDetailsVo.setActEndTime(mallActSet.getActEndTime());
-        apiMallActDetailsVo.setActScoreCnt(mallActSet.getActScoreCnt());
-        apiMallActDetailsVo.setActRemark(mallActSet.getActRemark());
-
-        List<MallActAwardSet> mallActAwardSets = mallActAwardSetMapper.selectMallActAwardByActId(id);
-        if(CollUtil.isNotEmpty(mallActAwardSets)){
-            List<ApiMallActAwardListDto> apiMallActAwardListDtos = new ArrayList<>();
-            for(MallActAwardSet mallActAwardSet : mallActAwardSets){
-                ApiMallActAwardListDto apiMallActAwardListDto = new ApiMallActAwardListDto();
-                apiMallActAwardListDto.setId(mallActAwardSet.getId());
-                apiMallActAwardListDto.setAwardName(mallActAwardSet.getAwardName());
-                apiMallActAwardListDto.setAwardImage(mallActAwardSet.getAwardImage());
-                apiMallActAwardListDto.setAwardTotal(mallActAwardSet.getAwardTotal());
-                apiMallActAwardListDto.setAwardCnt(mallActAwardSet.getAwardCnt());
-                apiMallActAwardListDto.setAwardType(mallActAwardSet.getAwardType());
-                apiMallActAwardListDto.setAwardValue(mallActAwardSet.getAwardValue());
-                apiMallActAwardListDtos.add(apiMallActAwardListDto);
-            }
-            apiMallActDetailsVo.setApiMallActAwardListDtos(apiMallActAwardListDtos);
-        }
-        return apiMallActDetailsVo;
+    public ApiActivityVo findApiMallActDetailsById(Long id) {
+        MallActivity mallActivity = mallActivityMapper.selectById(id);
+        ApiActivityVo apiActivityVo = MallActivityConversion.INSTANCE.entityToApiActivityVo(mallActivity);
+        return apiActivityVo;
     }
 
     @Override

--
Gitblit v1.9.1