From 023a40799745789e5585a9f5448a11f6acb4f874 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 11 Sep 2023 11:10:17 +0800
Subject: [PATCH] 优惠卷
---
src/main/java/cc/mrbird/febs/mall/dto/MallMemberCouponDto.java | 3 +++
src/main/resources/mapper/modules/MallMemberCouponMapper.xml | 3 +++
src/main/java/cc/mrbird/febs/mall/entity/MallMemberCoupon.java | 1 +
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 1 +
4 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/MallMemberCouponDto.java b/src/main/java/cc/mrbird/febs/mall/dto/MallMemberCouponDto.java
index db96c75..dd7e687 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/MallMemberCouponDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/MallMemberCouponDto.java
@@ -8,6 +8,9 @@
@ApiModel(value = "MallMemberCouponDto", description = "参数类")
public class MallMemberCouponDto {
+ @ApiModelProperty(value = "商品ID", example = "1")
+ private Long goodsId;
+
@ApiModelProperty(value = "1:待使用 2：已使用 3：已过期", example = "1")
private Integer state;
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallMemberCoupon.java b/src/main/java/cc/mrbird/febs/mall/entity/MallMemberCoupon.java
index 17916ab..ce46257 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMemberCoupon.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMemberCoupon.java
@@ -13,6 +13,7 @@
private Long memberId;
private Long couponId;
+ private Long goodsId;
private String couponName;
private String inviteId;
//1:待使用 2：已使用 3：已过期
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 0722003..109ed67 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -891,6 +891,7 @@
mallMemberCoupon.setCouponId(couponId);
mallMemberCoupon.setCouponName(mallGoodsCoupon.getName());
mallMemberCoupon.setMemberId(memberId);
+ mallMemberCoupon.setGoodsId(goodsId);
mallMemberCoupon.setInviteId(mallMemberCoupon.getInviteId());
mallMemberCoupon.setState(1);
mallMemberCoupon.setExpireTime(DateUtil.offsetDay(DateUtil.date(),mallGoodsCoupon.getExpireDay()));
diff --git a/src/main/resources/mapper/modules/MallMemberCouponMapper.xml b/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
index fcc415c..3de8bf5 100644
--- a/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
@@ -11,6 +11,9 @@
<if test="record.state != null and record.state != ''">
and a.state=#{record.state}
</if>
+ <if test="record.goodsId != null and record.goodsId != ''">
+ and a.goods_id=#{record.goodsId}
+ </if>
</where>
order by a.CREATED_TIME desc
</select>
--
Gitblit v1.9.1