From 8b29c5ca4fac5a50d928c7b06162845cc50b9a53 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 13 Feb 2023 14:12:32 +0800
Subject: [PATCH] 后台,设置成为合伙人的金额

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java |   49 ++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java
index bab3a30..1c89a4b 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java
@@ -7,13 +7,8 @@
 import cc.mrbird.febs.mall.conversion.MallMemberConversion;
 import cc.mrbird.febs.mall.dto.ApiMallGoodsCommentDto;
 import cc.mrbird.febs.mall.dto.MallGoodsQueryDto;
-import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
-import cc.mrbird.febs.mall.entity.MallGoods;
-import cc.mrbird.febs.mall.entity.MallGoodsComment;
-import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
-import cc.mrbird.febs.mall.mapper.MallGoodsCommentMapper;
-import cc.mrbird.febs.mall.mapper.MallGoodsImagesMapper;
-import cc.mrbird.febs.mall.mapper.MallGoodsMapper;
+import cc.mrbird.febs.mall.entity.*;
+import cc.mrbird.febs.mall.mapper.*;
 import cc.mrbird.febs.mall.service.IApiMallGoodsService;
 import cc.mrbird.febs.mall.vo.*;
 import cn.hutool.core.collection.CollUtil;
@@ -45,12 +40,46 @@
     private final MallGoodsImagesMapper goodsImagesMapper;
     private final MallGoodsCommentMapper mallGoodsCommentMapper;
     private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+    private final MallCarriageRuleMapper mallCarriageRuleMapper;
+    private final MallCarriageRuleInfoMapper mallCarriageRuleInfoMapper;
 
 
     @Override
     public IPage<MallGoodsListVo> findMallGoodsListInPage(MallGoodsQueryDto queryDto) {
         Page<MallGoodsListVo> page = new Page<>(queryDto.getPageNow(), queryDto.getPageSize());
         return this.baseMapper.selectMallGoodsListQueryInPage(queryDto, page);
+    }
+
+    @Override
+    public List<MallGoodsListVo> findMallGoodsListNoPage(MallGoodsQueryDto queryDto) {
+        return this.baseMapper.selectMallGoodsListQueryNoPage(queryDto);
+    }
+
+    @Override
+    public ApiMallCarriageRuleVo findMallCarriageRuleById(Long id) {
+        ApiMallCarriageRuleVo apiMallCarriageRuleVo = new ApiMallCarriageRuleVo();
+
+        MallCarriageRule mallCarriageRule = mallCarriageRuleMapper.selectById(id);
+        if(ObjectUtil.isEmpty(mallCarriageRule)){
+            throw new FebsException("商品不存在");
+        }
+        apiMallCarriageRuleVo.setName(mallCarriageRule.getName());
+
+        List<MallCarriageRuleInfo> mallCarriageRuleInfos = mallCarriageRuleInfoMapper.selectMallCarriageRuleInfoByRuleIdAndAreaAddress(id, null);
+        if(CollUtil.isNotEmpty(mallCarriageRuleInfos)){
+            List<ApiMallCarriageRuleInfoVo> apiMallCarriageRuleInfoVos = new ArrayList<>();
+            for(MallCarriageRuleInfo mallCarriageRuleInfo : mallCarriageRuleInfos){
+                ApiMallCarriageRuleInfoVo apiMallCarriageRuleInfoVo = new ApiMallCarriageRuleInfoVo();
+                apiMallCarriageRuleInfoVo.setAreaAddress(mallCarriageRuleInfo.getAreaAddress());
+                apiMallCarriageRuleInfoVo.setBasicPrice(mallCarriageRuleInfo.getBasicPrice());
+                apiMallCarriageRuleInfoVo.setBasicCnt(mallCarriageRuleInfo.getBasicCnt());
+                apiMallCarriageRuleInfoVo.setMoreCnt(mallCarriageRuleInfo.getMoreCnt());
+                apiMallCarriageRuleInfoVo.setMorePrice(mallCarriageRuleInfo.getMorePrice());
+                apiMallCarriageRuleInfoVos.add(apiMallCarriageRuleInfoVo);
+            }
+            apiMallCarriageRuleVo.setApiMallCarriageRuleInfoVos(apiMallCarriageRuleInfoVos);
+        }
+        return apiMallCarriageRuleVo;
     }
 
     @Override
@@ -81,6 +110,7 @@
         Page<MallGoodsCommentVo> page = new Page<>(queryDto.getPageNow(), queryDto.getPageSize());
         MallGoodsComment mallGoodsComment = new MallGoodsComment();
         mallGoodsComment.setGoodsId(queryDto.getGoodsId());
+        mallGoodsComment.setCommentType(queryDto.getCommentType());
         return this.baseMapper.selectMallGoodsCommentListQueryInPage(page,mallGoodsComment);
     }
 
@@ -103,4 +133,9 @@
         }
         return apiMallGoodsDeliveryVo;
     }
+
+    @Override
+    public MallGoodsCommentVo findMallGoodsCommentLevelByGoodsId(Long id) {
+        return this.baseMapper.findMallGoodsCommentLevelByGoodsId(id);
+    }
 }

--
Gitblit v1.9.1