From 2812309093cc6fd31a75d10f62bc52abb7588f56 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 06 Jan 2025 17:16:57 +0800
Subject: [PATCH] feat(mall): 后台活动列表添加分页和搜索功能 - 在 ActivityServiceImpl 中实现 getAdminListInPage 方法，支持分页和搜索 - 在 AdminActivityController 中添加 list 接口，返回分页数据 - 在 IActivityService 中定义 getAdminListInPage 接口 - 更新前端模板，根据活动状态控制按钮显示
---
src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 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 568c99a..841527e 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,16 @@
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.AdminGoodsStatisticsVo;
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.annotation.SqlParser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -43,6 +47,10 @@
List<MallOrderInfo> selectOrderInfoByStatus(@Param("status") Integer status);
+ List<MallOrderInfo> selectOrderInfoByStatusAndIsInvoice(@Param("status") Integer status,@Param("isInvoice") Integer isInvoice);
+
+ List<MallOrderInfo> selectOrderInfoUpTime(@Param("status") Integer status);
+
Integer selectCntDirectOrTeam(@Param("type") Integer type, @Param("inviteId") String inviteId);
Integer selectCntDirect(@Param("inviteId") String inviteId);
@@ -55,7 +63,28 @@
MallOrderInfo selectByOrderNo(@Param("orderNo") String orderNo);
- int updateOrderConfirmStatus(@Param("date") Date date);
+ 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);
+
+ MallOrderInfo selectByIdAndTakeUniqueCode(@Param("orderId")long orderId,@Param("takeUniqueCode") String takeUniqueCode);
+
+ MallOrderInfo selectAllOrderInfoByIdAndTakeUniqueCode(@Param("orderId")long orderId,@Param("takeUniqueCode") String takeUniqueCode);
+
+ @SqlParser(filter = true)
+ IPage<AdminGoodsStatisticsVo> getGoodsStatisticsInPage(Page<AdminGoodsStatisticsVo> page, @Param("record") MallOrderItem mallOrderItem);
+
+ BigDecimal selectAmountOrTeamAmount(@Param("inviteId") String inviteId, @Param("type") Integer type);
+
+ MallOrderInfo selectBypayOrderNo(@Param("payOrderNo")String payOrderNo);
}
--
Gitblit v1.9.1