From 7c6f033b8754b07bf5c75ae8745a982d76f9abb4 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 23 Sep 2022 19:28:14 +0800 Subject: [PATCH] Merge branch 'group_buy' of http://120.27.238.55:7000/r/xc-mall into group_buy --- src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsMapper.java | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsMapper.java index 781b4ad..fe37826 100644 --- a/src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsMapper.java +++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsMapper.java @@ -1,17 +1,17 @@ package cc.mrbird.febs.mall.mapper; 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.vo.AdminMailGoodsDetailVo; -import cc.mrbird.febs.mall.vo.AdminMailGoodsUpdateVo; -import cc.mrbird.febs.mall.vo.AdminMallGoodsVo; -import cc.mrbird.febs.mall.vo.MallGoodsListVo; +import cc.mrbird.febs.mall.entity.MallGoodsComment; +import cc.mrbird.febs.mall.vo.*; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; +import java.util.Date; import java.util.List; import java.util.Map; @@ -38,4 +38,18 @@ List<MallGoods> selectMallGoodsByCategaryId(@Param("categaryId")Long id); AdminMailGoodsUpdateVo getMallGoodsUpdateInfoById(@Param("id")long id); + + List<AdminMallGoodsTreeVo> getAllGoodsTree(); + + List<MallGoods> selectOrderGoodsList(@Param("memberId") Long memberId, @Param("date") Date date); + + IPage<MallGoodsCommentVo> selectMallGoodsCommentListQueryInPage(Page<MallGoodsCommentVo> page, @Param("record")MallGoodsComment mallGoodsComment); + + IPage<DataDictionaryCustom> getDeliveryHomeListInPage(Page<DataDictionaryCustom> page, @Param("record")AdminHomeDeliverySettingVo adminHomeDeliverySettingVo); + + MallGoodsCommentVo findMallGoodsCommentLevelByGoodsId(@Param("id")Long id); + + Integer upDateStockAndVolumeByGoodsId(@Param("id")Long id,@Param("cnt")Integer cnt); + + Integer updateStockAndVolumeByGoodsId(@Param("id")Long id,@Param("cnt")Integer cnt); } -- Gitblit v1.9.1