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/entity/MallOrderItem.java | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderItem.java b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderItem.java index 0a52615..29c9ed8 100644 --- a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderItem.java +++ b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderItem.java @@ -1,6 +1,7 @@ package cc.mrbird.febs.mall.entity; import cc.mrbird.febs.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -17,6 +18,10 @@ private Long orderId; private Long skuId; + + private String memberInviteId; + + private Long memberCouponId; private Long goodsId; @@ -37,4 +42,20 @@ private BigDecimal costPrice; private Integer isNormal; + + /** + * 是否结清 + */ + private Integer hasSettle; + //1:正常 2:退款中3:已退 + private Integer state; + + @TableField(exist = false) + private long[] orderIdsStr; + + @TableField(exist = false) + private String unit; + + @TableField(exist = false) + private BigDecimal itemAmount; } -- Gitblit v1.9.1