From 2f2b2092fd27f077de3875820210d3d492322fac Mon Sep 17 00:00:00 2001
From: panshuling321 <panshuling321@163.com>
Date: Fri, 22 Apr 2022 17:52:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8A=98=E6=89=A3=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xhpc/activity/domain/XhpcActivityDiscountDomain.java | 4 ++--
 .../main/resources/mapper/XhpcActivityDiscountMapper.xml | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityDiscountDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityDiscountDomain.java
index 51fd0d39..ddb5d796 100644
--- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityDiscountDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityDiscountDomain.java
@@ -65,12 +65,12 @@ public class XhpcActivityDiscountDomain implements Serializable {
     /**
      * 状态（0-编辑，1-提交待审核，2-审核失败，3-审核通过，4-立即失效）
      */
-    private Short status = 0;
+    private Integer status = 1;
 
     /**
      * 删除标识（0-正常，2-删除）
      */
-    private Short delFlag = 0;
+    private Integer delFlag = 0;
 
     /**
      * 创建人
diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityDiscountMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityDiscountMapper.xml
index f5a96e19..02c3cd1e 100644
--- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityDiscountMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityDiscountMapper.xml
@@ -12,8 +12,8 @@
         <result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
         <result column="start_time" jdbcType="TIMESTAMP" property="startTime"/>
         <result column="end_time" jdbcType="TIMESTAMP" property="endTime"/>
-        <result column="status" jdbcType="SMALLINT" property="status"/>
-        <result column="del_flag" jdbcType="SMALLINT" property="delFlag"/>
+        <result column="status" jdbcType="INTEGER" property="status"/>
+        <result column="del_flag" jdbcType="INTEGER" property="delFlag"/>
         <result column="create_by" jdbcType="VARCHAR" property="createBy"/>
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
@@ -202,7 +202,7 @@
         select
         <include refid="Base_Column_List"/>
         from xhpc_activity_discount ad
-        where ad.del_flag=0 and ad.status=#{status} and ad.template_id=#{params.template}
+        where ad.del_flag=0 and ad.status=#{status} and ad.template_id=#{templateId}
 
     </select>
 
@@ -211,7 +211,6 @@
         select
         <include refid="Base_Column_List"/>
         from xhpc_activity_discount ad
-        where ad.del_flag=#{delflag} and ad.template_id=#{params.template}
-
+        where ad.del_flag=#{delflag} and ad.template_id=#{templateId}
     </select>
 </mapper>
\ No newline at end of file