From 24383a9cd97d3885e5161e5110a9adeef5b4f2ca Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Tue, 3 Sep 2024 18:01:27 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BC=98=E6=83=A0=E5=88=B8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=8F=8F=E8=BF=B0=E3=80=81=E5=8E=9F=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/system/domain/EtCoupon.java  |  6 +++++-
 .../resources/mapper/system/EtCouponMapper.xml  | 17 +++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/EtCoupon.java b/electripper-system/src/main/java/com/ruoyi/system/domain/EtCoupon.java
index 8b6a914..57a675e 100644
--- a/electripper-system/src/main/java/com/ruoyi/system/domain/EtCoupon.java
+++ b/electripper-system/src/main/java/com/ruoyi/system/domain/EtCoupon.java
@@ -64,12 +64,16 @@ public class EtCoupon extends BaseEntity
 
     /** 描述 */
     @Excel(name = "描述")
-    private String desc;
+    private String descr;
 
     /** 零售价 */
     @Excel(name = "零售价")
     private BigDecimal retailPrice;
 
+    /** 原价 */
+    @Excel(name = "原价")
+    private String originalPrice;
+
     /** 有效期值 */
     @Excel(name = "有效期值")
     private Integer validityValue;
diff --git a/electripper-system/src/main/resources/mapper/system/EtCouponMapper.xml b/electripper-system/src/main/resources/mapper/system/EtCouponMapper.xml
index 0e975b7..2e04001 100644
--- a/electripper-system/src/main/resources/mapper/system/EtCouponMapper.xml
+++ b/electripper-system/src/main/resources/mapper/system/EtCouponMapper.xml
@@ -16,13 +16,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="validityUnit"    column="validity_unit"    />
         <result property="status"    column="status"    />
         <result property="limitNum"    column="limit_num"    />
-        <result property="desc"    column="desc"    />
+        <result property="descr"    column="descr"    />
         <result property="retailPrice"    column="retail_price"    />
+        <result property="originalPrice"    column="original_price"    />
         <result property="isHot"    column="is_hot"    />
     </resultMap>
 
     <sql id="selectEtCouponVo">
-        select coupon_id, name, type, discount_percent, area_id, discount_amount, create_time, validity_value, validity_unit, status, limit_num, `desc`, retail_price, is_hot from et_coupon
+        select coupon_id, name, type, discount_percent, area_id, discount_amount, create_time, validity_value, validity_unit, status, limit_num, `descr`, retail_price, original_price, is_hot from et_coupon
     </sql>
 
     <select id="selectEtCouponList" parameterType="EtCoupon" resultMap="EtCouponResult">
@@ -39,8 +40,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             c.validity_unit,
             c.status,
             c.limit_num,
-            c.desc,
+            c.descr,
             c.retail_price,
+            c.original_price,
             c.is_hot
         FROM
         et_coupon c
@@ -81,8 +83,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="validityUnit != null">validity_unit,</if>
             <if test="status != null">status,</if>
             <if test="limitNum != null">limit_num,</if>
-            <if test="desc != null">desc,</if>
+            <if test="descr != null">descr,</if>
             <if test="retailPrice != null">retail_price,</if>
+            <if test="originalPrice != null">original_price,</if>
             <if test="isHot != null">is_hot,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -96,8 +99,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="validityUnit != null">#{validityUnit},</if>
             <if test="status != null">#{status},</if>
             <if test="limitNum != null">#{limitNum},</if>
-            <if test="desc != null">#{desc},</if>
+            <if test="descr != null">#{descr},</if>
             <if test="retailPrice != null">#{retailPrice},</if>
+            <if test="originalPrice != null">#{originalPrice},</if>
             <if test="isHot != null">#{isHot},</if>
          </trim>
     </insert>
@@ -115,8 +119,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="validityUnit != null">validity_unit = #{validityUnit},</if>
             <if test="status != null">status = #{status},</if>
             <if test="limitNum != null">limit_num = #{limitNum},</if>
-            <if test="desc != null">desc = #{desc},</if>
+            <if test="descr != null">descr = #{descr},</if>
             <if test="retailPrice != null">retail_price = #{retailPrice},</if>
+            <if test="originalPrice != null">original_price = #{originalPrice},</if>
             <if test="isHot != null">is_hot = #{isHot},</if>
         </trim>
         where coupon_id = #{couponId}