From 2c74d176be9d103bf47f69868ca7975a3a73256d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 27 Sep 2021 12:34:44 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

---
 src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java
index 0b2a84e..ed0386e 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java
@@ -3,12 +3,13 @@
 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.entity.MallOrderItem;
 import cc.mrbird.febs.mall.vo.AdminMallOrderInfoVo;
 import cc.mrbird.febs.mall.vo.AdminMallOrderVo;
+import cc.mrbird.febs.mall.vo.AdminOrderDetailVo;
 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;
 
 import java.util.List;
@@ -31,4 +32,12 @@
     MallOrderInfo selectOrderDetailsById(@Param("id") Long id);
 
     List<Map<String, Integer>> selectMemberOrderStatusCnt(@Param("memberId") Long memberId);
+
+    AdminOrderDetailVo getMallOrderDetailById(@Param("id")long id);
+
+    List<MallOrderItem> getMallOrderItemByOrderId(@Param("id")long id);
+
+    List<MallOrderInfo> selectOrderInfoByStatus(@Param("status") Integer status);
+
+    Integer selectCntDirectOrTeam(@Param("type") Integer type, @Param("inviteId") String inviteId);
 }

--
Gitblit v1.9.1