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/MallOrderInfoMapper.java |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 54 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 fb23cc4..540ec89 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java
@@ -1,12 +1,23 @@
 package cc.mrbird.febs.mall.mapper;
 
+import cc.mrbird.febs.common.enumerates.OrderPayMethodEnum;
+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 cn.hutool.core.date.DateTime;
 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;
 
 /**
  * @author wzy
@@ -14,9 +25,51 @@
  **/
 public interface MallOrderInfoMapper extends BaseMapper<MallOrderInfo> {
 
+    IPage<MallOrderInfo> selectInPage(@Param("record") MallOrderInfo mallOrderInfo, IPage<MallOrderInfo> page);
+
     MallOrderInfo selectOrderByMemberIdAndId(@Param("memberId") Long memberId, @Param("id") Long id);
 
-    IPage<MallOrderInfo> selectOrderListInPage(IPage<MallOrderInfo> page,@Param("record") OrderListDto orderListDto);
+    IPage<AdminMallOrderInfoVo> selectOrderListInPage(Page<AdminMallOrderInfoVo> page, @Param("record") MallOrderInfoDto mallOrderInfo);
+
+    AdminMallOrderVo getMallOrderInfoById(@Param("id")long id);
+
+    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);
+
+    List<MallOrderInfo> selectOrderInfoUpTime(@Param("status") Integer status);
+
+    Integer selectCntDirectOrTeam(@Param("type") Integer type, @Param("inviteId") String inviteId);
+
+    Integer selectCntDirect(@Param("inviteId") String inviteId);
+
+    BigDecimal selectTotalAmount(@Param("memberId") Long memberId);
+
+    BigDecimal selectTotalAmountForDate(@Param("date") Date date, @Param("member") Long memberId);
+
+    BigDecimal selectTotalAmountUnCostForDate(@Param("date") Date date, @Param("member") Long memberId, @Param("dateType") String dateType, @Param("isNormal") Integer isNormal);
+
+    MallOrderInfo selectByOrderNo(@Param("orderNo") String orderNo);
+
+    int updateOrderConfirmStatus(@Param("updateTime")DateTime updateTime,@Param("date") Date date);
+
+    List<MallOrderInfo> selectOrderInfoWithNormalGoods(@Param("date") Date date);
+
+    BigDecimal selectSumAmountByPayMethodAndStatue(@Param("payMethod")String name, @Param("statue")int value);
+
+    void updateOrderStateAndDeliveryState(@Param("orderId")Long orderId, @Param("orderState")int orderState, @Param("deliveryState")int deliveryState);
+
+    List<Map<String, Integer>> selectMemberOrderStatusCntByUniquecode(@Param("uniqueCode")String uniqueCode);
+
+    List<MallOrderInfo> selectOrderByStatusAndPayTime(@Param("status")Integer i, @Param("paytime")DateTime offsetDay);
+
+    IPage<MallOrderInfo> selectNewApiOrderListInPage(IPage<MallOrderInfo> page, @Param("record") OrderListDto orderListDto);
 }

--
Gitblit v1.9.1