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 | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 f0d363d..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,15 +3,17 @@
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;
+import java.util.Map;
/**
* @author wzy
@@ -25,7 +27,17 @@
AdminMallOrderVo getMallOrderInfoById(@Param("id")long id);
- IPage<MallOrderInfo> selectOrderListInPage(IPage<MallOrderInfo> page,@Param("record") OrderListDto orderListDto);
+ IPage<MallOrderInfo> selectApiOrderListInPage(IPage<MallOrderInfo> page,@Param("record") OrderListDto orderListDto);
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