From 8023521a31d4cffc66ddb255450ed3a13e4b6767 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 11 十月 2024 15:02:11 +0800
Subject: [PATCH] 1.优惠券领取记录-新增领取规则字段冗余

---
 src/main/java/com/mzl/flower/entity/coupon/CouponRecordDO.java                   |    4 ++++
 src/main/resources/mapper/coupon/CouponRecordMapper.xml                          |    1 +
 src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java    |    2 ++
 src/main/java/com/mzl/flower/service/impl/coupon/CouponTemplateServiceImpl2.java |    1 +
 4 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/entity/coupon/CouponRecordDO.java b/src/main/java/com/mzl/flower/entity/coupon/CouponRecordDO.java
index 6233710..ae21831 100644
--- a/src/main/java/com/mzl/flower/entity/coupon/CouponRecordDO.java
+++ b/src/main/java/com/mzl/flower/entity/coupon/CouponRecordDO.java
@@ -109,5 +109,9 @@
      */
     private String imageUrl;
 
+    /**
+     * 优惠券描述(使用规则)
+     */
+    private String couponDescription;
 
 }
diff --git a/src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java
index aef2357..564a08c 100644
--- a/src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java
+++ b/src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java
@@ -160,6 +160,7 @@
                     couponRecordDO.setPoint(couponTemplateDO.getPoint());
                     couponRecordDO.setMemberId(couponTemplateDO.getMemberId());
                     couponRecordDO.setImageUrl(couponTemplateDO.getImageUrl());
+                    couponRecordDO.setCouponDescription(couponTemplateDO.getCouponDescription());
 
 
                     // 根据优惠券模板来计算优惠券的生效开始时间和结束时间
@@ -292,6 +293,7 @@
                     couponRecordDO.setEffectiveEnd(lastDayEnd);
                     couponRecordDO.setMemberId(couponTemplateDO.getMemberId());
                     couponRecordDO.setImageUrl(couponTemplateDO.getImageUrl());
+                    couponRecordDO.setCouponDescription(couponTemplateDO.getCouponDescription());
                     // 创建信息
                     couponRecordDO.create();
                     if(!checkCurMonVipCouponExists(couponRecordDO.getCouponId(),couponRecordDO.getCustomerId(),firstDayStart,lastDayEnd)){
diff --git a/src/main/java/com/mzl/flower/service/impl/coupon/CouponTemplateServiceImpl2.java b/src/main/java/com/mzl/flower/service/impl/coupon/CouponTemplateServiceImpl2.java
index 6e46180..154b128 100644
--- a/src/main/java/com/mzl/flower/service/impl/coupon/CouponTemplateServiceImpl2.java
+++ b/src/main/java/com/mzl/flower/service/impl/coupon/CouponTemplateServiceImpl2.java
@@ -293,6 +293,7 @@
                     couponRecordDO.setPoint(couponTemplateDO.getPoint());
                     couponRecordDO.setMemberId(couponTemplateDO.getMemberId());
                     couponRecordDO.setImageUrl(couponTemplateDO.getImageUrl());
+                    couponRecordDO.setCouponDescription(couponTemplateDO.getCouponDescription());
 
                     // 创建相关信息
                     couponRecordDO.create(SecurityUtils.getUserId());
diff --git a/src/main/resources/mapper/coupon/CouponRecordMapper.xml b/src/main/resources/mapper/coupon/CouponRecordMapper.xml
index 3f721a5..f7d1f09 100644
--- a/src/main/resources/mapper/coupon/CouponRecordMapper.xml
+++ b/src/main/resources/mapper/coupon/CouponRecordMapper.xml
@@ -26,6 +26,7 @@
 
         <result column="point" property="point" />
         <result column="image_url" property="imageUrl" />
+        <result column="coupon_description" property="couponDescription" />
 
     </resultMap>
 

--
Gitblit v1.9.3