From 55e24ccfe5d11a9221ce4e26846c7ed7a851f96d Mon Sep 17 00:00:00 2001
From: zhaochencheng <zccbbg@qq.com>
Date: Tue, 29 Nov 2022 11:56:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberCart.java   | 4 ++++
 .../src/main/java/com/cyl/ums/pojo/query/MemberCartQuery.java | 3 +++
 .../src/main/java/com/cyl/ums/pojo/vo/MemberCartVO.java       | 3 +++
 .../src/main/java/com/cyl/ums/service/MemberCartService.java  | 4 ++++
 ruoyi-mall/src/main/resources/mapper/ums/MemberCartMapper.xml | 4 +++-
 sql/mall_ums结构.sql                                        | 1 +
 6 files changed, 18 insertions(+), 1 deletion(-)

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<MemberCart> 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"
     
     <resultMap type="MemberCart" id="MemberCartResult">
         <result property="id" column="id"/>
+        <result property="status" column="status"/>
         <result property="memberId" column="member_id"/>
         <result property="productId" column="product_id"/>
         <result property="pic" column="pic"/>
@@ -24,12 +25,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectMemberCartVo">
-        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
     </sql>
 
     <select id="selectByEntity" parameterType="MemberCart" resultMap="MemberCartResult">
         <include refid="selectMemberCartVo"/>
         <where>  
+            <if test="status != null "> and status = #{status}</if>
             <if test="memberId != null "> and member_id = #{memberId}</if>
             <if test="productId != null "> and product_id = #{productId}</if>
             <if test="pic != null  and pic != ''"> and pic = #{pic}</if>
diff --git a/sql/mall_ums结构.sql b/sql/mall_ums结构.sql
index 5662744..e0c550c 100644
--- a/sql/mall_ums结构.sql
+++ b/sql/mall_ums结构.sql
@@ -75,6 +75,7 @@ CREATE TABLE `ums_member_wechat` (
 DROP TABLE IF EXISTS `ums_member_cart`;
 CREATE TABLE `ums_member_cart` (
      `id` bigint NOT NULL AUTO_INCREMENT COMMENT '购物车表ID',
+     `status` int(1) DEFAULT NULL COMMENT '0->失效；1->有效',
      `member_id` bigint unsigned NOT NULL COMMENT '用户ID',
      `product_id` bigint unsigned NOT NULL COMMENT '商品ID',
      `pic` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '展示图片',