Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

Helius

2021-09-22 35a295dea9c62bca0157982e594e4917c2010334

 src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java

@@ -1,8 +1,13 @@
package cc.mrbird.febs.mall.mapper;

import cc.mrbird.febs.mall.dto.MallOrderInfoDto;
import cc.mrbird.febs.mall.dto.OrderListDto;
import cc.mrbird.febs.mall.entity.MallOrderInfo;
import cc.mrbird.febs.mall.vo.AdminMallOrderInfoVo;
import cc.mrbird.febs.mall.vo.AdminMallOrderVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;

@@ -16,6 +21,10 @@

    MallOrderInfo selectOrderByMemberIdAndId(@Param("memberId") Long memberId, @Param("id") Long id);

    IPage<AdminMallOrderInfoVo> selectOrderListInPage(Page<AdminMallOrderInfoVo> page, @Param("record") MallOrderInfoDto mallOrderInfo);

    AdminMallOrderVo getMallOrderInfoById(@Param("id")long id);

    IPage<MallOrderInfo> selectOrderListInPage(IPage<MallOrderInfo> page,@Param("record") OrderListDto orderListDto);

    MallOrderInfo selectOrderDetailsById(@Param("id") Long id);