diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberCart.java b/ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberCart.java index bedb647..b93bc86 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberCart.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberCart.java @@ -20,6 +20,10 @@ public class MemberCart extends BaseAudit { @ApiModelProperty("购物车表ID") private Long id; + @ApiModelProperty("0->失效;1->有效") + @Excel(name = "0->失效;1->有效") + private Integer status; + @ApiModelProperty("用户ID") @Excel(name = "用户ID") private Long memberId; diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberCartQuery.java b/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberCartQuery.java index c881979..8ef837c 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberCartQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberCartQuery.java @@ -12,6 +12,9 @@ import io.swagger.annotations.ApiModelProperty; @ApiModel(description="购物车 查询 对象") @Data public class MemberCartQuery { + @ApiModelProperty("0->失效;1->有效 精确匹配") + private Integer status; + @ApiModelProperty("用户ID 精确匹配") private Long memberId; diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberCartVO.java b/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberCartVO.java index 7927385..ea3b2c1 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberCartVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberCartVO.java @@ -13,6 +13,9 @@ import lombok.Data; public class MemberCartVO extends BaseAudit { /** 购物车表ID */ private Long id; + /** 0->失效;1->有效 */ + @Excel(name = "0->失效;1->有效") + private Integer status; /** 用户ID */ @Excel(name = "用户ID") private Long memberId; diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberCartService.java b/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberCartService.java index fcadb68..16ccdb4 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberCartService.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberCartService.java @@ -46,6 +46,10 @@ public class MemberCartService { PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); } QueryWrapper qw = new QueryWrapper<>(); + Integer status = query.getStatus(); + if (status != null) { + qw.eq("status", status); + } Long memberId = query.getMemberId(); if (memberId != null) { qw.eq("member_id", memberId); diff --git a/ruoyi-mall/src/main/resources/mapper/ums/MemberCartMapper.xml b/ruoyi-mall/src/main/resources/mapper/ums/MemberCartMapper.xml index 2e93899..34f7fd7 100644 --- a/ruoyi-mall/src/main/resources/mapper/ums/MemberCartMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/ums/MemberCartMapper.xml @@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -24,12 +25,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, member_id, product_id, pic, sku_id, product_name, sp_data, cart_num, create_by, create_time, update_by, update_time from ums_member_cart + select id, status, member_id, product_id, pic, sku_id, product_name, sp_data, cart_num, create_by, create_time, update_by, update_time from ums_member_cart